Fix Style/Blocks cop violations

spec/controllers/branches_controller_spec.rb

@@ -17,13 +17,13 @@ describe Projects::BranchesController do
   describe "POST create" do
     render_views
-    before {
+    before do
       post :create,
         namespace_id: project.namespace.to_param,
         project_id: project.to_param,
         branch_name: branch,
         ref: ref
-    }
+    end
     context "valid branch name, valid source" do
       let(:branch) { "merge_branch" }

spec/controllers/import/bitbucket_controller_spec.rb

@@ -12,7 +12,7 @@ describe Import::BitbucketController do
     before do
       session[:oauth_request_token] = {}
     end
-    
+
     it "updates access token" do
       token = "asdasd12345"
       secret = "sekrettt"
@@ -57,20 +57,13 @@ describe Import::BitbucketController do
   describe "POST create" do
     let(:bitbucket_username) { user.username }
-    let(:bitbucket_user) {
-      {
-        user: {
-          username: bitbucket_username
-        }
-      }.with_indifferent_access
-    }
-
-    let(:bitbucket_repo) {
-      {
-        slug: "vim",
-        owner: bitbucket_username
-      }.with_indifferent_access
-    }
+    let(:bitbucket_user) do
+      { user: { username: bitbucket_username } }.with_indifferent_access
+    end
+
+    let(:bitbucket_repo) do
+      { slug: "vim", owner: bitbucket_username }.with_indifferent_access
+    end
     before do
       allow(Gitlab::BitbucketImport::KeyAdder).

spec/controllers/import/github_controller_spec.rb

@@ -57,14 +57,14 @@ describe Import::GithubController do
   describe "POST create" do
     let(:github_username) { user.username }
-
-    let(:github_user) {
-      OpenStruct.new(login: github_username)
-    }
-
-    let(:github_repo) {
-      OpenStruct.new(name: 'vim', full_name: "#{github_username}/vim", owner: OpenStruct.new(login: github_username))
-    }
+    let(:github_user) { OpenStruct.new(login: github_username) }
+    let(:github_repo) do
+      OpenStruct.new(
+        name: 'vim',
+        full_name: "#{github_username}/vim",
+        owner: OpenStruct.new(login: github_username)
+      )
+    end
     before do
       controller.stub_chain(:client, :user).and_return(github_user)

spec/controllers/import/gitlab_controller_spec.rb

@@ -49,21 +49,17 @@ describe Import::GitlabController do
   describe "POST create" do
     let(:gitlab_username) { user.username }
-
-    let(:gitlab_user) {
-      {
-        username: gitlab_username
-      }.with_indifferent_access
-    }
-
-    let(:gitlab_repo) {
+    let(:gitlab_user) do
+      { username: gitlab_username }.with_indifferent_access
+    end
+    let(:gitlab_repo) do
       {
         path: 'vim',
         path_with_namespace: "#{gitlab_username}/vim",
         owner: { name: gitlab_username },
         namespace: { path: gitlab_username }
       }.with_indifferent_access
-    }
+    end
     before do
       controller.stub_chain(:client, :user).and_return(gitlab_user)

spec/features/issues_spec.rb

@@ -36,9 +36,7 @@ describe 'Issues', feature: true do
       end
       it 'does not change issue count' do
-        expect {
-          click_button 'Save changes'
-        }.to_not change { Issue.count }
+        expect { click_button 'Save changes' }.to_not change { Issue.count }
       end
       it 'should update issue fields' do

spec/helpers/tree_helper_spec.rb

@@ -4,10 +4,9 @@ describe TreeHelper do
   describe 'flatten_tree' do
     let(:project) { create(:project) }
-    before {
-      @repository = project.repository
-      @commit = project.commit("e56497bb")
-    }
+    before do
+      @repository = project.repository @commit = project.commit("e56497bb")
+    end
     context "on a directory containing more than one file/directory" do
       let(:tree_item) { double(name: "files", path: "files") }

spec/lib/disable_email_interceptor_spec.rb

