Correct RSpec/SingleLineHook cop offenses

21 files changed, 280 insertions, 91 deletions

diff --git a/spec/controllers/admin/identities_controller_spec.rb b/spec/controllers/admin/identities_controller_spec.rb
index c131d22a30a..a29853bf8df 100644
--- a/spec/controllers/admin/identities_controller_spec.rb
+++ b/spec/controllers/admin/identities_controller_spec.rb
@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe Admin::IdentitiesController do
   let(:admin) { create(:admin) }
-  before { sign_in(admin) }
+
+  before do
+    sign_in(admin)
+  end
 
   describe 'UPDATE identity' do
     let(:user) { create(:omniauth_user, provider: 'ldapmain', extern_uid: 'uid=myuser,ou=people,dc=example,dc=com') }
diff --git a/spec/controllers/admin/services_controller_spec.rb b/spec/controllers/admin/services_controller_spec.rb
index c94616d8508..4ca0cfc74e9 100644
--- a/spec/controllers/admin/services_controller_spec.rb
+++ b/spec/controllers/admin/services_controller_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Admin::ServicesController do
   let(:admin) { create(:admin) }
 
-  before { sign_in(admin) }
+  before do
+    sign_in(admin)
+  end
 
   describe 'GET #edit' do
     let!(:project) { create(:empty_project) }
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index 4c3a5ec49ef..b40f647644d 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -200,7 +200,9 @@ describe AutocompleteController do
     end
 
     context 'skip_users parameter included' do
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
       it 'skips the user IDs passed' do
         get(:users, skip_users: [user, user2].map(&:id))
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index ed4ad7b600e..cce53f6697c 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -16,10 +16,14 @@ describe Groups::GroupMembersController do
   describe 'POST create' do
     let(:group_user) { create(:user) }
 
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when user does not have enough rights' do
-      before { group.add_developer(user) }
+      before do
+        group.add_developer(user)
+      end
 
       it 'returns 403' do
         post :create, group_id: group,
@@ -32,7 +36,9 @@ describe Groups::GroupMembersController do
     end
 
     context 'when user has enough rights' do
-      before { group.add_owner(user) }
+      before do
+        group.add_owner(user)
+      end
 
       it 'adds user to members' do
         post :create, group_id: group,
@@ -59,7 +65,9 @@ describe Groups::GroupMembersController do
   describe 'DELETE destroy' do
     let(:member) { create(:group_member, :developer, group: group) }
 
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when member is not found' do
       it 'returns 403' do
@@ -71,7 +79,9 @@ describe Groups::GroupMembersController do
 
     context 'when member is found' do
       context 'when user does not have enough rights' do
-        before { group.add_developer(user) }
+        before do
+          group.add_developer(user)
+        end
 
         it 'returns 403' do
           delete :destroy, group_id: group, id: member
@@ -82,7 +92,9 @@ describe Groups::GroupMembersController do
       end
 
       context 'when user has enough rights' do
-        before { group.add_owner(user) }
+        before do
+          group.add_owner(user)
+        end
 
         it '[HTML] removes user from members' do
           delete :destroy, group_id: group, id: member
@@ -103,7 +115,9 @@ describe Groups::GroupMembersController do
   end
 
   describe 'DELETE leave' do
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when member is not found' do
       it 'returns 404' do
@@ -115,7 +129,9 @@ describe Groups::GroupMembersController do
 
     context 'when member is found' do
       context 'and is not an owner' do
-        before { group.add_developer(user) }
+        before do
+          group.add_developer(user)
+        end
 
         it 'removes user from members' do
           delete :leave, group_id: group
@@ -134,7 +150,9 @@ describe Groups::GroupMembersController do
       end
 
       context 'and is an owner' do
-        before { group.add_owner(user) }
+        before do
+          group.add_owner(user)
+        end
 
         it 'cannot removes himself from the group' do
           delete :leave, group_id: group
@@ -144,7 +162,9 @@ describe Groups::GroupMembersController do
       end
 
       context 'and is a requester' do