@@ -7,9 +7,7 @@ describe DisableEmailInterceptor do
   it 'should not send emails' do
     allow(Gitlab.config.gitlab).to receive(:email_enabled).and_return(false)
-    expect {
-      deliver_mail
-    }.not_to change(ActionMailer::Base.deliveries, :count)
+    expect { deliver_mail }.not_to change(ActionMailer::Base.deliveries, :count)
   end
   after do

spec/lib/file_size_validator_spec.rb

@@ -22,8 +22,13 @@ describe 'Gitlab::FileSizeValidatorSpec' do
   end
   describe 'options uses a symbol' do
-    let(:options) { { maximum: :test,
-                      attributes: { attachment: attachment } } }
+    let(:options) do
+      {
+        maximum: :test,
+        attributes: { attachment: attachment }
+      }
+    end
+
     before do
       allow(note).to receive(:test) { 10 }
     end

spec/lib/gitlab/backend/grack_auth_spec.rb

@@ -6,13 +6,13 @@ describe Grack::Auth do
   let(:app)   { lambda { |env| [200, {}, "Success!"] } }
   let!(:auth) { Grack::Auth.new(app) }
-  let(:env) {
+  let(:env) do
     {
-      "rack.input" => "",
-      "REQUEST_METHOD" => "GET",
-      "QUERY_STRING" => "service=git-upload-pack"
+      'rack.input'     => '',
+      'REQUEST_METHOD' => 'GET',
+      'QUERY_STRING'   => 'service=git-upload-pack'
     }
-  }
+  end
   let(:status) { auth.call(env).first }
   describe "#call" do

spec/lib/gitlab/bitbucket_import/project_creator_spec.rb

@@ -2,24 +2,26 @@ require 'spec_helper'
 describe Gitlab::BitbucketImport::ProjectCreator do
   let(:user) { create(:user, bitbucket_access_token: "asdffg", bitbucket_access_token_secret: "sekret") }
-  let(:repo) { {
-    name: 'Vim',
-    slug: 'vim',
-    is_private: true,
-    owner: "asd" }.with_indifferent_access
-  }
+  let(:repo) do
+    {
+      name: 'Vim',
+      slug: 'vim',
+      is_private: true,
+      owner: "asd"
+    }.with_indifferent_access
+  end
   let(:namespace){ create(:group, owner: user) }
   before do
     namespace.add_owner(user)
   end
-  
+
   it 'creates project' do
     allow_any_instance_of(Project).to receive(:add_import_job)
-    
+
     project_creator = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, user)
     project = project_creator.execute
-    
+
     expect(project.import_url).to eq("ssh://git@bitbucket.org/asd/vim.git")
     expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
   end

spec/lib/gitlab/github_import/project_creator_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 describe Gitlab::GithubImport::ProjectCreator do
   let(:user) { create(:user, github_access_token: "asdffg") }
-  let(:repo) { OpenStruct.new(
-    login: 'vim',
-    name: 'vim',
-    private: true,
-    full_name: 'asd/vim',
-    clone_url: "https://gitlab.com/asd/vim.git",
-    owner: OpenStruct.new(login: "john"))
-  }
+  let(:repo) do
+    OpenStruct.new(
+      login: 'vim',
+      name: 'vim',
+      private: true,
+      full_name: 'asd/vim',
+      clone_url: "https://gitlab.com/asd/vim.git",
+      owner: OpenStruct.new(login: "john")
+    )
+  end
   let(:namespace){ create(:group, owner: user) }
   before do
@@ -18,10 +20,10 @@ describe Gitlab::GithubImport::ProjectCreator do
   it 'creates project' do
     allow_any_instance_of(Project).to receive(:add_import_job)
-    
+
     project_creator = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, user)
     project = project_creator.execute
-    
+
     expect(project.import_url).to eq("https://asdffg@gitlab.com/asd/vim.git")
     expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
   end

spec/lib/gitlab/gitlab_import/project_creator_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 describe Gitlab::GitlabImport::ProjectCreator do
   let(:user) { create(:user, gitlab_access_token: "asdffg") }