-        before { group.request_access(user) }
+        before do
+          group.request_access(user)
+        end
 
         it 'removes user from members' do
           delete :leave, group_id: group
@@ -159,7 +179,9 @@ describe Groups::GroupMembersController do
   end
 
   describe 'POST request_access' do
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     it 'creates a new GroupMember that is not a team member' do
       post :request_access, group_id: group
@@ -174,7 +196,9 @@ describe Groups::GroupMembersController do
   describe 'POST approve_access_request' do
     let(:member) { create(:group_member, :access_request, group: group) }
 
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when member is not found' do
       it 'returns 403' do
@@ -186,7 +210,9 @@ describe Groups::GroupMembersController do
 
     context 'when member is found' do
       context 'when user does not have enough rights' do
-        before { group.add_developer(user) }
+        before do
+          group.add_developer(user)
+        end
 
         it 'returns 403' do
           post :approve_access_request, group_id: group, id: member
@@ -197,7 +223,9 @@ describe Groups::GroupMembersController do
       end
 
       context 'when user has enough rights' do
-        before { group.add_owner(user) }
+        before do
+          group.add_owner(user)
+        end
 
         it 'adds user to members' do
           post :approve_access_request, group_id: group, id: member
diff --git a/spec/controllers/notification_settings_controller_spec.rb b/spec/controllers/notification_settings_controller_spec.rb
index 9e3a31e1a6b..cf136e72bac 100644
--- a/spec/controllers/notification_settings_controller_spec.rb
+++ b/spec/controllers/notification_settings_controller_spec.rb
@@ -94,7 +94,10 @@ describe NotificationSettingsController do
 
     context 'not authorized' do
       let(:private_project) { create(:empty_project, :private) }
-      before { sign_in(user) }
+
+      before do
+        sign_in(user)
+      end
 
       it 'returns 404' do
         post :create,
@@ -120,7 +123,9 @@ describe NotificationSettingsController do
     end
 
     context 'when authorized' do
-      before{ sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
       it 'returns success' do
         put :update,
@@ -152,7 +157,9 @@ describe NotificationSettingsController do
     context 'not authorized' do
       let(:other_user) { create(:user) }
 
-      before { sign_in(other_user) }
+      before do
+        sign_in(other_user)
+      end
 
       it 'returns 404' do
         put :update,
diff --git a/spec/controllers/profiles/personal_access_tokens_controller_spec.rb b/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
index 98a43e278b2..ed08a4c1bf2 100644
--- a/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
+++ b/spec/controllers/profiles/personal_access_tokens_controller_spec.rb
@@ -4,7 +4,9 @@ describe Profiles::PersonalAccessTokensController do
   let(:user) { create(:user) }
   let(:token_attributes) { attributes_for(:personal_access_token) }
 
-  before { sign_in(user) }
+  before do
+    sign_in(user)
+  end
 
   describe '#create' do
     def created_token
@@ -38,7 +40,9 @@ describe Profiles::PersonalAccessTokensController do
     let!(:inactive_personal_access_token) { create(:personal_access_token, :revoked, user: user) }
     let!(:impersonation_personal_access_token) { create(:personal_access_token, :impersonation, user: user) }
 
-    before { get :index }
+    before do
+      get :index
+    end
 
     it "retrieves active personal access tokens" do
       expect(assigns(:active_personal_access_tokens)).to include(active_personal_access_token)
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index 69e4706dc71..7fb08df1950 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -281,7 +281,9 @@ describe Projects::CommitController do
         end
 
         context 'when the path does not exist in the diff' do
-          before { diff_for_path(id: commit.id, old_path: existing_path.succ, new_path: existing_path.succ) }
+          before do
+            diff_for_path(id: commit.id, old_path: existing_path.succ, new_path: existing_path.succ)
+          end
 
           it 'returns a 404' do
             expect(response).to have_http_status(404)
@@ -302,7 +304,9 @@ describe Projects::CommitController do
     end
 
     context 'when the commit does not exist' do
-      before { diff_for_path(id: commit.id.succ, old_path: existing_path, new_path: existing_path) }
+      before do
+        diff_for_path(id: commit.id.succ, old_path: existing_path, new_path: existing_path)
+      end
 
       it 'returns a 404' do
         expect(response).to have_http_status(404)
diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb
index 15ac4e0925a..8f4694c9854 100644
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
@@ -128,7 +128,9 @@ describe Projects::CompareController do
         end
 
         context 'when the path does not exist in the diff' do
-          before { diff_for_path(from: ref_from, to: ref_to, old_path: existing_path.succ, new_path: existing_path.succ) }
+          before do
+            diff_for_path(from: ref_from, to: ref_to, old_path: existing_path.succ, new_path: existing_path.succ)
+          end
 
           it 'returns a 404' do
             expect(response).to have_http_status(404)
@@ -149,7 +151,9 @@ describe Projects::CompareController do
     end
 
     context 'when the from ref does not exist' do
-      before { diff_for_path(from: ref_from.succ, to: ref_to, old_path: existing_path, new_path: existing_path) }
+      before do
+        diff_for_path(from: ref_from.succ, to: ref_to, old_path: existing_path, new_path: existing_path)
+      end
 
       it 'returns a 404' do
         expect(response).to have_http_status(404)
@@ -157,7 +161,9 @@ describe Projects::CompareController do
     end
 
     context 'when the to ref does not exist' do
-      before { diff_for_path(from: ref_from, to: ref_to.succ, old_path: existing_path, new_path: existing_path) }
+      before do
+        diff_for_path(from: ref_from, to: ref_to.succ, old_path: existing_path, new_path: existing_path)
+      end
 
       it 'returns a 404' do
         expect(response).to have_http_status(404)
diff --git a/spec/controllers/projects/forks_controller_spec.rb b/spec/controllers/projects/forks_controller_spec.rb
index 8282d79298f..dc8290c438e 100644
--- a/spec/controllers/projects/forks_controller_spec.rb
+++ b/spec/controllers/projects/forks_controller_spec.rb
@@ -14,7 +14,9 @@ describe Projects::ForksController do
     end
 
     context 'when fork is public' do
-      before { forked_project.update_attribute(:visibility_level, Project::PUBLIC) }
+      before do
+        forked_project.update_attribute(:visibility_level, Project::PUBLIC)
+      end
 
       it 'is visible for non logged in users' do
         get_forks
@@ -35,7 +37,9 @@ describe Projects::ForksController do
       end
 
       context 'when user is logged in' do
-        before { sign_in(project.creator) }
+        before do
+          sign_in(project.creator)
+        end
 
         context 'when user is not a Project member neither a group member' do
           it 'does not see the Project listed' do
@@ -46,7 +50,9 @@ describe Projects::ForksController do
         end
 
         context 'when user is a member of the Project' do
-          before { forked_project.team << [project.creator, :developer] }
+          before do
+            forked_project.team << [project.creator, :developer]
+          end
 
           it 'sees the project listed' do
             get_forks
@@ -56,7 +62,9 @@ describe Projects::ForksController do
         end
 
         context 'when user is a member of the Group' do
-          before { forked_project.group.add_developer(project.creator) }
+          before do
+            forked_project.group.add_developer(project.creator)
+          end
 
           it 'sees the project listed' do
             get_forks
diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb
index ca4a8e871c0..b5435357f53 100644
--- a/spec/controllers/projects/group_links_controller_spec.rb
+++ b/spec/controllers/projects/group_links_controller_spec.rb
@@ -22,7 +22,10 @@ describe Projects::GroupLinksController do
     end
 
     context 'when user has access to group he want to link project to' do
-      before { group.add_developer(user) }
+      before do
+        group.add_developer(user)
+      end
+
       include_context 'link project to group'
 
       it 'links project with selected group' do
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index b65e9e0dfc0..f853bfe370c 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -212,7 +212,9 @@ describe Projects::IssuesController do
       let(:another_project) { create(:empty_project, :private) }
 
       context 'when user has access to move issue' do
-        before { another_project.team << [user, :reporter] }
+        before do
+          another_project.team << [user, :reporter]
+        end
 
         it 'moves issue to another project' do
           move_issue
@@ -250,14 +252,18 @@ describe Projects::IssuesController do
         end
 
         context 'when an issue is identified as spam' do
-          before { allow_any_instance_of(AkismetService).to receive(:is_spam?).and_return(true) }
+          before do
+            allow_any_instance_of(AkismetService).to receive(:is_spam?).and_return(true)
+          end
 
           context 'when captcha is not verified' do
             def update_spam_issue
               update_issue(title: 'Spam Title', description: 'Spam lives here')
             end
 
-            before { allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false) }
+            before do
+              allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
+            end
 
             it 'rejects an issue recognized as a spam' do
               expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true)