-  let(:repo) { {
-    name: 'vim',
-    path: 'vim',
-    visibility_level: Gitlab::VisibilityLevel::PRIVATE,
-    path_with_namespace: 'asd/vim',
-    http_url_to_repo: "https://gitlab.com/asd/vim.git",
-    owner: { name: "john" } }.with_indifferent_access
-  }
+  let(:repo) do
+    {
+      name: 'vim',
+      path: 'vim',
+      visibility_level: Gitlab::VisibilityLevel::PRIVATE,
+      path_with_namespace: 'asd/vim',
+      http_url_to_repo: "https://gitlab.com/asd/vim.git",
+      owner: { name: "john" }
+    }.with_indifferent_access
+  end
   let(:namespace){ create(:group, owner: user) }
   before do
@@ -18,10 +20,10 @@ describe Gitlab::GitlabImport::ProjectCreator do
   it 'creates project' do
     allow_any_instance_of(Project).to receive(:add_import_job)
-    
+
     project_creator = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, user)
     project = project_creator.execute
-    
+
     expect(project.import_url).to eq("https://oauth2:asdffg@gitlab.com/asd/vim.git")
     expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
   end

spec/lib/gitlab/google_code_import/importer_spec.rb

@@ -4,16 +4,15 @@ describe Gitlab::GoogleCodeImport::Importer do
   let(:mapped_user) { create(:user, username: "thilo123") }
   let(:raw_data) { JSON.parse(File.read(Rails.root.join("spec/fixtures/GoogleCodeProjectHosting.json"))) }
   let(:client) { Gitlab::GoogleCodeImport::Client.new(raw_data) }
-  let(:import_data) { 
+  let(:import_data) do
     {
-      "repo"      => client.repo("tint2").raw_data,
-      "user_map"  => {
-        "thilo..." => "@#{mapped_user.username}"
-      }
-    } 
-  }
+      'repo' => client.repo('tint2').raw_data,
+      'user_map' => { 'thilo...' => "@#{mapped_user.username}" }
+    }
+  end
   let(:project) { create(:project) }
-  subject       { described_class.new(project) }
+
+  subject { described_class.new(project) }
   before do
     project.create_import_data(data: import_data)

spec/lib/gitlab/google_code_import/project_creator_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 describe Gitlab::GoogleCodeImport::ProjectCreator do
   let(:user) { create(:user) }
-  let(:repo) { 
+  let(:repo) do
     Gitlab::GoogleCodeImport::Repository.new(
-      "name"            => 'vim',
-      "summary"         => 'VI Improved',
-      "repositoryUrls"  => [ "https://vim.googlecode.com/git/" ]
+      "name" => 'vim',
+      "summary" => 'VI Improved',
+      "repositoryUrls" => ["https://vim.googlecode.com/git/"]
     )
-  }
+  end
   let(:namespace){ create(:group, owner: user) }
   before do
@@ -20,7 +20,7 @@ describe Gitlab::GoogleCodeImport::ProjectCreator do
     project_creator = Gitlab::GoogleCodeImport::ProjectCreator.new(repo, namespace, user)
     project = project_creator.execute
-    
+
     expect(project.import_url).to eq("https://vim.googlecode.com/git/")
     expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::PUBLIC)
   end

spec/lib/gitlab/o_auth/auth_hash_spec.rb

@@ -11,9 +11,9 @@ describe Gitlab::OAuth::AuthHash do
     )
   end
-  let(:uid_raw) {
+  let(:uid_raw) do
     "CN=Onur K\xC3\xBC\xC3\xA7\xC3\xBCk,OU=Test,DC=example,DC=net"
-  }
+  end
   let(:email_raw) { "onur.k\xC3\xBC\xC3\xA7\xC3\xBCk@example.net" }
   let(:nickname_raw) { "ok\xC3\xBC\xC3\xA7\xC3\xBCk" }
   let(:first_name_raw) { 'Onur' }
@@ -34,16 +34,16 @@ describe Gitlab::OAuth::AuthHash do
   let(:nickname_utf8) { nickname_ascii.force_encoding(Encoding::UTF_8) }
   let(:name_utf8) { name_ascii.force_encoding(Encoding::UTF_8) }
-  let(:info_hash) {
+  let(:info_hash) do
     {
-      email: email_ascii,
+      email:      email_ascii,
       first_name: first_name_ascii,
-      last_name: last_name_ascii,
-      name: name_ascii,
-      nickname: nickname_ascii,
-      uid: uid_ascii
+      last_name:  last_name_ascii,
+      name:       name_ascii,
+      nickname:   nickname_ascii,
+      uid:        uid_ascii
     }
-  }
+  end
   context 'defaults' do
     it { expect(auth_hash.provider).to eql provider_utf8 }

spec/lib/gitlab/satellite/action_spec.rb

@@ -33,10 +33,10 @@ describe 'Gitlab::Satellite::Action' do
       #These must happen in the context of the satellite directory...
       satellite_action = Gitlab::Satellite::Action.new(user, project)
-      project.satellite.lock {
+      project.satellite.lock do
         #Now clean it up, use send to get around prepare_satellite! being protected
         satellite_action.send(:prepare_satellite!, repo)
-      }
+      end
       #verify it's clean
       heads = repo.heads.map(&:name)

spec/lib/gitlab/satellite/merge_action_spec.rb

@@ -82,23 +82,23 @@ describe 'Gitlab::Satellite::MergeAction' do
   describe '#can_be_merged?' do
     context 'on fork' do
-      it { expect(Gitlab::Satellite::MergeAction.new(
-        merge_request_fork.author,
-        merge_request_fork).can_be_merged?).to be_truthy }
-      it { expect(Gitlab::Satellite::MergeAction.new(
-        merge_request_fork_with_conflict.author,
-        merge_request_fork_with_conflict).can_be_merged?).to be_falsey }
+      it do
+        expect(Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).can_be_merged?).to be_truthy
+      end
+      it do
+        expect(Gitlab::Satellite::MergeAction.new(merge_request_fork_with_conflict.author, merge_request_fork_with_conflict).can_be_merged?).to be_falsey
+      end
     end
     context 'between branches' do
-      it { expect(Gitlab::Satellite::MergeAction.new(
-        merge_request.author,
-        merge_request).can_be_merged?).to be_truthy }
-      it { expect(Gitlab::Satellite::MergeAction.new(
-        merge_request_with_conflict.author,
-        merge_request_with_conflict).can_be_merged?).to be_falsey }
+      it do
+        expect(Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).can_be_merged?).to be_truthy
+      end
+      it do
+        expect(Gitlab::Satellite::MergeAction.new(merge_request_with_conflict.author, merge_request_with_conflict).can_be_merged?).to be_falsey
+      end
     end
   end
 end

spec/mailers/notify_spec.rb

@@ -418,9 +418,7 @@ describe Notify do
     describe 'project access changed' do
       let(:project) { create(:project) }
       let(:user) { create(:user) }
-      let(:project_member) { create(:project_member,
-                                   project: project,
-                                   user: user) }
+      let(:project_member) { create(:project_member, project: project, user: user) }
       subject { Notify.project_access_granted_email(project_member.id) }
       it_behaves_like 'an email sent from GitLab'

spec/models/deploy_keys_project_spec.rb

@@ -44,9 +44,7 @@ describe DeployKeysProject do
         it "destroys the deploy key" do
           subject.destroy
-          expect {
-            deploy_key.reload
-          }.to raise_error(ActiveRecord::RecordNotFound)
+          expect { deploy_key.reload }.to raise_error(ActiveRecord::RecordNotFound)
         end
       end
     end

spec/models/hooks/service_hook_spec.rb

@@ -50,9 +50,7 @@ describe ServiceHook do
     it "catches exceptions" do
       expect(WebHook).to receive(:post).and_raise("Some HTTP Post error")
-      expect {
-        @service_hook.execute(@data)
-      }.to raise_error
+      expect { @service_hook.execute(@data) }.to raise_error
     end
   end
 end