@@ -620,14 +626,18 @@ describe Projects::IssuesController do
       end
 
       context 'when an issue is identified as spam' do
-        before { allow_any_instance_of(AkismetService).to receive(:is_spam?).and_return(true) }
+        before do
+          allow_any_instance_of(AkismetService).to receive(:is_spam?).and_return(true)
+        end
 
         context 'when captcha is not verified' do
           def post_spam_issue
             post_new_issue(title: 'Spam Title', description: 'Spam lives here')
           end
 
-          before { allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false) }
+          before do
+            allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
+          end
 
           it 'rejects an issue recognized as a spam' do
             expect { post_spam_issue }.not_to change(Issue, :count)
@@ -739,7 +749,10 @@ describe Projects::IssuesController do
 
   describe "DELETE #destroy" do
     context "when the user is a developer" do
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
+
       it "rejects a developer to destroy an issue" do
         delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid
         expect(response).to have_http_status(404)
@@ -751,7 +764,9 @@ describe Projects::IssuesController do
       let(:namespace) { create(:namespace, owner: owner) }
       let(:project)   { create(:empty_project, namespace: namespace) }
 
-      before { sign_in(owner) }
+      before do
+        sign_in(owner)
+      end
 
       it "deletes the issue" do
         delete :destroy, namespace_id: project.namespace, project_id: project, id: issue.iid
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 6e1c91738db..d8a3a510f97 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -19,7 +19,10 @@ describe Projects::MergeRequestsController do
       render_views
 
       let(:fork_project) { create(:forked_project_with_submodules) }
-      before { fork_project.team << [user, :master] }
+
+      before do
+        fork_project.team << [user, :master]
+      end
 
       context 'when rendering HTML response' do
         it 'renders new merge request widget template' do
@@ -328,7 +331,9 @@ describe Projects::MergeRequestsController do
     end
 
     context 'when the sha parameter does not match the source SHA' do
-      before { post :merge, base_params.merge(sha: 'foo') }
+      before do
+        post :merge, base_params.merge(sha: 'foo')
+      end
 
       it 'returns :sha_mismatch' do
         expect(json_response).to eq('status' => 'sha_mismatch')
@@ -473,7 +478,9 @@ describe Projects::MergeRequestsController do
       let(:namespace) { create(:namespace, owner: owner) }
       let(:project)   { create(:project, namespace: namespace) }
 
-      before { sign_in owner }
+      before do
+        sign_in owner
+      end
 
       it "deletes the merge request" do
         delete :destroy, namespace_id: project.namespace, project_id: project, id: merge_request.iid
@@ -505,7 +512,9 @@ describe Projects::MergeRequestsController do
 
     context 'with default params' do
       context 'as html' do
-        before { go(format: 'html') }
+        before do
+          go(format: 'html')
+        end
 
         it 'renders the diff template' do
           expect(response).to render_template('diffs')
@@ -513,7 +522,9 @@ describe Projects::MergeRequestsController do
       end
 
       context 'as json' do
-        before { go(format: 'json') }
+        before do
+          go(format: 'json')
+        end
 
         it 'renders the diffs template to a string' do
           expect(response).to render_template('projects/merge_requests/show/_diffs')
@@ -544,7 +555,9 @@ describe Projects::MergeRequestsController do
 
     context 'with ignore_whitespace_change' do
       context 'as html' do
-        before { go(format: 'html', w: 1) }
+        before do
+          go(format: 'html', w: 1)
+        end
 
         it 'renders the diff template' do
           expect(response).to render_template('diffs')
@@ -552,7 +565,9 @@ describe Projects::MergeRequestsController do
       end
 
       context 'as json' do
-        before { go(format: 'json', w: 1) }
+        before do
+          go(format: 'json', w: 1)
+        end
 
         it 'renders the diffs template to a string' do
           expect(response).to render_template('projects/merge_requests/show/_diffs')
@@ -562,7 +577,9 @@ describe Projects::MergeRequestsController do
     end
 
     context 'with view' do
-      before { go(view: 'parallel') }
+      before do
+        go(view: 'parallel')
+      end
 
       it 'saves the preferred diff view in a cookie' do
         expect(response.cookies['diff_view']).to eq('parallel')
@@ -605,7 +622,9 @@ describe Projects::MergeRequestsController do
           end
 
           context 'when the path does not exist in the diff' do
-            before { diff_for_path(id: merge_request.iid, old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb') }
+            before do
+              diff_for_path(id: merge_request.iid, old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb')
+            end
 
             it 'returns a 404' do
               expect(response).to have_http_status(404)
@@ -626,7 +645,9 @@ describe Projects::MergeRequestsController do
       end
 
       context 'when the merge request does not exist' do
-        before { diff_for_path(id: merge_request.iid.succ, old_path: existing_path, new_path: existing_path) }
+        before do
+          diff_for_path(id: merge_request.iid.succ, old_path: existing_path, new_path: existing_path)
+        end
 
         it 'returns a 404' do
           expect(response).to have_http_status(404)
@@ -670,7 +691,9 @@ describe Projects::MergeRequestsController do
       context 'when the source branch is in a different project to the target' do
         let(:other_project) { create(:project) }
 
-        before { other_project.team << [user, :master] }
+        before do
+          other_project.team << [user, :master]
+        end
 
         context 'when the path exists in the diff' do
           it 'disables diff notes' do
@@ -690,7 +713,9 @@ describe Projects::MergeRequestsController do
         end
 
         context 'when the path does not exist in the diff' do
-          before { diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' }) }
+          before do
+            diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
+          end
 
           it 'returns a 404' do
             expect(response).to have_http_status(404)
@@ -913,7 +938,9 @@ describe Projects::MergeRequestsController do
     end
 
     context 'when the file does not exist cannot be resolved in the UI' do
-      before { conflict_for_path('files/ruby/regexp.rb') }
+      before do
+        conflict_for_path('files/ruby/regexp.rb')
+      end
 
       it 'returns a 404 status code' do
         expect(response).to have_http_status(:not_found)
@@ -923,7 +950,9 @@ describe Projects::MergeRequestsController do
     context 'with an existing file' do
       let(:path) { 'files/ruby/regex.rb' }
 
-      before { conflict_for_path(path) }
+      before do
+        conflict_for_path(path)
+      end
 
       it 'returns a 200 status code' do
         expect(response).to have_http_status(:ok)
@@ -1195,7 +1224,9 @@ describe Projects::MergeRequestsController do
     end
 
     context 'when head_pipeline does not exist' do
-      before { get_pipeline_status }
+      before do
+        get_pipeline_status
+      end
 
       it 'return empty' do
         expect(response).to have_http_status(:ok)
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index 2294d5df581..f2b59ba82ca 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -16,10 +16,14 @@ describe Projects::ProjectMembersController do
   describe 'POST create' do
     let(:project_user) { create(:user) }
 
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when user does not have enough rights' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it 'returns 404' do
         post :create, namespace_id: project.namespace,
@@ -33,7 +37,9 @@ describe Projects::ProjectMembersController do
     end
 
     context 'when user has enough rights' do
-      before { project.team << [user, :master] }
+      before do
+        project.team << [user, :master]
+      end
 
       it 'adds user to members' do
         expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(status: :success)
@@ -64,7 +70,9 @@ describe Projects::ProjectMembersController do
   describe 'DELETE destroy' do
     let(:member) { create(:project_member, :developer, project: project) }
 
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when member is not found' do
       it 'returns 404' do
@@ -78,7 +86,9 @@ describe Projects::ProjectMembersController do
 
     context 'when member is found' do
       context 'when user does not have enough rights' do
-        before { project.team << [user, :developer] }
+        before do
+          project.team << [user, :developer]
+        end
 
         it 'returns 404' do
           delete :destroy, namespace_id: project.namespace,
@@ -91,7 +101,9 @@ describe Projects::ProjectMembersController do
       end
 
       context 'when user has enough rights' do
-        before { project.team << [user, :master] }
+        before do
+          project.team << [user, :master]
+        end
 
         it '[HTML] removes user from members' do
           delete :destroy, namespace_id: project.namespace,
@@ -117,7 +129,9 @@ describe Projects::ProjectMembersController do
   end
 
   describe 'DELETE leave' do
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when member is not found' do
       it 'returns 404' do
@@ -130,7 +144,9 @@ describe Projects::ProjectMembersController do
 
     context 'when member is found' do
       context 'and is not an owner' do
-        before { project.team << [user, :developer] }
+        before do
+          project.team << [user, :developer]
+        end
 
         it 'removes user from members' do
           delete :leave, namespace_id: project.namespace,
@@ -145,7 +161,9 @@ describe Projects::ProjectMembersController do
       context 'and is an owner' do
         let(:project) { create(:empty_project, namespace: user.namespace) }
 
-        before { project.team << [user, :master] }
+        before do
+          project.team << [user, :master]
+        end
 
         it 'cannot remove himself from the project' do
           delete :leave, namespace_id: project.namespace,
@@ -156,7 +174,9 @@ describe Projects::ProjectMembersController do
       end
 
       context 'and is a requester' do
-        before { project.request_access(user) }
+        before do
+          project.request_access(user)
+        end
 
         it 'removes user from members' do
           delete :leave, namespace_id: project.namespace,
@@ -172,7 +192,9 @@ describe Projects::ProjectMembersController do
   end
 
   describe 'POST request_access' do
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     it 'creates a new ProjectMember that is not a team member' do
       post :request_access, namespace_id: project.namespace,
@@ -190,7 +212,9 @@ describe Projects::ProjectMembersController do
   describe 'POST approve' do
     let(:member) { create(:project_member, :access_request, project: project) }
 
-    before { sign_in(user) }
+    before do
+      sign_in(user)
+    end
 
     context 'when member is not found' do
       it 'returns 404' do
@@ -204,7 +228,9 @@ describe Projects::ProjectMembersController do
 
     context 'when member is found' do
       context 'when user does not have enough rights' do
-        before { project.team << [user, :developer] }
+        before do
+          project.team << [user, :developer]
+        end
 
         it 'returns 404' do
           post :approve_access_request, namespace_id: project.namespace,
@@ -217,7 +243,9 @@ describe Projects::ProjectMembersController do
       end
 
       context 'when user has enough rights' do
-        before { project.team << [user, :master] }
+        before do
+          project.team << [user, :master]
+        end
 
         it 'adds user to members' do
           post :approve_access_request, namespace_id: project.namespace,
@@ -252,7 +280,10 @@ describe Projects::ProjectMembersController do
     end
 
     context 'when user can access source project members' do
-      before { another_project.team << [user, :guest] }
+      before do
+        another_project.team << [user, :guest]
+      end
+
       include_context 'import applied'
 
       it 'imports source project members' do
diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb
index 8c23c46798e..2434f822c6f 100644
--- a/spec/controllers/projects/snippets_controller_spec.rb
+++ b/spec/controllers/projects/snippets_controller_spec.rb
@@ -46,7 +46,9 @@ describe Projects::SnippetsController do
       end
 
       context 'when signed in as the author' do
-        before { sign_in(user) }
+        before do
+          sign_in(user)
+        end
 
         it 'renders the snippet' do
           get :index, namespace_id: project.namespace, project_id: project
@@ -57,7 +59,9 @@ describe Projects::SnippetsController do
       end
 
       context 'when signed in as a project member' do
-        before { sign_in(user2) }
+        before do
+          sign_in(user2)
+        end
 
         it 'renders the snippet' do
           get :index, namespace_id: project.namespace, project_id: project
@@ -317,7 +321,9 @@ describe Projects::SnippetsController do
         end
 
         context 'when signed in as the author' do
-          before { sign_in(user) }
+          before do
+            sign_in(user)
+          end
 
           it 'renders the snippet' do
             get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
@@ -328,7 +334,9 @@ describe Projects::SnippetsController do
         end
 
         context 'when signed in as a project member' do
-          before { sign_in(user2) }
+          before do
+            sign_in(user2)
+          end
 
           it 'renders the snippet' do
             get action, namespace_id: project.namespace, project_id: project, id: project_snippet.to_param
@@ -349,7 +357,9 @@ describe Projects::SnippetsController do
         end
 
         context 'when signed in' do
-          before { sign_in(user) }
+          before do
+            sign_in(user)
+          end
 
           it 'responds with status 404' do
             get action, namespace_id: project.namespace, project_id: project, id: 42
diff --git a/spec/controllers/projects/tags_controller_spec.rb b/spec/controllers/projects/tags_controller_spec.rb
index fc97bac64cd..c48f41ca12e 100644
--- a/spec/controllers/projects/tags_controller_spec.rb
+++ b/spec/controllers/projects/tags_controller_spec.rb
@@ -6,7 +6,9 @@ describe Projects::TagsController do
   let!(:invalid_release) { create(:release, project: project, tag: 'does-not-exist') }
 
   describe 'GET index' do
-    before { get :index, namespace_id: project.namespace.to_param, project_id: project }
+    before do
+      get :index, namespace_id: project.namespace.to_param, project_id: project
+    end
 
     it 'returns the tags for the page' do
       expect(assigns(:tags).map(&:name)).to eq(['v1.1.0', 'v1.0.0'])
@@ -19,7 +21,9 @@ describe Projects::TagsController do
   end
 
   describe 'GET show' do
-    before { get :show, namespace_id: project.namespace.to_param, project_id: project, id: id }
+    before do
+      get :show, namespace_id: project.namespace.to_param, project_id: project, id: id
+    end
 
     context "valid tag" do
       let(:id) { 'v1.0.0' }
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 4f6fc6691be..240a81367d0 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -29,7 +29,9 @@ describe ProjectsController do
 
   describe "GET show" do
     context "user not project member" do
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
       context "user does not have access to project" do
         let(:private_project) { create(:empty_project, :private) }
@@ -108,7 +110,9 @@ describe ProjectsController do
     context "project with empty repo" do
       let(:empty_project) { create(:project_empty_repo, :public) }
 
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
       User.project_views.keys.each do |project_view|
         context "with #{project_view} view set" do
@@ -128,7 +132,9 @@ describe ProjectsController do
     context "project with broken repo" do
       let(:empty_project) { create(:project_broken_repo, :public) }
 
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
       User.project_views.keys.each do |project_view|
         context "with #{project_view} view set" do
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 3173aae664c..a3708ad0908 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -18,7 +18,9 @@ describe SearchController do
 
   context 'on restricted projects' do
     context 'when signed out' do
-      before { sign_out(user) }
+      before do
+        sign_out(user)
+      end
 
       it "doesn't expose comments on issues" do
         project = create(:empty_project, :public, :issues_private)
diff --git a/spec/controllers/sent_notifications_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb
index 954fc2eaf21..0cc8a3b68eb 100644
--- a/spec/controllers/sent_notifications_controller_spec.rb
+++ b/spec/controllers/sent_notifications_controller_spec.rb
@@ -14,7 +14,9 @@ describe SentNotificationsController, type: :controller do
   describe 'GET unsubscribe' do
     context 'when the user is not logged in' do
       context 'when the force param is passed' do
-        before { get(:unsubscribe, id: sent_notification.reply_key, force: true) }
+        before do
+          get(:unsubscribe, id: sent_notification.reply_key, force: true)
+        end
 
         it 'unsubscribes the user' do
           expect(issue.subscribed?(user, project)).to be_falsey
@@ -30,7 +32,9 @@ describe SentNotificationsController, type: :controller do
       end
 
       context 'when the force param is not passed' do
-        before { get(:unsubscribe, id: sent_notification.reply_key) }
+        before do
+          get(:unsubscribe, id: sent_notification.reply_key)
+        end
 
         it 'does not unsubscribe the user' do
           expect(issue.subscribed?(user, project)).to be_truthy
@@ -47,10 +51,14 @@ describe SentNotificationsController, type: :controller do
     end
 
     context 'when the user is logged in' do
-      before { sign_in(user) }
+      before do
+        sign_in(user)
+      end
 
       context 'when the ID passed does not exist' do
-        before { get(:unsubscribe, id: sent_notification.reply_key.reverse) }
+        before do
+          get(:unsubscribe, id: sent_notification.reply_key.reverse)
+        end
 
         it 'does not unsubscribe the user' do
           expect(issue.subscribed?(user, project)).to be_truthy
@@ -66,7 +74,9 @@ describe SentNotificationsController, type: :controller do
       end
 
       context 'when the force param is passed' do
-        before { get(:unsubscribe, id: sent_notification.reply_key, force: true) }
+        before do
+          get(:unsubscribe, id: sent_notification.reply_key, force: true)
+        end
 
         it 'unsubscribes the user' do
           expect(issue.subscribed?(user, project)).to be_falsey
@@ -89,7 +99,10 @@ describe SentNotificationsController, type: :controller do
           end
         end
         let(:sent_notification) { create(:sent_notification, project: project, noteable: merge_request, recipient: user) }
-        before { get(:unsubscribe, id: sent_notification.reply_key) }
+
+        before do
+          get(:unsubscribe, id: sent_notification.reply_key)
+        end
 
         it 'unsubscribes the user' do
           expect(merge_request.subscribed?(user, project)).to be_falsey
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index e87e24a33a1..03f4b0ba343 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -142,7 +142,9 @@ describe SessionsController do
             end
 
             context 'when OTP is invalid' do
-              before { authenticate_2fa(otp_attempt: 'invalid') }
+              before do
+                authenticate_2fa(otp_attempt: 'invalid')
+              end
 
               it 'does not authenticate' do
                 expect(subject.current_user).not_to eq user
@@ -169,7 +171,9 @@ describe SessionsController do
             end
 
             context 'when OTP is invalid' do
-              before { authenticate_2fa(otp_attempt: 'invalid') }
+              before do
+                authenticate_2fa(otp_attempt: 'invalid')
+              end
 
               it 'does not authenticate' do
                 expect(subject.current_user).not_to eq user
diff --git a/spec/controllers/snippets_controller_spec.rb b/spec/controllers/snippets_controller_spec.rb
index 9073c39f562..b1339b2a185 100644
--- a/spec/controllers/snippets_controller_spec.rb
+++ b/spec/controllers/snippets_controller_spec.rb
@@ -437,7 +437,9 @@ describe SnippetsController do
         end
 
         context 'when signed in user is the author' do
-          before { get :raw, id: personal_snippet.to_param }
+          before do
+            get :raw, id: personal_snippet.to_param
+          end
 
           it 'responds with status 200' do
             expect(assigns(:snippet)).to eq(personal_snippet)
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index d33e2ba1e53..842d82cdbe9 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -43,7 +43,9 @@ describe UsersController do
       end
 
       context 'when logged in' do
-        before { sign_in(user) }
+        before do
+          sign_in(user)
+        end
 
         it 'renders show' do
           get :show, username: user.username
@@ -62,7 +64,9 @@ describe UsersController do
       end
 
       context 'when logged in' do
-        before { sign_in(user) }
+        before do
+          sign_in(user)
+        end
 
         it 'renders 404' do
           get :show, username: 'nonexistent'