From a6ec5121f0c844786c84c568a3200562ec58a9c2 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 14 Jun 2017 13:18:56 -0500
Subject: Correct RSpec/SingleLineHook cop offenses

---
 .../admin/identities_controller_spec.rb            |  5 +-
 spec/controllers/admin/services_controller_spec.rb |  4 +-
 spec/controllers/autocomplete_controller_spec.rb   |  4 +-
 .../groups/group_members_controller_spec.rb        | 56 +++++++++++----
 .../notification_settings_controller_spec.rb       | 13 +++-
 .../personal_access_tokens_controller_spec.rb      |  8 ++-
 .../controllers/projects/commit_controller_spec.rb |  8 ++-
 .../projects/compare_controller_spec.rb            | 12 +++-
 spec/controllers/projects/forks_controller_spec.rb | 16 +++--
 .../projects/group_links_controller_spec.rb        |  5 +-
 .../controllers/projects/issues_controller_spec.rb | 29 ++++++--
 .../projects/merge_requests_controller_spec.rb     | 61 ++++++++++++----
 .../projects/project_members_controller_spec.rb    | 61 ++++++++++++----
 .../projects/snippets_controller_spec.rb           | 20 ++++--
 spec/controllers/projects/tags_controller_spec.rb  |  8 ++-
 spec/controllers/projects_controller_spec.rb       | 12 +++-
 spec/controllers/search_controller_spec.rb         |  4 +-
 .../sent_notifications_controller_spec.rb          | 25 +++++--
 spec/controllers/sessions_controller_spec.rb       |  8 ++-
 spec/controllers/snippets_controller_spec.rb       |  4 +-
 spec/controllers/users_controller_spec.rb          |  8 ++-
 spec/features/admin/admin_runners_spec.rb          |  5 +-
 .../admin/admin_users_impersonation_tokens_spec.rb |  4 +-
 spec/features/admin/admin_users_spec.rb            |  9 ++-
 spec/features/dashboard/merge_requests_spec.rb     |  4 +-
 .../project_member_activity_index_spec.rb          | 12 +++-
 spec/features/expand_collapse_diffs_spec.rb        |  4 +-
 spec/features/groups/group_settings_spec.rb        | 11 ++-
 spec/features/groups_spec.rb                       |  8 ++-
 spec/features/issuables/default_sort_order_spec.rb |  8 ++-
 spec/features/issues_spec.rb                       |  5 +-
 spec/features/login_spec.rb                        | 12 ++--
 spec/features/merge_requests/conflicts_spec.rb     |  8 ++-
 .../merge_immediately_with_pipeline_spec.rb        |  4 +-
 spec/features/profiles/account_spec.rb             |  9 ++-
 spec/features/projects/pipelines/pipeline_spec.rb  | 20 ++++--
 spec/features/projects/pipelines/pipelines_spec.rb | 40 ++++++++---
 spec/features/projects/project_settings_spec.rb    | 23 ++++--
 spec/features/protected_branches_spec.rb           |  4 +-
 spec/features/protected_tags_spec.rb               |  4 +-
 spec/features/runners_spec.rb                      |  9 ++-
 spec/features/search_spec.rb                       |  4 +-
 .../security/project/internal_access_spec.rb       | 16 +++--
 .../security/project/public_access_spec.rb         | 16 +++--
 spec/features/signup_spec.rb                       |  8 ++-
 spec/features/task_lists_spec.rb                   |  4 +-
 spec/features/todos/todos_sorting_spec.rb          |  4 +-
 spec/features/triggers_spec.rb                     |  5 +-
 spec/features/u2f_spec.rb                          |  8 ++-
 spec/features/unsubscribe_links_spec.rb            |  4 +-
 spec/features/users_spec.rb                        |  4 +-
 spec/finders/issues_finder_spec.rb                 |  4 +-
 spec/finders/personal_access_tokens_finder_spec.rb | 84 ++++++++++++++++------
 spec/finders/personal_projects_finder_spec.rb      |  4 +-
 spec/finders/todos_finder_spec.rb                  |  4 +-
 spec/helpers/application_helper_spec.rb            |  5 +-
 spec/helpers/projects_helper_spec.rb               |  4 +-
 .../filter/external_issue_reference_filter_spec.rb |  4 +-
 spec/lib/banzai/filter/redactor_filter_spec.rb     |  8 ++-
 .../banzai/reference_parser/commit_parser_spec.rb  |  4 +-
 .../reference_parser/commit_range_parser_spec.rb   |  4 +-
 .../reference_parser/external_issue_parser_spec.rb |  4 +-
 .../banzai/reference_parser/label_parser_spec.rb   |  4 +-
 .../reference_parser/milestone_parser_spec.rb      |  4 +-
 spec/lib/extracts_path_spec.rb                     |  5 +-
 spec/lib/gitlab/auth/unique_ips_limiter_spec.rb    |  4 +-
 spec/lib/gitlab/badge/build/status_spec.rb         |  8 ++-
 .../chat_commands/presenters/issue_search_spec.rb  |  4 +-
 spec/lib/gitlab/checks/change_access_spec.rb       |  8 ++-
 spec/lib/gitlab/ci/config/entry/cache_spec.rb      |  4 +-
 .../lib/gitlab/ci/config/entry/environment_spec.rb |  4 +-
 spec/lib/gitlab/ci/config/entry/global_spec.rb     | 24 +++++--
 spec/lib/gitlab/ci/config/entry/job_spec.rb        | 16 +++--
 spec/lib/gitlab/ci/config/entry/jobs_spec.rb       |  8 ++-
 spec/lib/gitlab/ci/config/entry/service_spec.rb    |  4 +-
 spec/lib/gitlab/ci/config/entry/services_spec.rb   |  4 +-
 spec/lib/gitlab/ci/status/build/cancelable_spec.rb |  4 +-
 spec/lib/gitlab/ci/status/build/common_spec.rb     |  8 ++-
 spec/lib/gitlab/ci/status/build/factory_spec.rb    |  4 +-
 spec/lib/gitlab/ci/status/build/play_spec.rb       |  4 +-
 spec/lib/gitlab/ci/status/build/retryable_spec.rb  |  4 +-
 spec/lib/gitlab/ci/status/build/stop_spec.rb       |  4 +-
 spec/lib/gitlab/ci/status/external/common_spec.rb  |  4 +-
 spec/lib/gitlab/ci/status/pipeline/common_spec.rb  |  4 +-
 spec/lib/gitlab/database_spec.rb                   | 16 +++--
 spec/lib/gitlab/gfm/reference_rewriter_spec.rb     |  4 +-
 spec/lib/gitlab/git/repository_spec.rb             | 40 ++++++++---
 spec/lib/gitlab/git_access_spec.rb                 | 68 +++++++++++++-----
 spec/lib/gitlab/gitaly_client_spec.rb              | 24 +++++--
 spec/lib/gitlab/highlight_spec.rb                  |  4 +-
 spec/lib/gitlab/i18n_spec.rb                       |  4 +-
 spec/lib/gitlab/ldap/adapter_spec.rb               | 16 +++--
 spec/lib/gitlab/ldap/user_spec.rb                  | 16 +++--
 .../gitlab/middleware/rails_queue_duration_spec.rb |  8 ++-
 spec/lib/gitlab/o_auth/auth_hash_spec.rb           | 12 +++-
 spec/lib/gitlab/o_auth/user_spec.rb                | 84 ++++++++++++++++------
 spec/lib/gitlab/redis_spec.rb                      | 13 +++-
 spec/lib/gitlab/saml/user_spec.rb                  | 62 ++++++++++++----
 spec/lib/gitlab/serializer/pagination_spec.rb      |  4 +-
 spec/lib/gitlab/template/issue_template_spec.rb    |  9 ++-
 .../gitlab/template/merge_request_template_spec.rb |  9 ++-
 spec/lib/json_web_token/rsa_token_spec.rb          |  8 ++-
 spec/lib/json_web_token/token_spec.rb              |  5 +-
 spec/mailers/notify_spec.rb                        | 37 +++++++---
 .../rename_more_reserved_project_names_spec.rb     |  4 +-
 .../rename_reserved_project_names_spec.rb          |  4 +-
 spec/models/application_setting_spec.rb            |  4 +-
 spec/models/ci/build_spec.rb                       | 30 ++++++--
 spec/models/ci/pipeline_spec.rb                    |  4 +-
 spec/models/commit_spec.rb                         | 12 +++-
 spec/models/commit_status_spec.rb                  | 42 ++++++++---
 spec/models/concerns/access_requestable_spec.rb    |  8 ++-
 spec/models/concerns/issuable_spec.rb              | 16 +++--
 spec/models/concerns/mentionable_spec.rb           |  4 +-
 spec/models/concerns/reactive_caching_spec.rb      | 23 ++++--
 spec/models/concerns/token_authenticatable_spec.rb |  5 +-
 spec/models/generic_commit_status_spec.rb          |  9 ++-
 spec/models/group_spec.rb                          | 27 +++++--
 spec/models/issue_spec.rb                          | 18 +++--
 spec/models/merge_request_diff_spec.rb             |  8 ++-
 spec/models/merge_request_spec.rb                  | 16 +++--
 spec/models/note_spec.rb                           |  8 ++-
 .../models/project_services/bamboo_service_spec.rb |  8 ++-
 .../project_services/bugzilla_service_spec.rb      |  8 ++-
 .../project_services/buildkite_service_spec.rb     |  8 ++-
 .../project_services/campfire_service_spec.rb      |  8 ++-
 .../chat_message/wiki_page_message_spec.rb         | 40 ++++++++---
 .../custom_issue_tracker_service_spec.rb           |  8 ++-
 .../project_services/drone_ci_service_spec.rb      |  8 ++-
 .../emails_on_push_service_spec.rb                 |  8 ++-
 .../project_services/external_wiki_service_spec.rb |  8 ++-
 .../project_services/flowdock_service_spec.rb      |  8 ++-
 .../project_services/gemnasium_service_spec.rb     |  8 ++-
 .../project_services/hipchat_service_spec.rb       |  8 ++-
 spec/models/project_services/irker_service_spec.rb |  8 ++-
 spec/models/project_services/jira_service_spec.rb  |  8 ++-
 .../project_services/kubernetes_service_spec.rb    | 24 +++++--
 .../microsoft_teams_service_spec.rb                |  8 ++-
 .../pivotaltracker_service_spec.rb                 |  8 ++-
 .../project_services/prometheus_service_spec.rb    |  8 ++-
 .../project_services/pushover_service_spec.rb      |  8 ++-
 .../project_services/redmine_service_spec.rb       |  8 ++-
 .../project_services/teamcity_service_spec.rb      |  8 ++-
 spec/models/project_spec.rb                        | 28 ++++++--
 spec/models/project_team_spec.rb                   |  4 +-
 spec/models/project_wiki_spec.rb                   |  5 +-
 spec/models/route_spec.rb                          |  9 ++-
 spec/models/user_spec.rb                           | 16 +++--
 spec/policies/ci/build_policy_spec.rb              | 12 +++-
 spec/policies/project_snippet_policy_spec.rb       | 12 +++-
 spec/requests/api/award_emoji_spec.rb              |  4 +-
 spec/requests/api/commit_statuses_spec.rb          | 53 ++++++++++----
 spec/requests/api/commits_spec.rb                  | 12 +++-
 spec/requests/api/deploy_keys_spec.rb              |  8 ++-
 spec/requests/api/files_spec.rb                    |  4 +-
 spec/requests/api/helpers_spec.rb                  | 38 +++++++---
 spec/requests/api/keys_spec.rb                     |  4 +-
 spec/requests/api/labels_spec.rb                   | 12 +++-
 spec/requests/api/milestones_spec.rb               |  4 +-
 spec/requests/api/notes_spec.rb                    | 12 +++-
 spec/requests/api/pipelines_spec.rb                | 12 +++-
 spec/requests/api/projects_spec.rb                 | 43 +++++++----
 spec/requests/api/runner_spec.rb                   | 64 ++++++++++++-----
 spec/requests/api/system_hooks_spec.rb             |  4 +-
 spec/requests/api/templates_spec.rb                | 12 +++-
 spec/requests/api/users_spec.rb                    | 47 +++++++++---
 spec/requests/ci/api/builds_spec.rb                | 12 +++-
 spec/requests/ci/api/runners_spec.rb               |  9 ++-
 spec/requests/git_http_spec.rb                     | 23 ++++--
 spec/requests/jwt_controller_spec.rb               |  4 +-
 spec/routing/project_routing_spec.rb               |  8 ++-
 spec/routing/routing_spec.rb                       |  4 +-
 spec/serializers/environment_serializer_spec.rb    | 12 +++-
 spec/serializers/pipeline_details_entity_spec.rb   |  8 ++-
 spec/serializers/pipeline_entity_spec.rb           |  8 ++-
 spec/serializers/pipeline_serializer_spec.rb       |  8 ++-
 ...ntainer_registry_authentication_service_spec.rb | 24 +++++--
 .../services/ci/update_build_queue_service_spec.rb |  8 ++-
 spec/services/create_deployment_service_spec.rb    |  4 +-
 spec/services/groups/create_service_spec.rb        |  8 ++-
 spec/services/issues/create_service_spec.rb        |  4 +-
 spec/services/issues/move_service_spec.rb          | 10 ++-
 spec/services/issues/update_service_spec.rb        | 16 +++--
 spec/services/members/create_service_spec.rb       |  4 +-
 spec/services/merge_requests/build_service_spec.rb |  4 +-
 .../services/merge_requests/create_service_spec.rb |  4 +-
 spec/services/merge_requests/merge_service_spec.rb |  4 +-
 .../services/merge_requests/update_service_spec.rb | 12 +++-
 spec/services/notes/slash_commands_service_spec.rb |  4 +-
 spec/services/pages_service_spec.rb                | 12 +++-
 spec/services/projects/transfer_service_spec.rb    | 12 +++-
 .../slash_commands/interpret_service_spec.rb       | 10 ++-
 spec/services/spam_service_spec.rb                 |  4 +-
 spec/support/milestone_tabs_examples.rb            | 24 +++++--
 spec/support/reference_parser_shared_examples.rb   |  8 ++-
 ...reate_service_slash_commands_shared_examples.rb |  4 +-
 .../issuable_update_service_shared_examples.rb     |  4 +-
 ...ack_mattermost_notifications_shared_examples.rb |  8 ++-
 spec/support/unique_ip_check_shared_examples.rb    |  8 ++-
 spec/support/updating_mentions_shared_examples.rb  | 12 +++-
 spec/workers/emails_on_push_worker_spec.rb         |  4 +-
 spec/workers/expire_build_artifacts_worker_spec.rb |  8 ++-
 spec/workers/git_garbage_collect_worker_spec.rb    |  4 +-
 spec/workers/post_receive_spec.rb                  |  4 +-
 spec/workers/stuck_ci_jobs_worker_spec.rb          | 12 +++-
 205 files changed, 1940 insertions(+), 633 deletions(-)

(limited to 'spec')

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'
diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 5dcc7d35d82..bc11b090fdb 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -134,7 +134,10 @@ describe "Admin Runners" do
 
   describe 'runners registration token' do
     let!(:token) { current_application_settings.runners_registration_token }
-    before { visit admin_runners_path }
+
+    before do
+      visit admin_runners_path
+    end
 
     it 'has a registration token' do
       expect(page).to have_content("Registration token is #{token}")
diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
index 0fb4baeb71c..849ec829f75 100644
--- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb
+++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
@@ -12,7 +12,9 @@ describe 'Admin > Users > Impersonation Tokens', feature: true, js: true do
     find(".table.inactive-tokens")
   end
 
-  before { login_as(admin) }
+  before do
+    login_as(admin)
+  end
 
   describe "token creation" do
     it "allows creation of a token" do
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 301a47169a4..f72651667ee 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -124,7 +124,10 @@ describe "Admin::Users", feature: true do
 
     describe 'Impersonation' do
       let(:another_user) { create(:user) }
-      before { visit admin_user_path(another_user) }
+
+      before do
+        visit admin_user_path(another_user)
+      end
 
       context 'before impersonating' do
         it 'shows impersonate button for other users' do
@@ -149,7 +152,9 @@ describe "Admin::Users", feature: true do
       end
 
       context 'when impersonating' do
-        before { click_link 'Impersonate' }
+        before do
+          click_link 'Impersonate'
+        end
 
         it 'logs in as the user when impersonate is clicked' do
           expect(page.find(:css, '.header-user .profile-link')['data-user']).to eql(another_user.username)
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index 9cebe52c444..bcb52f602b0 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -12,7 +12,9 @@ describe 'Dashboard Merge Requests' do
   end
 
   describe 'new merge request dropdown' do
-    before { visit merge_requests_dashboard_path }
+    before do
+      visit merge_requests_dashboard_path
+    end
 
     it 'shows projects only with merge requests feature enabled', js: true do
       find('.new-project-item-select-button').trigger('click')
diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb
index cdf919af9b5..0ba87d921d0 100644
--- a/spec/features/dashboard/project_member_activity_index_spec.rb
+++ b/spec/features/dashboard/project_member_activity_index_spec.rb
@@ -17,19 +17,25 @@ feature 'Project member activity', feature: true, js: true do
   subject { page.find(".event-title").text }
 
   context 'when a user joins the project' do
-    before { visit_activities_and_wait_with_event(Event::JOINED) }
+    before do
+      visit_activities_and_wait_with_event(Event::JOINED)
+    end
 
     it { is_expected.to eq("#{user.name} joined project") }
   end
 
   context 'when a user leaves the project' do
-    before { visit_activities_and_wait_with_event(Event::LEFT) }
+    before do
+      visit_activities_and_wait_with_event(Event::LEFT)
+    end
 
     it { is_expected.to eq("#{user.name} left project") }
   end
 
   context 'when a users membership expires for the project' do
-    before { visit_activities_and_wait_with_event(Event::EXPIRED) }
+    before do
+      visit_activities_and_wait_with_event(Event::EXPIRED)
+    end
 
     it "presents the correct message" do
       message = "#{user.name} removed due to membership expiration from project"
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb
index 07521f50968..36b0c371e6e 100644
--- a/spec/features/expand_collapse_diffs_spec.rb
+++ b/spec/features/expand_collapse_diffs_spec.rb
@@ -140,7 +140,9 @@ feature 'Expand and collapse diffs', js: true, feature: true do
         end
 
         context 'reloading the page' do
-          before { refresh }
+          before do
+            refresh
+          end
 
           it 'collapses the large diff by default' do
             expect(large_diff).not_to have_selector('.code')
diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb
index cc25db4ad60..6afde1d0bed 100644
--- a/spec/features/groups/group_settings_spec.rb
+++ b/spec/features/groups/group_settings_spec.rb
@@ -52,9 +52,14 @@ feature 'Edit group settings', feature: true do
       given!(:project) { create(:project, group: group, path: 'project') }
       given(:old_project_full_path) { "/#{group.path}/#{project.path}" }
       given(:new_project_full_path) { "/#{new_group_path}/#{project.path}" }
-      
-      before(:context) { TestEnv.clean_test_path }
-      after(:example) { TestEnv.clean_test_path }
+
+      before(:context) do
+        TestEnv.clean_test_path
+      end
+
+      after(:example) do
+        TestEnv.clean_test_path
+      end
 
       scenario 'the project is accessible via the new path' do
         update_path(new_group_path)
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index 24ea7aba0cc..5737ca39b4e 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -12,7 +12,9 @@ feature 'Group', feature: true do
   end
 
   describe 'create a group' do
-    before { visit new_group_path }
+    before do
+      visit new_group_path
+    end
 
     describe 'with space in group path' do
       it 'renders new group form with validation errors' do
@@ -138,7 +140,9 @@ feature 'Group', feature: true do
     let(:path)  { edit_group_path(group) }
     let(:new_name) { 'new-name' }
 
-    before { visit path }
+    before do
+      visit path
+    end
 
     it 'saves new settings' do
       fill_in 'group_name', with: new_name
diff --git a/spec/features/issuables/default_sort_order_spec.rb b/spec/features/issuables/default_sort_order_spec.rb
index bfe43bff10f..56c9b10e757 100644
--- a/spec/features/issuables/default_sort_order_spec.rb
+++ b/spec/features/issuables/default_sort_order_spec.rb
@@ -153,7 +153,9 @@ describe 'Projects > Issuables > Default sort order', feature: true do
     context 'when the sort in the URL is id_desc' do
       let(:issuable_type) { :issue }
 
-      before { visit_issues(project, sort: 'id_desc') }
+      before do
+        visit_issues(project, sort: 'id_desc')
+      end
 
       it 'shows the sort order as last created' do
         expect(find('.issues-other-filters')).to have_content('Last created')
@@ -165,7 +167,9 @@ describe 'Projects > Issuables > Default sort order', feature: true do
     context 'when the sort in the URL is id_asc' do
       let(:issuable_type) { :issue }
 
-      before { visit_issues(project, sort: 'id_asc') }
+      before do
+        visit_issues(project, sort: 'id_asc')
+      end
 
       it 'shows the sort order as oldest created' do
         expect(find('.issues-other-filters')).to have_content('Oldest created')
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index eecc565d2bd..2cff53539f3 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -246,7 +246,10 @@ describe 'Issues', feature: true do
 
       context 'with a filter on labels' do
         let(:label) { create(:label, project: project) }
-        before { create(:label_link, label: label, target: foo) }
+
+        before do
+          create(:label_link, label: label, target: foo)
+        end
 
         it 'sorts by least recently due date by excluding nil due dates' do
           bar.update(due_date: nil)
diff --git a/spec/features/login_spec.rb b/spec/features/login_spec.rb
index c82e8c03343..4763f454810 100644
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
@@ -202,10 +202,12 @@ feature 'Login', feature: true do
     #  TODO: otp_grace_period_started_at
 
     context 'global setting' do
-      before(:each) { stub_application_setting(require_two_factor_authentication: true) }
+      before do
+        stub_application_setting(require_two_factor_authentication: true)
+      end
 
       context 'with grace period defined' do
-        before(:each) do
+        before do
           stub_application_setting(two_factor_grace_period: 48)
           login_with(user)
         end
@@ -242,7 +244,7 @@ feature 'Login', feature: true do
       end
 
       context 'without grace period defined' do
-        before(:each) do
+        before do
           stub_application_setting(two_factor_grace_period: 0)
           login_with(user)
         end
@@ -265,7 +267,7 @@ feature 'Login', feature: true do
       end
 
       context 'with grace period defined' do
-        before(:each) do
+        before do
           stub_application_setting(two_factor_grace_period: 48)
           login_with(user)
         end
@@ -306,7 +308,7 @@ feature 'Login', feature: true do
       end
 
       context 'without grace period defined' do
-        before(:each) do
+        before do
           stub_application_setting(two_factor_grace_period: 0)
           login_with(user)
         end
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb
index 27e2d5d16f3..9409c32104b 100644
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -85,14 +85,18 @@ feature 'Merge request conflict resolution', js: true, feature: true do
     context 'the conflicts are resolvable' do
       let(:merge_request) { create_merge_request('conflict-resolvable') }
 
-      before { visit namespace_project_merge_request_path(project.namespace, project, merge_request) }
+      before do
+        visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+      end
 
       it 'shows a link to the conflict resolution page' do
         expect(page).to have_link('conflicts', href: /\/conflicts\Z/)
       end
 
       context 'in Inline view mode' do
-        before { click_link('conflicts', href: /\/conflicts\Z/) }
+        before do
+          click_link('conflicts', href: /\/conflicts\Z/)
+        end
 
         include_examples "conflicts are resolved in Interactive mode"
         include_examples "conflicts are resolved in Edit inline mode"
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
index c1d4d508e57..836a7b6e09a 100644
--- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
+++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
@@ -18,7 +18,9 @@ feature 'Merge immediately', :feature, :js do
                          sha: project.repository.commit('master').id)
   end
 
-  before { project.team << [user, :master] }
+  before do
+    project.team << [user, :master]
+  end
 
   context 'when there is active pipeline for merge request' do
     background do
diff --git a/spec/features/profiles/account_spec.rb b/spec/features/profiles/account_spec.rb
index 05a7587f8d4..89868c737f7 100644
--- a/spec/features/profiles/account_spec.rb
+++ b/spec/features/profiles/account_spec.rb
@@ -31,8 +31,13 @@ feature 'Profile > Account', feature: true do
       given(:new_project_path) { "/#{new_username}/#{project.path}" }
       given(:old_project_path) { "/#{user.username}/#{project.path}" }
 
-      before(:context) { TestEnv.clean_test_path }
-      after(:example) { TestEnv.clean_test_path }
+      before(:context) do
+        TestEnv.clean_test_path
+      end
+
+      after(:example) do
+        TestEnv.clean_test_path
+      end
 
       scenario 'the project is accessible via the new path' do
         update_username(new_username)
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 36a3ddca6ef..12c5ad45baf 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -47,7 +47,9 @@ describe 'Pipeline', :feature, :js do
     let(:project) { create(:project) }
     let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id, user: user) }
 
-    before { visit namespace_project_pipeline_path(project.namespace, project, pipeline) }
+    before do
+      visit namespace_project_pipeline_path(project.namespace, project, pipeline)
+    end
 
     it 'shows the pipeline graph' do
       expect(page).to have_selector('.pipeline-visualization')
@@ -164,7 +166,9 @@ describe 'Pipeline', :feature, :js do
       it { expect(page).not_to have_content('retried') }
 
       context 'when retrying' do
-        before { find('.js-retry-button').trigger('click') }
+        before do
+          find('.js-retry-button').trigger('click')
+        end
 
         it { expect(page).not_to have_content('Retry') }
       end
@@ -174,7 +178,9 @@ describe 'Pipeline', :feature, :js do
       it { expect(page).not_to have_selector('.ci-canceled') }
 
       context 'when canceling' do
-        before { click_on 'Cancel running' }
+        before do
+          click_on 'Cancel running'
+        end
 
         it { expect(page).not_to have_content('Cancel running') }
       end
@@ -226,7 +232,9 @@ describe 'Pipeline', :feature, :js do
       it { expect(page).not_to have_content('retried') }
 
       context 'when retrying' do
-        before { find('.js-retry-button').trigger('click') }
+        before do
+          find('.js-retry-button').trigger('click')
+        end
 
         it { expect(page).not_to have_content('Retry') }
       end
@@ -236,7 +244,9 @@ describe 'Pipeline', :feature, :js do
       it { expect(page).not_to have_selector('.ci-canceled') }
 
       context 'when canceling' do
-        before { click_on 'Cancel running' }
+        before do
+          click_on 'Cancel running'
+        end
 
         it { expect(page).not_to have_content('Cancel running') }
       end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 05c2bf350f1..026e2ce5b68 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -149,7 +149,9 @@ describe 'Pipelines', :feature, :js do
           create(:ci_pipeline, :invalid, project: project)
         end
 
-        before { visit_project_pipelines }
+        before do
+          visit_project_pipelines
+        end
 
         it 'contains badge that indicates errors' do
           expect(page).to have_content 'yaml invalid'
@@ -171,7 +173,9 @@ describe 'Pipelines', :feature, :js do
             commands: 'test')
         end
 
-        before { visit_project_pipelines }
+        before do
+          visit_project_pipelines
+        end
 
         it 'has a dropdown with play button' do
           expect(page).to have_selector('.dropdown-toggle.btn.btn-default .icon-play')
@@ -204,7 +208,9 @@ describe 'Pipelines', :feature, :js do
               stage: 'test')
           end
 
-          before { visit_project_pipelines }
+          before do
+            visit_project_pipelines
+          end
 
           it 'is cancelable' do
             expect(page).to have_selector('.js-pipelines-cancel-button')
@@ -215,7 +221,9 @@ describe 'Pipelines', :feature, :js do
           end
 
           context 'when canceling' do
-            before { find('.js-pipelines-cancel-button').trigger('click') }
+            before do
+              find('.js-pipelines-cancel-button').trigger('click')
+            end
 
             it 'indicates that pipeline was canceled' do
               expect(page).not_to have_selector('.js-pipelines-cancel-button')
@@ -255,7 +263,9 @@ describe 'Pipelines', :feature, :js do
               stage: 'test')
           end
 
-          before { visit_project_pipelines }
+          before do
+            visit_project_pipelines
+          end
 
           it 'has artifats' do
             expect(page).to have_selector('.build-artifacts')
@@ -284,7 +294,9 @@ describe 'Pipelines', :feature, :js do
               stage: 'test')
           end
 
-          before { visit_project_pipelines }
+          before do
+            visit_project_pipelines
+          end
 
           it { expect(page).not_to have_selector('.build-artifacts') }
         end
@@ -297,7 +309,9 @@ describe 'Pipelines', :feature, :js do
               stage: 'test')
           end
 
-          before { visit_project_pipelines }
+          before do
+            visit_project_pipelines
+          end
 
           it { expect(page).not_to have_selector('.build-artifacts') }
         end
@@ -310,7 +324,9 @@ describe 'Pipelines', :feature, :js do
                                       name: 'build')
         end
 
-        before { visit_project_pipelines }
+        before do
+          visit_project_pipelines
+        end
 
         it 'should render a mini pipeline graph' do
           expect(page).to have_selector('.js-mini-pipeline-graph')
@@ -437,7 +453,9 @@ describe 'Pipelines', :feature, :js do
         end
 
         context 'with gitlab-ci.yml' do
-          before { stub_ci_pipeline_to_return_yaml_file }
+          before do
+            stub_ci_pipeline_to_return_yaml_file
+          end
 
           it 'creates a new pipeline' do
             expect { click_on 'Create pipeline' }
@@ -448,7 +466,9 @@ describe 'Pipelines', :feature, :js do
         end
 
         context 'without gitlab-ci.yml' do
-          before { click_on 'Create pipeline' }
+          before do
+            click_on 'Create pipeline'
+          end
 
           it { expect(page).to have_content('Missing .gitlab-ci.yml file') }
         end
diff --git a/spec/features/projects/project_settings_spec.rb b/spec/features/projects/project_settings_spec.rb
index 11dcab4d737..2a9b32ea07e 100644
--- a/spec/features/projects/project_settings_spec.rb
+++ b/spec/features/projects/project_settings_spec.rb
@@ -58,8 +58,13 @@ describe 'Edit Project Settings', feature: true do
       # Not using empty project because we need a repo to exist
       let(:project) { create(:project, namespace: user.namespace, name: 'gitlabhq') }
 
-      before(:context) { TestEnv.clean_test_path }
-      after(:example) { TestEnv.clean_test_path }
+      before(:context) do
+        TestEnv.clean_test_path
+      end
+
+      after(:example) do
+        TestEnv.clean_test_path
+      end
 
       specify 'the project is accessible via the new path' do
         rename_project(project, path: 'bar')
@@ -96,9 +101,17 @@ describe 'Edit Project Settings', feature: true do
     let!(:project) { create(:project, namespace: user.namespace, name: 'gitlabhq') }
     let!(:group) { create(:group) }
 
-    before(:context) { TestEnv.clean_test_path }
-    before(:example) { group.add_owner(user) }
-    after(:example) { TestEnv.clean_test_path }
+    before(:context) do
+      TestEnv.clean_test_path
+    end
+
+    before(:example) do
+      group.add_owner(user)
+    end
+
+    after(:example) do
+      TestEnv.clean_test_path
+    end
 
     specify 'the project is accessible via the new path' do
       transfer_project(project, group)
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 667895bffa5..aa9164dd979 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -4,7 +4,9 @@ feature 'Protected Branches', feature: true, js: true do
   let(:user) { create(:user, :admin) }
   let(:project) { create(:project, :repository) }
 
-  before { login_as(user) }
+  before do
+    login_as(user)
+  end
 
   def set_protected_branch_name(branch_name)
     find(".js-protected-branch-select").trigger('click')
diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb
index 66236dbc7fc..63a20585776 100644
--- a/spec/features/protected_tags_spec.rb
+++ b/spec/features/protected_tags_spec.rb
@@ -4,7 +4,9 @@ feature 'Projected Tags', feature: true, js: true do
   let(:user) { create(:user, :admin) }
   let(:project) { create(:project, :repository) }
 
-  before { login_as(user) }
+  before do
+    login_as(user)
+  end
 
   def set_protected_tag_name(tag_name)
     find(".js-protected-tag-select").click
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 0e1cc9a0f73..e87d52f5c8f 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -4,7 +4,10 @@ describe "Runners" do
   include GitlabRoutingHelper
 
   let(:user) { create(:user) }
-  before { login_as(user) }
+
+  before do
+    login_as(user)
+  end
 
   describe "specific runners" do
     before do
@@ -127,7 +130,9 @@ describe "Runners" do
     end
 
     context 'when runner has tags' do
-      before { runner.update_attribute(:tag_list, ['tag']) }
+      before do
+        runner.update_attribute(:tag_list, ['tag'])
+      end
 
       scenario 'user wants to prevent runner from running untagged job' do
         visit runners_path(project)
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 7834807b1f1..89d4f536b20 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -83,7 +83,9 @@ describe "Search", feature: true  do
       let(:project) { create(:project, :repository) }
       let(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'Bug here') }
 
-      before { note.update_attributes(commit_id: 12345678) }
+      before do
+        note.update_attributes(commit_id: 12345678)
+      end
 
       it 'finds comment' do
         visit namespace_project_path(project.namespace, project)
diff --git a/spec/features/security/project/internal_access_spec.rb b/spec/features/security/project/internal_access_spec.rb
index 2a2655bbdb5..f33406a40a7 100644
--- a/spec/features/security/project/internal_access_spec.rb
+++ b/spec/features/security/project/internal_access_spec.rb
@@ -337,7 +337,9 @@ describe "Internal Project Access", feature: true  do
     subject { namespace_project_jobs_path(project.namespace, project) }
 
     context "when allowed for public and internal" do
-      before { project.update(public_builds: true) }
+      before do
+        project.update(public_builds: true)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
@@ -351,7 +353,9 @@ describe "Internal Project Access", feature: true  do
     end
 
     context "when disallowed for public and internal" do
-      before { project.update(public_builds: false) }
+      before do
+        project.update(public_builds: false)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
@@ -371,7 +375,9 @@ describe "Internal Project Access", feature: true  do
     subject { namespace_project_job_path(project.namespace, project, build.id) }
 
     context "when allowed for public and internal" do
-      before { project.update(public_builds: true) }
+      before do
+        project.update(public_builds: true)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
@@ -385,7 +391,9 @@ describe "Internal Project Access", feature: true  do
     end
 
     context "when disallowed for public and internal" do
-      before { project.update(public_builds: false) }
+      before do
+        project.update(public_builds: false)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 35d5163941e..16a1331b2f3 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -157,7 +157,9 @@ describe "Public Project Access", feature: true  do
     subject { namespace_project_jobs_path(project.namespace, project) }
 
     context "when allowed for public" do
-      before { project.update(public_builds: true) }
+      before do
+        project.update(public_builds: true)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
@@ -171,7 +173,9 @@ describe "Public Project Access", feature: true  do
     end
 
     context "when disallowed for public" do
-      before { project.update(public_builds: false) }
+      before do
+        project.update(public_builds: false)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
@@ -191,7 +195,9 @@ describe "Public Project Access", feature: true  do
     subject { namespace_project_job_path(project.namespace, project, build.id) }
 
     context "when allowed for public" do
-      before { project.update(public_builds: true) }
+      before do
+        project.update(public_builds: true)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
@@ -205,7 +211,9 @@ describe "Public Project Access", feature: true  do
     end
 
     context "when disallowed for public" do
-      before { project.update(public_builds: false) }
+      before do
+        project.update(public_builds: false)
+      end
 
       it { is_expected.to be_allowed_for(:admin) }
       it { is_expected.to be_allowed_for(:owner).of(project) }
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index d7b6dda4946..5d6d1e79af2 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 feature 'Signup', feature: true do
   describe 'signup with no errors' do
     context "when sending confirmation email" do
-      before { stub_application_setting(send_user_confirmation_email: true) }
+      before do
+        stub_application_setting(send_user_confirmation_email: true)
+      end
 
       it 'creates the user account and sends a confirmation email' do
         user = build(:user)
@@ -23,7 +25,9 @@ feature 'Signup', feature: true do
     end
 
     context "when not sending confirmation email" do
-      before { stub_application_setting(send_user_confirmation_email: false) }
+      before do
+        stub_application_setting(send_user_confirmation_email: false)
+      end
 
       it 'creates the user account and goes to dashboard' do
         user = build(:user)
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 563e65d3cc5..51b1b8e2328 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -144,7 +144,9 @@ feature 'Task Lists', feature: true do
     describe 'nested tasks', js: true do
       let(:issue) { create(:issue, description: nested_tasks_markdown, author: user, project: project) }
 
-      before { visit_issue(project, issue) }
+      before do
+        visit_issue(project, issue)
+      end
 
       it 'renders' do
         expect(page).to have_selector('ul.task-list',      count: 2)
diff --git a/spec/features/todos/todos_sorting_spec.rb b/spec/features/todos/todos_sorting_spec.rb
index 4d5bd476301..f012d250887 100644
--- a/spec/features/todos/todos_sorting_spec.rb
+++ b/spec/features/todos/todos_sorting_spec.rb
@@ -8,7 +8,9 @@ describe "Dashboard > User sorts todos", feature: true do
   let(:label_2) { create(:label, title: 'label_2', project: project, priority: 2) }
   let(:label_3) { create(:label, title: 'label_3', project: project, priority: 3) }
 
-  before { project.team << [user, :developer] }
+  before do
+    project.team << [user, :developer]
+  end
 
   context 'sort options' do
     let(:issue_1) { create(:issue, title: 'issue_1', project: project) }
diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb
index c1ae6db00c6..2ea9992173d 100644
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
@@ -5,7 +5,10 @@ feature 'Triggers', feature: true, js: true do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let(:guest_user) { create(:user) }
-  before { login_as(user) }
+
+  before do
+    login_as(user)
+  end
 
   before do
     @project = create(:empty_project)
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index 2fed8067042..dc21637967f 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -1,7 +1,9 @@
 require 'spec_helper'
 
 feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
-  before { allow_any_instance_of(U2fHelper).to receive(:inject_u2f_api?).and_return(true) }
+  before do
+    allow_any_instance_of(U2fHelper).to receive(:inject_u2f_api?).and_return(true)
+  end
 
   def manage_two_factor_authentication
     click_on 'Manage two-factor authentication'
@@ -28,7 +30,9 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
     end
 
     describe 'when 2FA via OTP is disabled' do
-      before { user.update_attribute(:otp_required_for_login, false) }
+      before do
+        user.update_attribute(:otp_required_for_login, false)
+      end
 
       it 'does not allow registering a new device' do
         visit profile_account_path
diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb
index 8509551ce4a..0a8db15c75f 100644
--- a/spec/features/unsubscribe_links_spec.rb
+++ b/spec/features/unsubscribe_links_spec.rb
@@ -56,7 +56,9 @@ describe 'Unsubscribe links', feature: true do
   end
 
   context 'when logged in' do
-    before { login_as(recipient) }
+    before do
+      login_as(recipient)
+    end
 
     it 'unsubscribes from the issue when visiting the link from the email body' do
       visit body_link
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index fbe078bd136..c241dae12cf 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -45,7 +45,9 @@ feature 'Users', feature: true, js: true do
   end
 
   describe 'redirect alias routes' do
-    before { user }
+    before do
+      expect(user).to be_persisted
+    end
 
     scenario '/u/user1 redirects to user page' do
       visit '/u/user1'
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 96151689359..8f2d60f2f1b 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -148,7 +148,9 @@ describe IssuesFinder do
         let(:params) { { label_name: [label.title, label2.title].join(',') } }
         let(:label2) { create(:label, project: project2) }
 
-        before { create(:label_link, label: label2, target: issue2) }
+        before do
+          create(:label_link, label: label2, target: issue2)
+        end
 
         it 'returns the unique issues with any of those labels' do
           expect(issues).to contain_exactly(issue2)
diff --git a/spec/finders/personal_access_tokens_finder_spec.rb b/spec/finders/personal_access_tokens_finder_spec.rb
index fd92664ca24..3f22b3a253d 100644
--- a/spec/finders/personal_access_tokens_finder_spec.rb
+++ b/spec/finders/personal_access_tokens_finder_spec.rb
@@ -25,49 +25,65 @@ describe PersonalAccessTokensFinder do
       end
 
       describe 'without impersonation' do
-        before { params[:impersonation] = false }
+        before do
+          params[:impersonation] = false
+        end
 
         it { is_expected.to contain_exactly(active_personal_access_token, revoked_personal_access_token, expired_personal_access_token) }
 
         describe 'with active state' do
-          before { params[:state] = 'active' }
+          before do
+            params[:state] = 'active'
+          end
 
           it { is_expected.to contain_exactly(active_personal_access_token) }
         end
 
         describe 'with inactive state' do
-          before { params[:state] = 'inactive' }
+          before do
+            params[:state] = 'inactive'
+          end
 
           it { is_expected.to contain_exactly(revoked_personal_access_token, expired_personal_access_token) }
         end
       end
 
       describe 'with impersonation' do
-        before { params[:impersonation] = true }
+        before do
+          params[:impersonation] = true
+        end
 
         it { is_expected.to contain_exactly(active_impersonation_token, revoked_impersonation_token, expired_impersonation_token) }
 
         describe 'with active state' do
-          before { params[:state] = 'active' }
+          before do
+            params[:state] = 'active'
+          end
 
           it { is_expected.to contain_exactly(active_impersonation_token) }
         end
 
         describe 'with inactive state' do
-          before { params[:state] = 'inactive' }
+          before do
+            params[:state] = 'inactive'
+          end
 
           it { is_expected.to contain_exactly(revoked_impersonation_token, expired_impersonation_token) }
         end
       end
 
       describe 'with active state' do
-        before { params[:state] = 'active' }
+        before do
+          params[:state] = 'active'
+        end
 
         it { is_expected.to contain_exactly(active_personal_access_token, active_impersonation_token) }
       end
 
       describe 'with inactive state' do
-        before { params[:state] = 'inactive' }
+        before do
+          params[:state] = 'inactive'
+        end
 
         it do
           is_expected.to contain_exactly(expired_personal_access_token, revoked_personal_access_token,
@@ -81,7 +97,9 @@ describe PersonalAccessTokensFinder do
         it { is_expected.to eq(active_personal_access_token) }
 
         describe 'with impersonation' do
-          before { params[:impersonation] = true }
+          before do
+            params[:impersonation] = true
+          end
 
           it { is_expected.to be_nil }
         end
@@ -93,7 +111,9 @@ describe PersonalAccessTokensFinder do
         it { is_expected.to eq(active_personal_access_token) }
 
         describe 'with impersonation' do
-          before { params[:impersonation] = true }
+          before do
+            params[:impersonation] = true
+          end
 
           it { is_expected.to be_nil }
         end
@@ -109,7 +129,9 @@ describe PersonalAccessTokensFinder do
       let!(:other_user_expired_impersonation_token) { create(:personal_access_token, :expired, :impersonation, user: user2) }
       let!(:other_user_revoked_impersonation_token) { create(:personal_access_token, :revoked, :impersonation, user: user2) }
 
-      before { params[:user] = user }
+      before do
+        params[:user] = user
+      end
 
       it do
         is_expected.to contain_exactly(active_personal_access_token, active_impersonation_token,
@@ -118,49 +140,65 @@ describe PersonalAccessTokensFinder do
       end
 
       describe 'without impersonation' do
-        before { params[:impersonation] = false }
+        before do
+          params[:impersonation] = false
+        end
 
         it { is_expected.to contain_exactly(active_personal_access_token, revoked_personal_access_token, expired_personal_access_token) }
 
         describe 'with active state' do
-          before { params[:state] = 'active' }
+          before do
+            params[:state] = 'active'
+          end
 
           it { is_expected.to contain_exactly(active_personal_access_token) }
         end
 
         describe 'with inactive state' do
-          before { params[:state] = 'inactive' }
+          before do
+            params[:state] = 'inactive'
+          end
 
           it { is_expected.to contain_exactly(revoked_personal_access_token, expired_personal_access_token) }
         end
       end
 
       describe 'with impersonation' do
-        before { params[:impersonation] = true }
+        before do
+          params[:impersonation] = true
+        end
 
         it { is_expected.to contain_exactly(active_impersonation_token, revoked_impersonation_token, expired_impersonation_token) }
 
         describe 'with active state' do
-          before { params[:state] = 'active' }
+          before do
+            params[:state] = 'active'
+          end
 
           it { is_expected.to contain_exactly(active_impersonation_token) }
         end
 
         describe 'with inactive state' do
-          before { params[:state] = 'inactive' }
+          before do
+            params[:state] = 'inactive'
+          end
 
           it { is_expected.to contain_exactly(revoked_impersonation_token, expired_impersonation_token) }
         end
       end
 
       describe 'with active state' do
-        before { params[:state] = 'active' }
+        before do
+          params[:state] = 'active'
+        end
 
         it { is_expected.to contain_exactly(active_personal_access_token, active_impersonation_token) }
       end
 
       describe 'with inactive state' do
-        before { params[:state] = 'inactive' }
+        before do
+          params[:state] = 'inactive'
+        end
 
         it do
           is_expected.to contain_exactly(expired_personal_access_token, revoked_personal_access_token,
@@ -174,7 +212,9 @@ describe PersonalAccessTokensFinder do
         it { is_expected.to eq(active_personal_access_token) }
 
         describe 'with impersonation' do
-          before { params[:impersonation] = true }
+          before do
+            params[:impersonation] = true
+          end
 
           it { is_expected.to be_nil }
         end
@@ -186,7 +226,9 @@ describe PersonalAccessTokensFinder do
         it { is_expected.to eq(active_personal_access_token) }
 
         describe 'with impersonation' do
-          before { params[:impersonation] = true }
+          before do
+            params[:impersonation] = true
+          end
 
           it { is_expected.to be_nil }
         end
diff --git a/spec/finders/personal_projects_finder_spec.rb b/spec/finders/personal_projects_finder_spec.rb
index e0e17af681a..304b0fb67fb 100644
--- a/spec/finders/personal_projects_finder_spec.rb
+++ b/spec/finders/personal_projects_finder_spec.rb
@@ -32,7 +32,9 @@ describe PersonalProjectsFinder do
     end
 
     context 'external' do
-      before { current_user.update_attributes(external: true) }
+      before do
+        current_user.update_attributes(external: true)
+      end
 
       it { is_expected.to eq([private_project, public_project]) }
     end
diff --git a/spec/finders/todos_finder_spec.rb b/spec/finders/todos_finder_spec.rb
index f7e7e733cf7..8be447418b0 100644
--- a/spec/finders/todos_finder_spec.rb
+++ b/spec/finders/todos_finder_spec.rb
@@ -6,7 +6,9 @@ describe TodosFinder do
     let(:project)       { create(:empty_project) }
     let(:finder)        { described_class }
 
-    before { project.team << [user, :developer] }
+    before do
+      project.team << [user, :developer]
+    end
 
     describe '#sort' do
       context 'by date' do
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index b91afcc5a25..cc7f889b927 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -261,7 +261,10 @@ describe ApplicationHelper do
   describe '#support_url' do
     context 'when alternate support url is specified' do
       let(:alternate_url) { 'http://company.example.com/getting-help' }
-      before { allow(current_application_settings).to receive(:help_page_support_url) { alternate_url } }
+
+      before do
+        allow(current_application_settings).to receive(:help_page_support_url) { alternate_url }
+      end
 
       it 'returns the alternate support url' do
         expect(helper.support_url).to eq(alternate_url)
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 3ed0b0a756b..9a4086725d2 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -250,7 +250,9 @@ describe ProjectsHelper do
     end
 
     context "when project is private" do
-      before { project.update_attributes(visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
+      before do
+        project.update_attributes(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
+      end
 
       it "shows only allowed options" do
         helper.instance_variable_set(:@project, project)
diff --git a/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb b/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
index fbf7a461fa5..76cefe112fb 100644
--- a/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/external_issue_reference_filter_spec.rb
@@ -82,7 +82,9 @@ describe Banzai::Filter::ExternalIssueReferenceFilter, lib: true do
     context 'with RequestStore enabled' do
       let(:reference_filter) { HTML::Pipeline.new([described_class]) }
 
-      before { allow(RequestStore).to receive(:active?).and_return(true) }
+      before do
+        allow(RequestStore).to receive(:active?).and_return(true)
+      end
 
       it 'queries the collection on the first call' do
         expect_any_instance_of(Project).to receive(:default_issues_tracker?).once.and_call_original
diff --git a/spec/lib/banzai/filter/redactor_filter_spec.rb b/spec/lib/banzai/filter/redactor_filter_spec.rb
index 7c4a0f32c7b..97504aebed5 100644
--- a/spec/lib/banzai/filter/redactor_filter_spec.rb
+++ b/spec/lib/banzai/filter/redactor_filter_spec.rb
@@ -39,7 +39,9 @@ describe Banzai::Filter::RedactorFilter, lib: true do
     end
 
     context 'valid projects' do
-      before { allow_any_instance_of(Banzai::ReferenceParser::BaseParser).to receive(:can_read_reference?).and_return(true) }
+      before do
+        allow_any_instance_of(Banzai::ReferenceParser::BaseParser).to receive(:can_read_reference?).and_return(true)
+      end
 
       it 'allows permitted Project references' do
         user = create(:user)
@@ -54,7 +56,9 @@ describe Banzai::Filter::RedactorFilter, lib: true do
     end
 
     context 'invalid projects' do
-      before { allow_any_instance_of(Banzai::ReferenceParser::BaseParser).to receive(:can_read_reference?).and_return(false) }
+      before do
+        allow_any_instance_of(Banzai::ReferenceParser::BaseParser).to receive(:can_read_reference?).and_return(false)
+      end
 
       it 'removes unpermitted references' do
         user = create(:user)
diff --git a/spec/lib/banzai/reference_parser/commit_parser_spec.rb b/spec/lib/banzai/reference_parser/commit_parser_spec.rb
index 412ffa77c36..583ce63a8ab 100644
--- a/spec/lib/banzai/reference_parser/commit_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/commit_parser_spec.rb
@@ -10,7 +10,9 @@ describe Banzai::ReferenceParser::CommitParser, lib: true do
 
   describe '#nodes_visible_to_user' do
     context 'when the link has a data-issue attribute' do
-      before { link['data-commit'] = 123 }
+      before do
+        link['data-commit'] = 123
+      end
 
       it_behaves_like "referenced feature visibility", "repository"
     end
diff --git a/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb b/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
index 96e55b0997a..8c0f5d7df97 100644
--- a/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/commit_range_parser_spec.rb
@@ -10,7 +10,9 @@ describe Banzai::ReferenceParser::CommitRangeParser, lib: true do
 
   describe '#nodes_visible_to_user' do
     context 'when the link has a data-issue attribute' do
-      before { link['data-commit-range'] = '123..456' }
+      before do
+        link['data-commit-range'] = '123..456'
+      end
 
       it_behaves_like "referenced feature visibility", "repository"
     end
diff --git a/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb b/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb
index 0af36776a54..d212bbac619 100644
--- a/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/external_issue_parser_spec.rb
@@ -10,7 +10,9 @@ describe Banzai::ReferenceParser::ExternalIssueParser, lib: true do
 
   describe '#nodes_visible_to_user' do
     context 'when the link has a data-issue attribute' do
-      before { link['data-external-issue'] = 123 }
+      before do
+        link['data-external-issue'] = 123
+      end
 
       levels = [ProjectFeature::DISABLED, ProjectFeature::PRIVATE, ProjectFeature::ENABLED]
 
diff --git a/spec/lib/banzai/reference_parser/label_parser_spec.rb b/spec/lib/banzai/reference_parser/label_parser_spec.rb
index 8c540d35ddd..ddd699f3c25 100644
--- a/spec/lib/banzai/reference_parser/label_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/label_parser_spec.rb
@@ -11,7 +11,9 @@ describe Banzai::ReferenceParser::LabelParser, lib: true do
 
   describe '#nodes_visible_to_user' do
     context 'when the link has a data-issue attribute' do
-      before { link['data-label'] = label.id.to_s }
+      before do
+        link['data-label'] = label.id.to_s
+      end
 
       it_behaves_like "referenced feature visibility", "issues", "merge_requests"
     end
diff --git a/spec/lib/banzai/reference_parser/milestone_parser_spec.rb b/spec/lib/banzai/reference_parser/milestone_parser_spec.rb
index 2d4d589ae34..72d4f3bc18e 100644
--- a/spec/lib/banzai/reference_parser/milestone_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/milestone_parser_spec.rb
@@ -11,7 +11,9 @@ describe Banzai::ReferenceParser::MilestoneParser, lib: true do
 
   describe '#nodes_visible_to_user' do
     context 'when the link has a data-issue attribute' do
-      before { link['data-milestone'] = milestone.id.to_s }
+      before do
+        link['data-milestone'] = milestone.id.to_s
+      end
 
       it_behaves_like "referenced feature visibility", "issues", "merge_requests"
     end
diff --git a/spec/lib/extracts_path_spec.rb b/spec/lib/extracts_path_spec.rb
index 33ab005667a..2b26a318583 100644
--- a/spec/lib/extracts_path_spec.rb
+++ b/spec/lib/extracts_path_spec.rb
@@ -77,7 +77,10 @@ describe ExtractsPath, lib: true do
 
       context 'without a path' do
         let(:params) { { ref: 'v1.0.0.atom' } }
-        before { assign_ref_vars }
+
+        before do
+          assign_ref_vars
+        end
 
         it 'sets the un-suffixed version as @ref' do
           expect(@ref).to eq('v1.0.0')
diff --git a/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb b/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
index 94dcddcc30c..fc72df575be 100644
--- a/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
+++ b/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
@@ -40,7 +40,9 @@ describe Gitlab::Auth::UniqueIpsLimiter, :redis, lib: true do
     end
 
     context 'allow 2 unique ips' do
-      before { current_application_settings.update!(unique_ips_limit_per_user: 2) }
+      before do
+        current_application_settings.update!(unique_ips_limit_per_user: 2)
+      end
 
       it 'blocks user trying to login from third ip' do
         change_ip('ip1')
diff --git a/spec/lib/gitlab/badge/build/status_spec.rb b/spec/lib/gitlab/badge/build/status_spec.rb
index 3c5414701a7..6abf4ca46a9 100644
--- a/spec/lib/gitlab/badge/build/status_spec.rb
+++ b/spec/lib/gitlab/badge/build/status_spec.rb
@@ -29,7 +29,9 @@ describe Gitlab::Badge::Build::Status do
     let!(:build) { create_build(project, sha, branch) }
 
     context 'build success' do
-      before { build.success! }
+      before do
+        build.success!
+      end
 
       describe '#status' do
         it 'is successful' do
@@ -39,7 +41,9 @@ describe Gitlab::Badge::Build::Status do
     end
 
     context 'build failed' do
-      before { build.drop! }
+      before do
+        build.drop!
+      end
 
       describe '#status' do
         it 'failed' do
diff --git a/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb b/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb
index ec6d3e34a96..3799a324db4 100644
--- a/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb
+++ b/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::ChatCommands::Presenters::IssueSearch do
   let(:project) { create(:empty_project) }
   let(:message) { subject[:text] }
 
-  before { create_list(:issue, 2, project: project) }
+  before do
+    create_list(:issue, 2, project: project)
+  end
 
   subject { described_class.new(project.issues).present }
 
diff --git a/spec/lib/gitlab/checks/change_access_spec.rb b/spec/lib/gitlab/checks/change_access_spec.rb
index c0c309d8179..643e590438a 100644
--- a/spec/lib/gitlab/checks/change_access_spec.rb
+++ b/spec/lib/gitlab/checks/change_access_spec.rb
@@ -20,7 +20,9 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
       ).exec
     end
 
-    before { project.add_developer(user) }
+    before do
+      project.add_developer(user)
+    end
 
     context 'without failed checks' do
       it "doesn't raise an error" do
@@ -50,7 +52,9 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
         let!(:protected_tag) { create(:protected_tag, project: project, name: 'v*') }
 
         context 'as master' do
-          before { project.add_master(user) }
+          before do
+            project.add_master(user)
+          end
 
           context 'deletion' do
             let(:oldrev) { 'be93687618e4b132087f430a4d8fc3a609c9b77c' }
diff --git a/spec/lib/gitlab/ci/config/entry/cache_spec.rb b/spec/lib/gitlab/ci/config/entry/cache_spec.rb
index 2ed120f356a..878b1d6b862 100644
--- a/spec/lib/gitlab/ci/config/entry/cache_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/cache_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::Ci::Config::Entry::Cache do
   let(:entry) { described_class.new(config) }
 
   describe 'validations' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     context 'when entry config value is correct' do
       let(:config) do
diff --git a/spec/lib/gitlab/ci/config/entry/environment_spec.rb b/spec/lib/gitlab/ci/config/entry/environment_spec.rb
index c330e609337..3c0007f4d57 100644
--- a/spec/lib/gitlab/ci/config/entry/environment_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/environment_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Environment do
   let(:entry) { described_class.new(config) }
 
-  before { entry.compose! }
+  before do
+    entry.compose!
+  end
 
   context 'when configuration is a string' do
     let(:config) { 'production' }
diff --git a/spec/lib/gitlab/ci/config/entry/global_spec.rb b/spec/lib/gitlab/ci/config/entry/global_spec.rb
index e5f85c712ca..293f112b2b0 100644
--- a/spec/lib/gitlab/ci/config/entry/global_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/global_spec.rb
@@ -33,7 +33,9 @@ describe Gitlab::Ci::Config::Entry::Global do
       end
 
       describe '#compose!' do
-        before { global.compose! }
+        before do
+          global.compose!
+        end
 
         it 'creates nodes hash' do
           expect(global.descendants).to be_an Array
@@ -79,7 +81,9 @@ describe Gitlab::Ci::Config::Entry::Global do
       end
 
       context 'when composed' do
-        before { global.compose! }
+        before do
+          global.compose!
+        end
 
         describe '#errors' do
           it 'has no errors' do
@@ -175,7 +179,9 @@ describe Gitlab::Ci::Config::Entry::Global do
     end
 
     context 'when most of entires not defined' do
-      before { global.compose! }
+      before do
+        global.compose!
+      end
 
       let(:hash) do
         { cache: { key: 'a' }, rspec: { script: %w[ls] } }
@@ -218,7 +224,9 @@ describe Gitlab::Ci::Config::Entry::Global do
     # details.
     #
     context 'when entires specified but not defined' do
-      before { global.compose! }
+      before do
+        global.compose!
+      end
 
       let(:hash) do
         { variables: nil, rspec: { script: 'rspec' } }
@@ -233,7 +241,9 @@ describe Gitlab::Ci::Config::Entry::Global do
   end
 
   context 'when configuration is not valid' do
-    before { global.compose! }
+    before do
+      global.compose!
+    end
 
     context 'when before script is not an array' do
       let(:hash) do
@@ -297,7 +307,9 @@ describe Gitlab::Ci::Config::Entry::Global do
   end
 
   describe '#[]' do
-    before { global.compose! }
+    before do
+      global.compose!
+    end
 
     let(:hash) do
       { cache: { key: 'a' }, rspec: { script: 'ls' } }
diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 8dc94a4eb33..92cba689f47 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -18,7 +18,9 @@ describe Gitlab::Ci::Config::Entry::Job do
   end
 
   describe 'validations' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     context 'when entry config value is correct' do
       let(:config) { { script: 'rspec' } }
@@ -97,7 +99,9 @@ describe Gitlab::Ci::Config::Entry::Job do
     let(:deps) { double('deps', '[]' => unspecified) }
 
     context 'when job config overrides global config' do
-      before { entry.compose!(deps) }
+      before do
+        entry.compose!(deps)
+      end
 
       let(:config) do
         { script: 'rspec', image: 'some_image', cache: { key: 'test' } }
@@ -125,10 +129,14 @@ describe Gitlab::Ci::Config::Entry::Job do
   end
 
   context 'when composed' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     describe '#value' do
-      before { entry.compose! }
+      before do
+        entry.compose!
+      end
 
       context 'when entry is correct' do
         let(:config) do
diff --git a/spec/lib/gitlab/ci/config/entry/jobs_spec.rb b/spec/lib/gitlab/ci/config/entry/jobs_spec.rb
index 7d104372ac6..c0a2b6517e3 100644
--- a/spec/lib/gitlab/ci/config/entry/jobs_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/jobs_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::Ci::Config::Entry::Jobs do
   let(:entry) { described_class.new(config) }
 
   describe 'validations' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     context 'when entry config value is correct' do
       let(:config) { { rspec: { script: 'rspec' } } }
@@ -48,7 +50,9 @@ describe Gitlab::Ci::Config::Entry::Jobs do
   end
 
   context 'when valid job entries composed' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     let(:config) do
       { rspec: { script: 'rspec' },
diff --git a/spec/lib/gitlab/ci/config/entry/service_spec.rb b/spec/lib/gitlab/ci/config/entry/service_spec.rb
index 2376de74554..7202fe525e4 100644
--- a/spec/lib/gitlab/ci/config/entry/service_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/service_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Service do
   let(:entry) { described_class.new(config) }
 
-  before { entry.compose! }
+  before do
+    entry.compose!
+  end
 
   context 'when configuration is a string' do
     let(:config) { 'postgresql:9.5' }
diff --git a/spec/lib/gitlab/ci/config/entry/services_spec.rb b/spec/lib/gitlab/ci/config/entry/services_spec.rb
index b32e52f8f26..7c4319aee63 100644
--- a/spec/lib/gitlab/ci/config/entry/services_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/services_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Services do
   let(:entry) { described_class.new(config) }
 
-  before { entry.compose! }
+  before do
+    entry.compose!
+  end
 
   context 'when configuration is valid' do
     let(:config) { ['postgresql:9.5', { name: 'postgresql:9.1', alias: 'postgres_old' }] }
diff --git a/spec/lib/gitlab/ci/status/build/cancelable_spec.rb b/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
index 8ad9b7cdf07..114d2490490 100644
--- a/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
@@ -47,7 +47,9 @@ describe Gitlab::Ci::Status::Build::Cancelable do
 
     describe '#has_action?' do
       context 'when user is allowed to update build' do
-        before { build.project.team << [user, :developer] }
+        before do
+          build.project.team << [user, :developer]
+        end
 
         it { is_expected.to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/build/common_spec.rb b/spec/lib/gitlab/ci/status/build/common_spec.rb
index 72bd7c4eb93..03d1f46b517 100644
--- a/spec/lib/gitlab/ci/status/build/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/common_spec.rb
@@ -17,13 +17,17 @@ describe Gitlab::Ci::Status::Build::Common do
 
   describe '#has_details?' do
     context 'when user has access to read build' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it { is_expected.to have_details }
     end
 
     context 'when user does not have access to read build' do
-      before { project.update(public_builds: false) }
+      before do
+        project.update(public_builds: false)
+      end
 
       it { is_expected.not_to have_details }
     end
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index 3f30b2c38f2..c8a97016f20 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -6,7 +6,9 @@ describe Gitlab::Ci::Status::Build::Factory do
   let(:status) { factory.fabricate! }
   let(:factory) { described_class.new(build, user) }
 
-  before { project.team << [user, :developer] }
+  before do
+    project.team << [user, :developer]
+  end
 
   context 'when build is successful' do
     let(:build) { create(:ci_build, :success) }
diff --git a/spec/lib/gitlab/ci/status/build/play_spec.rb b/spec/lib/gitlab/ci/status/build/play_spec.rb
index 0e15a5f3c6b..32b2e62e4e0 100644
--- a/spec/lib/gitlab/ci/status/build/play_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/play_spec.rb
@@ -28,7 +28,9 @@ describe Gitlab::Ci::Status::Build::Play do
       end
 
       context 'when user can not push to the branch' do
-        before { build.project.add_developer(user) }
+        before do
+          build.project.add_developer(user)
+        end
 
         it { is_expected.not_to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/build/retryable_spec.rb b/spec/lib/gitlab/ci/status/build/retryable_spec.rb
index 2db0f8d29bd..099d873fc01 100644
--- a/spec/lib/gitlab/ci/status/build/retryable_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/retryable_spec.rb
@@ -47,7 +47,9 @@ describe Gitlab::Ci::Status::Build::Retryable do
 
     describe '#has_action?' do
       context 'when user is allowed to update build' do
-        before { build.project.team << [user, :developer] }
+        before do
+          build.project.team << [user, :developer]
+        end
 
         it { is_expected.to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/build/stop_spec.rb b/spec/lib/gitlab/ci/status/build/stop_spec.rb
index 8d021c35a69..23902f26b1a 100644
--- a/spec/lib/gitlab/ci/status/build/stop_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/stop_spec.rb
@@ -19,7 +19,9 @@ describe Gitlab::Ci::Status::Build::Stop do
 
     describe '#has_action?' do
       context 'when user is allowed to update build' do
-        before { build.project.team << [user, :developer] }
+        before do
+          build.project.team << [user, :developer]
+        end
 
         it { is_expected.to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/external/common_spec.rb b/spec/lib/gitlab/ci/status/external/common_spec.rb
index e58f5d8d4df..b38fbee2486 100644
--- a/spec/lib/gitlab/ci/status/external/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/external/common_spec.rb
@@ -28,7 +28,9 @@ describe Gitlab::Ci::Status::External::Common do
 
   describe '#has_details?' do
     context 'when user has access to read commit status' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it { is_expected.to have_details }
     end
diff --git a/spec/lib/gitlab/ci/status/pipeline/common_spec.rb b/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
index d665674bf70..f5fd31e8d03 100644
--- a/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
@@ -17,7 +17,9 @@ describe Gitlab::Ci::Status::Pipeline::Common do
 
   describe '#has_details?' do
     context 'when user has access to read pipeline' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it { is_expected.to have_details }
     end
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 9b1d66a1b1c..26e5d73d333 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -53,14 +53,18 @@ describe Gitlab::Database, lib: true do
 
   describe '.nulls_last_order' do
     context 'when using PostgreSQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(true) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(true)
+      end
 
       it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column ASC NULLS LAST'}
       it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC NULLS LAST'}
     end
 
     context 'when using MySQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(false) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(false)
+      end
 
       it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column IS NULL, column ASC'}
       it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC'}
@@ -69,14 +73,18 @@ describe Gitlab::Database, lib: true do
 
   describe '.nulls_first_order' do
     context 'when using PostgreSQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(true) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(true)
+      end
 
       it { expect(described_class.nulls_first_order('column', 'ASC')).to eq 'column ASC NULLS FIRST'}
       it { expect(described_class.nulls_first_order('column', 'DESC')).to eq 'column DESC NULLS FIRST'}
     end
 
     context 'when using MySQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(false) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(false)
+      end
 
       it { expect(described_class.nulls_first_order('column', 'ASC')).to eq 'column ASC'}
       it { expect(described_class.nulls_first_order('column', 'DESC')).to eq 'column IS NULL, column DESC'}
diff --git a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
index 5d416c9eec3..eaec699ad90 100644
--- a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
+++ b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
@@ -6,7 +6,9 @@ describe Gitlab::Gfm::ReferenceRewriter do
   let(:new_project) { create(:empty_project, name: 'new-project') }
   let(:user) { create(:user) }
 
-  before { old_project.team << [user, :reporter] }
+  before do
+    old_project.team << [user, :reporter]
+  end
 
   describe '#rewrite' do
     subject do
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index e1e4aa9fde9..eee4c9eab6d 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -16,7 +16,9 @@ describe Gitlab::Git::Repository, seed_helper: true do
 
   describe '#root_ref' do
     context 'with gitaly disabled' do
-      before { allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false) }
+      before do
+        allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
+      end
 
       it 'calls #discover_default_branch' do
         expect(repository).to receive(:discover_default_branch)
@@ -25,8 +27,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the branch name from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:default_branch_name)
@@ -120,8 +127,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     it { is_expected.not_to include("branch-from-space") }
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the branch names from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:branch_names)
@@ -158,8 +170,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     it { is_expected.not_to include("v5.0.0") }
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the tag names from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:tag_names)
@@ -1280,8 +1297,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the branches from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:local_branches).
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index 36d1d777583..3dcc20c48e8 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -60,7 +60,9 @@ describe Gitlab::GitAccess, lib: true do
           let(:actor) { deploy_key }
 
           context 'when the DeployKey has access to the project' do
-            before { deploy_key.projects << project }
+            before do
+              deploy_key.projects << project
+            end
 
             it 'allows pull access' do
               expect { pull_access_check }.not_to raise_error
@@ -84,7 +86,9 @@ describe Gitlab::GitAccess, lib: true do
 
         context 'when actor is a User' do
           context 'when the User can read the project' do
-            before { project.team << [user, :master] }
+            before do
+              project.team << [user, :master]
+            end
 
             it 'allows pull access' do
               expect { pull_access_check }.not_to raise_error
@@ -159,7 +163,9 @@ describe Gitlab::GitAccess, lib: true do
   end
 
   describe '#check_command_disabled!' do
-    before { project.team << [user, :master] }
+    before do
+      project.team << [user, :master]
+    end
 
     context 'over http' do
       let(:protocol) { 'http' }
@@ -196,7 +202,9 @@ describe Gitlab::GitAccess, lib: true do
 
   describe '#check_download_access!' do
     describe 'master permissions' do
-      before { project.team << [user, :master] }
+      before do
+        project.team << [user, :master]
+      end
 
       context 'pull code' do
         it { expect { pull_access_check }.not_to raise_error }
@@ -204,7 +212,9 @@ describe Gitlab::GitAccess, lib: true do
     end
 
     describe 'guest permissions' do
-      before { project.team << [user, :guest] }
+      before do
+        project.team << [user, :guest]
+      end
 
       context 'pull code' do
         it { expect { pull_access_check }.to raise_unauthorized('You are not allowed to download code from this project.') }
@@ -253,7 +263,9 @@ describe Gitlab::GitAccess, lib: true do
 
       context 'pull code' do
         context 'when project is authorized' do
-          before { key.projects << project }
+          before do
+            key.projects << project
+          end
 
           it { expect { pull_access_check }.not_to raise_error }
         end
@@ -292,7 +304,9 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       describe 'reporter user' do
-        before { project.team << [user, :reporter] }
+        before do
+          project.team << [user, :reporter]
+        end
 
         context 'pull code' do
           it { expect { pull_access_check }.not_to raise_error }
@@ -303,7 +317,9 @@ describe Gitlab::GitAccess, lib: true do
         let(:user) { create(:admin) }
 
         context 'when member of the project' do
-          before { project.team << [user, :reporter] }
+          before do
+            project.team << [user, :reporter]
+          end
 
           context 'pull code' do
             it { expect { pull_access_check }.not_to raise_error }
@@ -328,7 +344,9 @@ describe Gitlab::GitAccess, lib: true do
   end
 
   describe '#check_push_access!' do
-    before { merge_into_protected_branch }
+    before do
+      merge_into_protected_branch
+    end
     let(:unprotected_branch) { 'unprotected_branch' }
 
     let(:changes) do
@@ -457,19 +475,25 @@ describe Gitlab::GitAccess, lib: true do
 
     [%w(feature exact), ['feat*', 'wildcard']].each do |protected_branch_name, protected_branch_type|
       context do
-        before { create(:protected_branch, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix)
       end
 
       context "when developers are allowed to push into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :developers_can_push, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :developers_can_push, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
       end
 
       context "developers are allowed to merge into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :developers_can_merge, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :developers_can_merge, name: protected_branch_name, project: project)
+        end
 
         context "when a merge request exists for the given source/target branch" do
           context "when the merge request is in progress" do
@@ -496,13 +520,17 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       context "when developers are allowed to push and merge into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :developers_can_merge, :developers_can_push, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :developers_can_merge, :developers_can_push, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
       end
 
       context "when no one is allowed to push to the #{protected_branch_name} protected branch" do
-        before { create(:protected_branch, :no_one_can_push, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :no_one_can_push, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: false, push_all: false, merge_into_protected_branch: false },
                                                             master: { push_protected_branch: false, push_all: false, merge_into_protected_branch: false },
@@ -515,7 +543,9 @@ describe Gitlab::GitAccess, lib: true do
     let(:authentication_abilities) { build_authentication_abilities }
 
     context 'when project is authorized' do
-      before { project.team << [user, :reporter] }
+      before do
+        project.team << [user, :reporter]
+      end
 
       it { expect { push_access_check }.to raise_unauthorized('You are not allowed to upload code for this project.') }
     end
@@ -549,7 +579,9 @@ describe Gitlab::GitAccess, lib: true do
       let(:can_push) { true }
 
       context 'when project is authorized' do
-        before { key.projects << project }
+        before do
+          key.projects << project
+        end
 
         it { expect { push_access_check }.not_to raise_error }
       end
@@ -579,7 +611,9 @@ describe Gitlab::GitAccess, lib: true do
       let(:can_push) { false }
 
       context 'when project is authorized' do
-        before { key.projects << project }
+        before do
+          key.projects << project
+        end
 
         it { expect { push_access_check }.to raise_unauthorized('This deploy key does not have write access to this project.') }
       end
diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb
index 95ecba67532..ce7b18b784a 100644
--- a/spec/lib/gitlab/gitaly_client_spec.rb
+++ b/spec/lib/gitlab/gitaly_client_spec.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
 describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
   describe '.stub' do
     # Notice that this is referring to gRPC "stubs", not rspec stubs
-    before { described_class.clear_stubs! }
+    before do
+      described_class.clear_stubs!
+    end
 
     context 'when passed a UNIX socket address' do
       it 'passes the address as-is to GRPC' do
@@ -41,7 +43,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
     let(:real_feature_name) { "gitaly_#{feature_name}" }
 
     context 'when Gitaly is disabled' do
-      before { allow(described_class).to receive(:enabled?).and_return(false) }
+      before do
+        allow(described_class).to receive(:enabled?).and_return(false)
+      end
 
       it 'returns false' do
         expect(described_class.feature_enabled?(feature_name)).to be(false)
@@ -66,7 +70,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to disable" do
-        before { Feature.get(real_feature_name).disable }
+        before do
+          Feature.get(real_feature_name).disable
+        end
 
         it 'returns false' do
           expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
@@ -74,7 +80,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to enable" do
-        before { Feature.get(real_feature_name).enable }
+        before do
+          Feature.get(real_feature_name).enable
+        end
 
         it 'returns true' do
           expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
@@ -82,7 +90,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to a percentage of time" do
-        before { Feature.get(real_feature_name).enable_percentage_of_time(70) }
+        before do
+          Feature.get(real_feature_name).enable_percentage_of_time(70)
+        end
 
         it 'bases the result on pseudo-random numbers' do
           expect(Random).to receive(:rand).and_return(0.3)
@@ -104,7 +114,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to disable" do
-        before { Feature.get(real_feature_name).disable }
+        before do
+          Feature.get(real_feature_name).disable
+        end
 
         it 'returns false' do
           expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb
index c2bb9f9a166..fdc5b484ef1 100644
--- a/spec/lib/gitlab/highlight_spec.rb
+++ b/spec/lib/gitlab/highlight_spec.rb
@@ -15,7 +15,9 @@ describe Gitlab::Highlight, lib: true do
       Gitlab::Highlight.new(blob.path, blob.data, repository: repository)
     end
 
-    before { project.change_head('gitattributes') }
+    before do
+      project.change_head('gitattributes')
+    end
 
     describe 'basic language selection' do
       let(:path) { 'custom-highlighting/test.gitlab-custom' }
diff --git a/spec/lib/gitlab/i18n_spec.rb b/spec/lib/gitlab/i18n_spec.rb
index a3dbeaa3753..0dba4132101 100644
--- a/spec/lib/gitlab/i18n_spec.rb
+++ b/spec/lib/gitlab/i18n_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::I18n, lib: true do
   let(:user) { create(:user, preferred_language: 'es') }
 
   describe '.locale=' do
-    after { described_class.use_default_locale }
+    after do
+      described_class.use_default_locale
+    end
 
     it 'sets the locale based on current user preferred language' do
       described_class.locale = user.preferred_language
diff --git a/spec/lib/gitlab/ldap/adapter_spec.rb b/spec/lib/gitlab/ldap/adapter_spec.rb
index 563c074017a..9454878b057 100644
--- a/spec/lib/gitlab/ldap/adapter_spec.rb
+++ b/spec/lib/gitlab/ldap/adapter_spec.rb
@@ -74,13 +74,17 @@ describe Gitlab::LDAP::Adapter, lib: true do
     subject { adapter.dn_matches_filter?(:dn, :filter) }
 
     context "when the search result is non-empty" do
-      before { allow(adapter).to receive(:ldap_search).and_return([:foo]) }
+      before do
+        allow(adapter).to receive(:ldap_search).and_return([:foo])
+      end
 
       it { is_expected.to be_truthy }
     end
 
     context "when the search result is empty" do
-      before { allow(adapter).to receive(:ldap_search).and_return([]) }
+      before do
+        allow(adapter).to receive(:ldap_search).and_return([])
+      end
 
       it { is_expected.to be_falsey }
     end
@@ -91,13 +95,17 @@ describe Gitlab::LDAP::Adapter, lib: true do
 
     context "when the search is successful" do
       context "and the result is non-empty" do
-        before { allow(ldap).to receive(:search).and_return([:foo]) }
+        before do
+          allow(ldap).to receive(:search).and_return([:foo])
+        end
 
         it { is_expected.to eq [:foo] }
       end
 
       context "and the result is empty" do
-        before { allow(ldap).to receive(:search).and_return([]) }
+        before do
+          allow(ldap).to receive(:search).and_return([])
+        end
 
         it { is_expected.to eq [] }
       end
diff --git a/spec/lib/gitlab/ldap/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb
index a0eda685ca3..f0a1dd22fee 100644
--- a/spec/lib/gitlab/ldap/user_spec.rb
+++ b/spec/lib/gitlab/ldap/user_spec.rb
@@ -173,7 +173,9 @@ describe Gitlab::LDAP::User, lib: true do
 
     context 'signup' do
       context 'dont block on create' do
-        before { configure_block(false) }
+        before do
+          configure_block(false)
+        end
 
         it do
           ldap_user.save
@@ -183,7 +185,9 @@ describe Gitlab::LDAP::User, lib: true do
       end
 
       context 'block on create' do
-        before { configure_block(true) }
+        before do
+          configure_block(true)
+        end
 
         it do
           ldap_user.save
@@ -200,7 +204,9 @@ describe Gitlab::LDAP::User, lib: true do
       end
 
       context 'dont block on create' do
-        before { configure_block(false) }
+        before do
+          configure_block(false)
+        end
 
         it do
           ldap_user.save
@@ -210,7 +216,9 @@ describe Gitlab::LDAP::User, lib: true do
       end
 
       context 'block on create' do
-        before { configure_block(true) }
+        before do
+          configure_block(true)
+        end
 
         it do
           ldap_user.save
diff --git a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
index 168090d5b5c..88107536c9e 100644
--- a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
+++ b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
@@ -6,7 +6,9 @@ describe Gitlab::Middleware::RailsQueueDuration do
   let(:env) { {} }
   let(:transaction) { double(:transaction) }
 
-  before { expect(app).to receive(:call).with(env).and_return('yay') }
+  before do
+    expect(app).to receive(:call).with(env).and_return('yay')
+  end
 
   describe '#call' do
     it 'calls the app when metrics are disabled' do
@@ -15,7 +17,9 @@ describe Gitlab::Middleware::RailsQueueDuration do
     end
 
     context 'when metrics are enabled' do
-      before { allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction) }
+      before do
+        allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction)
+      end
 
       it 'calls the app when metrics are enabled but no timing header is found' do
         expect(middleware.call(env)).to eq('yay')
diff --git a/spec/lib/gitlab/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
index 8aaeb5779d3..19ab17419fc 100644
--- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
@@ -55,7 +55,9 @@ describe Gitlab::OAuth::AuthHash, lib: true do
   end
 
   context 'email not provided' do
-    before { info_hash.delete(:email) }
+    before do
+      info_hash.delete(:email)
+    end
 
     it 'generates a temp email' do
       expect( auth_hash.email).to start_with('temp-email-for-oauth')
@@ -63,7 +65,9 @@ describe Gitlab::OAuth::AuthHash, lib: true do
   end
 
   context 'username not provided' do
-    before { info_hash.delete(:nickname) }
+    before do
+      info_hash.delete(:nickname)
+    end
 
     it 'takes the first part of the email as username' do
       expect(auth_hash.username).to eql 'onur.kucuk_ABC-123'
@@ -71,7 +75,9 @@ describe Gitlab::OAuth::AuthHash, lib: true do
   end
 
   context 'name not provided' do
-    before { info_hash.delete(:name) }
+    before do
+      info_hash.delete(:name)
+    end
 
     it 'concats first and lastname as the name' do
       expect(auth_hash.name).to eql name_utf8
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
index 8943d1aa488..ea29cb9caf1 100644
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
@@ -112,7 +112,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'with new allow_single_sign_on enabled syntax' do
-          before { stub_omniauth_config(allow_single_sign_on: ['twitter']) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: ['twitter'])
+          end
 
           it "creates a user from Omniauth" do
             oauth_user.save
@@ -125,7 +127,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context "with old allow_single_sign_on enabled syntax" do
-          before { stub_omniauth_config(allow_single_sign_on: true) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: true)
+          end
 
           it "creates a user from Omniauth" do
             oauth_user.save
@@ -138,14 +142,20 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'with new allow_single_sign_on disabled syntax' do
-          before { stub_omniauth_config(allow_single_sign_on: []) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: [])
+          end
+
           it 'throws an error' do
             expect{ oauth_user.save }.to raise_error StandardError
           end
         end
 
         context 'with old allow_single_sign_on disabled (Default)' do
-          before { stub_omniauth_config(allow_single_sign_on: false) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: false)
+          end
+
           it 'throws an error' do
             expect{ oauth_user.save }.to raise_error StandardError
           end
@@ -153,21 +163,30 @@ describe Gitlab::OAuth::User, lib: true do
       end
 
       context "with auto_link_ldap_user disabled (default)" do
-        before { stub_omniauth_config(auto_link_ldap_user: false) }
+        before do
+          stub_omniauth_config(auto_link_ldap_user: false)
+        end
+
         include_examples "to verify compliance with allow_single_sign_on"
       end
 
       context "with auto_link_ldap_user enabled" do
-        before { stub_omniauth_config(auto_link_ldap_user: true) }
+        before do
+          stub_omniauth_config(auto_link_ldap_user: true)
+        end
 
         context "and no LDAP provider defined" do
-          before { stub_ldap_config(providers: []) }
+          before do
+            stub_ldap_config(providers: [])
+          end
 
           include_examples "to verify compliance with allow_single_sign_on"
         end
 
         context "and at least one LDAP provider is defined" do
-          before { stub_ldap_config(providers: %w(ldapmain)) }
+          before do
+            stub_ldap_config(providers: %w(ldapmain))
+          end
 
           context "and a corresponding LDAP person" do
             before do
@@ -238,7 +257,9 @@ describe Gitlab::OAuth::User, lib: true do
           end
 
           context "and no corresponding LDAP person" do
-            before { allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(nil) }
+            before do
+              allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(nil)
+            end
 
             include_examples "to verify compliance with allow_single_sign_on"
           end
@@ -248,11 +269,16 @@ describe Gitlab::OAuth::User, lib: true do
 
     describe 'blocking' do
       let(:provider) { 'twitter' }
-      before { stub_omniauth_config(allow_single_sign_on: ['twitter']) }
+
+      before do
+        stub_omniauth_config(allow_single_sign_on: ['twitter'])
+      end
 
       context 'signup with omniauth only' do
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it do
             oauth_user.save
@@ -262,7 +288,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it do
             oauth_user.save
@@ -284,7 +312,9 @@ describe Gitlab::OAuth::User, lib: true do
 
         context "and no account for the LDAP user" do
           context 'dont block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false)
+            end
 
             it do
               oauth_user.save
@@ -294,7 +324,9 @@ describe Gitlab::OAuth::User, lib: true do
           end
 
           context 'block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true)
+            end
 
             it do
               oauth_user.save
@@ -308,7 +340,9 @@ describe Gitlab::OAuth::User, lib: true do
           let!(:existing_user) { create(:omniauth_user, email: 'john@example.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'ldapmain', username: 'john') }
 
           context 'dont block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false)
+            end
 
             it do
               oauth_user.save
@@ -318,7 +352,9 @@ describe Gitlab::OAuth::User, lib: true do
           end
 
           context 'block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true)
+            end
 
             it do
               oauth_user.save
@@ -336,7 +372,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it do
             oauth_user.save
@@ -346,7 +384,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it do
             oauth_user.save
@@ -356,7 +396,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'dont block on create (LDAP)' do
-          before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
+          before do
+            allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false)
+          end
 
           it do
             oauth_user.save
@@ -366,7 +408,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'block on create (LDAP)' do
-          before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
+          before do
+            allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true)
+          end
 
           it do
             oauth_user.save
diff --git a/spec/lib/gitlab/redis_spec.rb b/spec/lib/gitlab/redis_spec.rb
index 8b77c925705..593aa5038ad 100644
--- a/spec/lib/gitlab/redis_spec.rb
+++ b/spec/lib/gitlab/redis_spec.rb
@@ -108,11 +108,18 @@ describe Gitlab::Redis do
   end
 
   describe '.with' do
-    before { clear_pool }
-    after { clear_pool }
+    before do
+      clear_pool
+    end
+
+    after do
+      clear_pool
+    end
 
     context 'when running not on sidekiq workers' do
-      before { allow(Sidekiq).to receive(:server?).and_return(false) }
+      before do
+        allow(Sidekiq).to receive(:server?).and_return(false)
+      end
 
       it 'instantiates a connection pool with size 5' do
         expect(ConnectionPool).to receive(:new).with(size: 5).and_call_original
diff --git a/spec/lib/gitlab/saml/user_spec.rb b/spec/lib/gitlab/saml/user_spec.rb
index b106d156b75..a4d2367b72a 100644
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
@@ -31,11 +31,17 @@ describe Gitlab::Saml::User, lib: true do
       allow(Gitlab::Saml::Config).to receive_messages({ options: { name: 'saml', groups_attribute: 'groups', external_groups: groups, args: {} } })
     end
 
-    before { stub_basic_saml_config }
+    before do
+      stub_basic_saml_config
+    end
 
     describe 'account exists on server' do
-      before { stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true }) }
+      before do
+        stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true })
+      end
+
       let!(:existing_user) { create(:user, email: 'john@mail.com', username: 'john') }
+
       context 'and should bind with SAML' do
         it 'adds the SAML identity to the existing user' do
           saml_user.save
@@ -57,7 +63,10 @@ describe Gitlab::Saml::User, lib: true do
           end
         end
 
-        before { stub_saml_group_config(%w(Interns)) }
+        before do
+          stub_saml_group_config(%w(Interns))
+        end
+
         context 'are defined but the user does not belong there' do
           it 'does not mark the user as external' do
             saml_user.save
@@ -80,7 +89,9 @@ describe Gitlab::Saml::User, lib: true do
     describe 'no account exists on server' do
       shared_examples 'to verify compliance with allow_single_sign_on' do
         context 'with allow_single_sign_on enabled' do
-          before { stub_omniauth_config(allow_single_sign_on: ['saml']) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: ['saml'])
+          end
 
           it 'creates a user from SAML' do
             saml_user.save
@@ -93,14 +104,20 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'with allow_single_sign_on default (["saml"])' do
-          before { stub_omniauth_config(allow_single_sign_on: ['saml']) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: ['saml'])
+          end
+
           it 'does not throw an error' do
             expect{ saml_user.save }.not_to raise_error
           end
         end
 
         context 'with allow_single_sign_on disabled' do
-          before { stub_omniauth_config(allow_single_sign_on: false) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: false)
+          end
+
           it 'throws an error' do
             expect{ saml_user.save }.to raise_error StandardError
           end
@@ -128,15 +145,22 @@ describe Gitlab::Saml::User, lib: true do
       end
 
       context 'with auto_link_ldap_user disabled (default)' do
-        before { stub_omniauth_config({ auto_link_ldap_user: false, auto_link_saml_user: false, allow_single_sign_on: ['saml'] }) }
+        before do
+          stub_omniauth_config({ auto_link_ldap_user: false, auto_link_saml_user: false, allow_single_sign_on: ['saml'] })
+        end
+
         include_examples 'to verify compliance with allow_single_sign_on'
       end
 
       context 'with auto_link_ldap_user enabled' do
-        before { stub_omniauth_config({ auto_link_ldap_user: true, auto_link_saml_user: false }) }
+        before do
+          stub_omniauth_config({ auto_link_ldap_user: true, auto_link_saml_user: false })
+        end
 
         context 'and at least one LDAP provider is defined' do
-          before { stub_ldap_config(providers: %w(ldapmain)) }
+          before do
+            stub_ldap_config(providers: %w(ldapmain))
+          end
 
           context 'and a corresponding LDAP person' do
             before do
@@ -239,11 +263,15 @@ describe Gitlab::Saml::User, lib: true do
     end
 
     describe 'blocking' do
-      before { stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true }) }
+      before do
+        stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true })
+      end
 
       context 'signup with SAML only' do
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it 'does not block the user' do
             saml_user.save
@@ -253,7 +281,9 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it 'blocks user' do
             saml_user.save
@@ -270,7 +300,9 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it do
             saml_user.save
@@ -280,7 +312,9 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it do
             saml_user.save
diff --git a/spec/lib/gitlab/serializer/pagination_spec.rb b/spec/lib/gitlab/serializer/pagination_spec.rb
index 519eb1b274f..1bc6536439e 100644
--- a/spec/lib/gitlab/serializer/pagination_spec.rb
+++ b/spec/lib/gitlab/serializer/pagination_spec.rb
@@ -22,7 +22,9 @@ describe Gitlab::Serializer::Pagination do
     let(:params) { { page: 1, per_page: 2 } }
 
     context 'when a multiple resources are present in relation' do
-      before { create_list(:user, 3) }
+      before do
+        create_list(:user, 3)
+      end
 
       it 'correctly paginates the resource' do
         expect(subject.count).to be 2
diff --git a/spec/lib/gitlab/template/issue_template_spec.rb b/spec/lib/gitlab/template/issue_template_spec.rb
index 329d1d74970..bf45c8d16d6 100644
--- a/spec/lib/gitlab/template/issue_template_spec.rb
+++ b/spec/lib/gitlab/template/issue_template_spec.rb
@@ -52,7 +52,10 @@ describe Gitlab::Template::IssueTemplate do
 
     context 'when repo is bare or empty' do
       let(:empty_project) { create(:empty_project) }
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "returns empty array" do
         templates = subject.by_category('', empty_project)
@@ -77,7 +80,9 @@ describe Gitlab::Template::IssueTemplate do
     context "when repo is empty" do
       let(:empty_project) { create(:empty_project) }
 
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "raises file not found" do
         issue_template = subject.new('.gitlab/issue_templates/not_existent.md', empty_project)
diff --git a/spec/lib/gitlab/template/merge_request_template_spec.rb b/spec/lib/gitlab/template/merge_request_template_spec.rb
index 2b0056d9bab..8479f92c8df 100644
--- a/spec/lib/gitlab/template/merge_request_template_spec.rb
+++ b/spec/lib/gitlab/template/merge_request_template_spec.rb
@@ -52,7 +52,10 @@ describe Gitlab::Template::MergeRequestTemplate do
 
     context 'when repo is bare or empty' do
       let(:empty_project) { create(:empty_project) }
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "returns empty array" do
         templates = subject.by_category('', empty_project)
@@ -77,7 +80,9 @@ describe Gitlab::Template::MergeRequestTemplate do
     context "when repo is empty" do
       let(:empty_project) { create(:empty_project) }
 
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "raises file not found" do
         issue_template = subject.new('.gitlab/merge_request_templates/not_existent.md', empty_project)
diff --git a/spec/lib/json_web_token/rsa_token_spec.rb b/spec/lib/json_web_token/rsa_token_spec.rb
index 18726754517..e7022bd06f8 100644
--- a/spec/lib/json_web_token/rsa_token_spec.rb
+++ b/spec/lib/json_web_token/rsa_token_spec.rb
@@ -15,11 +15,15 @@ describe JSONWebToken::RSAToken do
   let(:rsa_token) { described_class.new(nil) }
   let(:rsa_encoded) { rsa_token.encoded }
 
-  before { allow_any_instance_of(described_class).to receive(:key).and_return(rsa_key) }
+  before do
+    allow_any_instance_of(described_class).to receive(:key).and_return(rsa_key)
+  end
 
   context 'token' do
     context 'for valid key to be validated' do
-      before { rsa_token['key'] = 'value' }
+      before do
+        rsa_token['key'] = 'value'
+      end
 
       subject { JWT.decode(rsa_encoded, rsa_key) }
 
diff --git a/spec/lib/json_web_token/token_spec.rb b/spec/lib/json_web_token/token_spec.rb
index 3d955e4d774..d7e7560d962 100644
--- a/spec/lib/json_web_token/token_spec.rb
+++ b/spec/lib/json_web_token/token_spec.rb
@@ -3,7 +3,10 @@ describe JSONWebToken::Token do
 
   context 'custom parameters' do
     let(:value) { 'value' }
-    before { token[:key] = value }
+
+    before do
+      token[:key] = value
+    end
 
     it { expect(token[:key]).to eq(value) }
     it { expect(token.payload).to include(key: value) }
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index ec6f6c42eac..980b24370d0 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -130,8 +130,13 @@ describe Notify do
           end
 
           context 'with a preferred language' do
-            before { Gitlab::I18n.locale = :es }
-            after { Gitlab::I18n.use_default_locale }
+            before do
+              Gitlab::I18n.locale = :es
+            end
+
+            after do
+              Gitlab::I18n.use_default_locale
+            end
 
             it 'always generates the email using the default language' do
               is_expected.to have_body_text('foo, bar, and baz')
@@ -581,7 +586,9 @@ describe Notify do
         let(:project) { create(:project, :repository) }
         let(:commit) { project.commit }
 
-        before(:each) { allow(note).to receive(:noteable).and_return(commit) }
+        before do
+          allow(note).to receive(:noteable).and_return(commit)
+        end
 
         subject { described_class.note_commit_email(recipient.id, note.id) }
 
@@ -603,7 +610,10 @@ describe Notify do
       describe 'on a merge request' do
         let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
         let(:note_on_merge_request_path) { namespace_project_merge_request_path(project.namespace, project, merge_request, anchor: "note_#{note.id}") }
-        before(:each) { allow(note).to receive(:noteable).and_return(merge_request) }
+
+        before do
+          allow(note).to receive(:noteable).and_return(merge_request)
+        end
 
         subject { described_class.note_merge_request_email(recipient.id, note.id) }
 
@@ -625,7 +635,10 @@ describe Notify do
       describe 'on an issue' do
         let(:issue) { create(:issue, project: project) }
         let(:note_on_issue_path) { namespace_project_issue_path(project.namespace, project, issue, anchor: "note_#{note.id}") }
-        before(:each) { allow(note).to receive(:noteable).and_return(issue) }
+
+        before do
+          allow(note).to receive(:noteable).and_return(issue)
+        end
 
         subject { described_class.note_issue_email(recipient.id, note.id) }
 
@@ -687,7 +700,9 @@ describe Notify do
         let(:commit) { project.commit }
         let(:note) { create(:discussion_note_on_commit, commit_id: commit.id, project: project, author: note_author) }
 
-        before(:each) { allow(note).to receive(:noteable).and_return(commit) }
+        before do
+          allow(note).to receive(:noteable).and_return(commit)
+        end
 
         subject { described_class.note_commit_email(recipient.id, note.id) }
 
@@ -711,7 +726,10 @@ describe Notify do
         let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
         let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project, author: note_author) }
         let(:note_on_merge_request_path) { namespace_project_merge_request_path(project.namespace, project, merge_request, anchor: "note_#{note.id}") }
-        before(:each) { allow(note).to receive(:noteable).and_return(merge_request) }
+
+        before do
+          allow(note).to receive(:noteable).and_return(merge_request)
+        end
 
         subject { described_class.note_merge_request_email(recipient.id, note.id) }
 
@@ -735,7 +753,10 @@ describe Notify do
         let(:issue) { create(:issue, project: project) }
         let(:note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: note_author) }
         let(:note_on_issue_path) { namespace_project_issue_path(project.namespace, project, issue, anchor: "note_#{note.id}") }
-        before(:each) { allow(note).to receive(:noteable).and_return(issue) }
+
+        before do
+          allow(note).to receive(:noteable).and_return(issue)
+        end
 
         subject { described_class.note_issue_email(recipient.id, note.id) }
 
diff --git a/spec/migrations/rename_more_reserved_project_names_spec.rb b/spec/migrations/rename_more_reserved_project_names_spec.rb
index 36e82729c23..4bd8d4ac0d1 100644
--- a/spec/migrations/rename_more_reserved_project_names_spec.rb
+++ b/spec/migrations/rename_more_reserved_project_names_spec.rb
@@ -17,7 +17,9 @@ describe RenameMoreReservedProjectNames, truncate: true do
 
   describe '#up' do
     context 'when project repository exists' do
-      before { project.create_repository }
+      before do
+        project.create_repository
+      end
 
       context 'when no exception is raised' do
         it 'renames project with reserved names' do
diff --git a/spec/migrations/rename_reserved_project_names_spec.rb b/spec/migrations/rename_reserved_project_names_spec.rb
index 4fb7ed36884..05e021c2e32 100644
--- a/spec/migrations/rename_reserved_project_names_spec.rb
+++ b/spec/migrations/rename_reserved_project_names_spec.rb
@@ -17,7 +17,9 @@ describe RenameReservedProjectNames, truncate: true do
 
   describe '#up' do
     context 'when project repository exists' do
-      before { project.create_repository }
+      before do
+        project.create_repository
+      end
 
       context 'when no exception is raised' do
         it 'renames project with reserved names' do
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index fa229542f70..166a4474abf 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -78,7 +78,9 @@ describe ApplicationSetting, models: true do
 
     # Upgraded databases will have this sort of content
     context 'repository_storages is a String, not an Array' do
-      before { setting.__send__(:raw_write_attribute, :repository_storages, 'default') }
+      before do
+        setting.__send__(:raw_write_attribute, :repository_storages, 'default')
+      end
 
       it { expect(setting.repository_storages_before_type_cast).to eq('default') }
       it { expect(setting.repository_storages).to eq(['default']) }
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index b0716e04d3d..975a8b01e9e 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -95,12 +95,18 @@ describe Ci::Build, :models do
       it { is_expected.to be_truthy }
 
       context 'is expired' do
-        before { build.update(artifacts_expire_at: Time.now - 7.days)  }
+        before do
+          build.update(artifacts_expire_at: Time.now - 7.days)
+        end
+
         it { is_expected.to be_falsy }
       end
 
       context 'is not expired' do
-        before { build.update(artifacts_expire_at: Time.now + 7.days)  }
+        before do
+          build.update(artifacts_expire_at: Time.now + 7.days)
+        end
+
         it { is_expected.to be_truthy }
       end
     end
@@ -110,13 +116,17 @@ describe Ci::Build, :models do
     subject { build.artifacts_expired? }
 
     context 'is expired' do
-      before { build.update(artifacts_expire_at: Time.now - 7.days)  }
+      before do
+        build.update(artifacts_expire_at: Time.now - 7.days)
+      end
 
       it { is_expected.to be_truthy }
     end
 
     context 'is not expired' do
-      before { build.update(artifacts_expire_at: Time.now + 7.days)  }
+      before do
+        build.update(artifacts_expire_at: Time.now + 7.days)
+      end
 
       it { is_expected.to be_falsey }
     end
@@ -141,7 +151,9 @@ describe Ci::Build, :models do
     context 'when artifacts_expire_at is specified' do
       let(:expire_at) { Time.now + 7.days }
 
-      before { build.artifacts_expire_at = expire_at }
+      before do
+        build.artifacts_expire_at = expire_at
+      end
 
       it { is_expected.to be_within(5).of(expire_at - Time.now) }
     end
@@ -1071,7 +1083,9 @@ describe Ci::Build, :models do
 
   describe '#has_expiring_artifacts?' do
     context 'when artifacts have expiration date set' do
-      before { build.update(artifacts_expire_at: 1.day.from_now) }
+      before do
+        build.update(artifacts_expire_at: 1.day.from_now)
+      end
 
       it 'has expiring artifacts' do
         expect(build).to have_expiring_artifacts
@@ -1079,7 +1093,9 @@ describe Ci::Build, :models do
     end
 
     context 'when artifacts do not have expiration date set' do
-      before { build.update(artifacts_expire_at: nil) }
+      before do
+        build.update(artifacts_expire_at: nil)
+      end
 
       it 'does not have expiring artifacts' do
         expect(build).not_to have_expiring_artifacts
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index b50c7700bd3..e86cbe8498a 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -1156,7 +1156,9 @@ describe Ci::Pipeline, models: true do
     end
 
     context 'when pipeline is not stuck' do
-      before { create(:ci_runner, :shared, :online) }
+      before do
+        create(:ci_runner, :shared, :online)
+      end
 
       it 'is not stuck' do
         expect(pipeline).not_to be_stuck
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index ba247dcc5cf..6056d78da4e 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -206,19 +206,25 @@ eos
     it { expect(commit.reverts_commit?(another_commit, user)).to be_falsy }
 
     context 'commit has no description' do
-      before { allow(commit).to receive(:description?).and_return(false) }
+      before do
+        allow(commit).to receive(:description?).and_return(false)
+      end
 
       it { expect(commit.reverts_commit?(another_commit, user)).to be_falsy }
     end
 
     context "another_commit's description does not revert commit" do
-      before { allow(commit).to receive(:description).and_return("Foo Bar") }
+      before do
+        allow(commit).to receive(:description).and_return("Foo Bar")
+      end
 
       it { expect(commit.reverts_commit?(another_commit, user)).to be_falsy }
     end
 
     context "another_commit's description reverts commit" do
-      before { allow(commit).to receive(:description).and_return("Foo #{another_commit.revert_description} Bar") }
+      before do
+        allow(commit).to receive(:description).and_return("Foo #{another_commit.revert_description} Bar")
+      end
 
       it { expect(commit.reverts_commit?(another_commit, user)).to be_truthy }
     end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index c50b8bf7b13..9262ce08987 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -31,7 +31,10 @@ describe CommitStatus, :models do
 
   describe '#author' do
     subject { commit_status.author }
-    before { commit_status.author = User.new }
+
+    before do
+      commit_status.author = User.new
+    end
 
     it { is_expected.to eq(commit_status.user) }
   end
@@ -50,14 +53,18 @@ describe CommitStatus, :models do
     subject { commit_status.started? }
 
     context 'without started_at' do
-      before { commit_status.started_at = nil }
+      before do
+        commit_status.started_at = nil
+      end
 
       it { is_expected.to be_falsey }
     end
 
     %w[running success failed].each do |status|
       context "if commit status is #{status}" do
-        before { commit_status.status = status }
+        before do
+          commit_status.status = status
+        end
 
         it { is_expected.to be_truthy }
       end
@@ -65,7 +72,9 @@ describe CommitStatus, :models do
 
     %w[pending canceled].each do |status|
       context "if commit status is #{status}" do
-        before { commit_status.status = status }
+        before do
+          commit_status.status = status
+        end
 
         it { is_expected.to be_falsey }
       end
@@ -77,7 +86,9 @@ describe CommitStatus, :models do
 
     %w[pending running].each do |state|
       context "if commit_status.status is #{state}" do
-        before { commit_status.status = state }
+        before do
+          commit_status.status = state
+        end
 
         it { is_expected.to be_truthy }
       end
@@ -85,7 +96,9 @@ describe CommitStatus, :models do
 
     %w[success failed canceled].each do |state|
       context "if commit_status.status is #{state}" do
-        before { commit_status.status = state }
+        before do
+          commit_status.status = state
+        end
 
         it { is_expected.to be_falsey }
       end
@@ -97,7 +110,9 @@ describe CommitStatus, :models do
 
     %w[success failed canceled].each do |state|
       context "if commit_status.status is #{state}" do
-        before { commit_status.status = state }
+        before do
+          commit_status.status = state
+        end
 
         it { is_expected.to be_truthy }
       end
@@ -105,7 +120,9 @@ describe CommitStatus, :models do
 
     %w[pending running].each do |state|
       context "if commit_status.status is #{state}" do
-        before { commit_status.status = state }
+        before do
+          commit_status.status = state
+        end
 
         it { is_expected.to be_falsey }
       end
@@ -271,7 +288,9 @@ describe CommitStatus, :models do
     subject { commit_status.before_sha }
 
     context 'when no before_sha is set for pipeline' do
-      before { pipeline.before_sha = nil }
+      before do
+        pipeline.before_sha = nil
+      end
 
       it 'returns blank sha' do
         is_expected.to eq(Gitlab::Git::BLANK_SHA)
@@ -280,7 +299,10 @@ describe CommitStatus, :models do
 
     context 'for before_sha set for pipeline' do
       let(:value) { '1234' }
-      before { pipeline.before_sha = value }
+
+      before do
+        pipeline.before_sha = value
+      end
 
       it 'returns the set value' do
         is_expected.to eq(value)
diff --git a/spec/models/concerns/access_requestable_spec.rb b/spec/models/concerns/access_requestable_spec.rb
index 4829ef17a20..97b7e48bb3c 100644
--- a/spec/models/concerns/access_requestable_spec.rb
+++ b/spec/models/concerns/access_requestable_spec.rb
@@ -14,7 +14,9 @@ describe AccessRequestable do
       let(:group) { create(:group, :public, :access_requestable) }
       let(:user) { create(:user) }
 
-      before { group.request_access(user) }
+      before do
+        group.request_access(user)
+      end
 
       it { expect(group.requesters.exists?(user_id: user)).to be_truthy }
     end
@@ -32,7 +34,9 @@ describe AccessRequestable do
       let(:project) { create(:empty_project, :public, :access_requestable) }
       let(:user) { create(:user) }
 
-      before { project.request_access(user) }
+      before do
+        project.request_access(user)
+      end
 
       it { expect(project.requesters.exists?(user_id: user)).to be_truthy }
     end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 27890e33b49..1a9bda64191 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -200,7 +200,9 @@ describe Issuable do
     let(:project) { issue.project }
 
     context 'user is not a participant in the issue' do
-      before { allow(issue).to receive(:participants).with(user).and_return([]) }
+      before do
+        allow(issue).to receive(:participants).with(user).and_return([])
+      end
 
       it 'returns false when no subcription exists' do
         expect(issue.subscribed?(user, project)).to be_falsey
@@ -220,7 +222,9 @@ describe Issuable do
     end
 
     context 'user is a participant in the issue' do
-      before { allow(issue).to receive(:participants).with(user).and_return([user]) }
+      before do
+        allow(issue).to receive(:participants).with(user).and_return([user])
+      end
 
       it 'returns false when no subcription exists' do
         expect(issue.subscribed?(user, project)).to be_truthy
@@ -252,7 +256,9 @@ describe Issuable do
     end
 
     context "issue is assigned" do
-      before { issue.assignees << user }
+      before do
+        issue.assignees << user
+      end
 
       it "returns correct hook data" do
         expect(data[:assignees].first).to eq(user.hook_attrs)
@@ -276,7 +282,9 @@ describe Issuable do
     context 'issue has labels' do
       let(:labels) { [create(:label), create(:label)] }
 
-      before { issue.update_attribute(:labels, labels)}
+      before do
+        issue.update_attribute(:labels, labels)
+      end
 
       it 'includes labels in the hook data' do
         expect(data[:labels]).to eq(labels.map(&:hook_attrs))
diff --git a/spec/models/concerns/mentionable_spec.rb b/spec/models/concerns/mentionable_spec.rb
index e382c7120de..e2a29e0ae70 100644
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
@@ -61,7 +61,9 @@ describe Issue, "Mentionable" do
       end
 
       context 'when the current user can see the issue' do
-        before { private_project.team << [user, Gitlab::Access::DEVELOPER] }
+        before do
+          private_project.team << [user, Gitlab::Access::DEVELOPER]
+        end
 
         it 'includes the reference' do
           expect(referenced_issues(user)).to contain_exactly(private_issue, public_issue)
diff --git a/spec/models/concerns/reactive_caching_spec.rb b/spec/models/concerns/reactive_caching_spec.rb
index a0765a264cf..808247ebfd5 100644
--- a/spec/models/concerns/reactive_caching_spec.rb
+++ b/spec/models/concerns/reactive_caching_spec.rb
@@ -40,7 +40,10 @@ describe ReactiveCaching, caching: true do
   let(:instance) { CacheTest.new(666, &calculation) }
 
   describe '#with_reactive_cache' do
-    before { stub_reactive_cache }
+    before do
+      stub_reactive_cache
+    end
+
     subject(:go!) { instance.result }
 
     context 'when cache is empty' do
@@ -60,12 +63,17 @@ describe ReactiveCaching, caching: true do
     end
 
     context 'when the cache is full' do
-      before { stub_reactive_cache(instance, 4) }
+      before do
+        stub_reactive_cache(instance, 4)
+      end
 
       it { is_expected.to eq(2) }
 
       context 'and expired' do
-        before { invalidate_reactive_cache(instance) }
+        before do
+          invalidate_reactive_cache(instance)
+        end
+
         it { is_expected.to be_nil }
       end
     end
@@ -84,7 +92,9 @@ describe ReactiveCaching, caching: true do
     subject(:go!) { instance.exclusively_update_reactive_cache! }
 
     context 'when the lease is free and lifetime is not exceeded' do
-      before { stub_reactive_cache(instance, "preexisting") }
+      before do
+        stub_reactive_cache(instance, "preexisting")
+      end
 
       it 'takes and releases the lease' do
         expect_any_instance_of(Gitlab::ExclusiveLease).to receive(:try_obtain).and_return("000000")
@@ -106,7 +116,10 @@ describe ReactiveCaching, caching: true do
       end
 
       context 'and #calculate_reactive_cache raises an exception' do
-        before { stub_reactive_cache(instance, "preexisting") }
+        before do
+          stub_reactive_cache(instance, "preexisting")
+        end
+
         let(:calculation) { -> { raise "foo"} }
 
         it 'leaves the cache untouched' do
diff --git a/spec/models/concerns/token_authenticatable_spec.rb b/spec/models/concerns/token_authenticatable_spec.rb
index 4b0bfa43abf..882afeccfc6 100644
--- a/spec/models/concerns/token_authenticatable_spec.rb
+++ b/spec/models/concerns/token_authenticatable_spec.rb
@@ -49,7 +49,10 @@ describe ApplicationSetting, 'TokenAuthenticatable' do
     end
 
     context 'token is generated' do
-      before { subject.send("reset_#{token_field}!") }
+      before do
+        subject.send("reset_#{token_field}!")
+      end
+
       it 'persists a new token' do
         expect(subject.send(:read_attribute, token_field)).to be_a String
       end
diff --git a/spec/models/generic_commit_status_spec.rb b/spec/models/generic_commit_status_spec.rb
index f4c3e6d503f..152e97e09bf 100644
--- a/spec/models/generic_commit_status_spec.rb
+++ b/spec/models/generic_commit_status_spec.rb
@@ -19,7 +19,10 @@ describe GenericCommitStatus, models: true do
 
   describe '#context' do
     subject { generic_commit_status.context }
-    before { generic_commit_status.context = 'my_context' }
+
+    before do
+      generic_commit_status.context = 'my_context'
+    end
 
     it { is_expected.to eq(generic_commit_status.name) }
   end
@@ -39,7 +42,9 @@ describe GenericCommitStatus, models: true do
     end
 
     context 'when user has ability to see datails' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it 'details path points to an external URL' do
         expect(status).to have_details
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 3d437ca0fcc..449b7c2f7d7 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -143,14 +143,20 @@ describe Group, models: true do
 
   describe '#add_user' do
     let(:user) { create(:user) }
-    before { group.add_user(user, GroupMember::MASTER) }
+
+    before do
+      group.add_user(user, GroupMember::MASTER)
+    end
 
     it { expect(group.group_members.masters.map(&:user)).to include(user) }
   end
 
   describe '#add_users' do
     let(:user) { create(:user) }
-    before { group.add_users([user.id], GroupMember::GUEST) }
+
+    before do
+      group.add_users([user.id], GroupMember::GUEST)
+    end
 
     it "updates the group permission" do
       expect(group.group_members.guests.map(&:user)).to include(user)
@@ -162,7 +168,10 @@ describe Group, models: true do
 
   describe '#avatar_type' do
     let(:user) { create(:user) }
-    before { group.add_user(user, GroupMember::MASTER) }
+
+    before do
+      group.add_user(user, GroupMember::MASTER)
+    end
 
     it "is true if avatar is image" do
       group.update_attribute(:avatar, 'uploads/avatar.png')
@@ -182,7 +191,9 @@ describe Group, models: true do
     let(:avatar_path) { "/uploads/system/group/avatar/#{group.id}/dk.png" }
 
     context 'when avatar file is uploaded' do
-      before { group.add_master(user) }
+      before do
+        group.add_master(user)
+      end
 
       it 'shows correct avatar url' do
         expect(group.avatar_url).to eq(avatar_path)
@@ -222,7 +233,9 @@ describe Group, models: true do
   end
 
   describe '#has_owner?' do
-    before { @members = setup_group_members(group) }
+    before do
+      @members = setup_group_members(group)
+    end
 
     it { expect(group.has_owner?(@members[:owner])).to be_truthy }
     it { expect(group.has_owner?(@members[:master])).to be_falsey }
@@ -233,7 +246,9 @@ describe Group, models: true do
   end
 
   describe '#has_master?' do
-    before { @members = setup_group_members(group) }
+    before do
+      @members = setup_group_members(group)
+    end
 
     it { expect(group.has_master?(@members[:owner])).to be_falsey }
     it { expect(group.has_master?(@members[:master])).to be_truthy }
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index bb4e70db2e9..12e7d646382 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -245,7 +245,9 @@ describe Issue, models: true do
       let(:project) { create(:empty_project) }
       let(:issue) { create(:issue, project: project) }
 
-      before { project.team << [user, :reporter] }
+      before do
+        project.team << [user, :reporter]
+      end
 
       it { is_expected.to eq true }
 
@@ -259,12 +261,18 @@ describe Issue, models: true do
         let(:to_project) { create(:empty_project) }
 
         context 'destination project allowed' do
-          before { to_project.team << [user, :reporter] }
+          before do
+            to_project.team << [user, :reporter]
+          end
+
           it { is_expected.to eq true }
         end
 
         context 'destination project not allowed' do
-          before { to_project.team << [user, :guest] }
+          before do
+            to_project.team << [user, :guest]
+          end
+
           it { is_expected.to eq false }
         end
       end
@@ -549,7 +557,9 @@ describe Issue, models: true do
         end
 
         context 'when the user is the project owner' do
-          before { project.team << [user, :master] }
+          before do
+            project.team << [user, :master]
+          end
 
           it 'returns true for a regular issue' do
             issue = build(:issue, project: project)
diff --git a/spec/models/merge_request_diff_spec.rb b/spec/models/merge_request_diff_spec.rb
index ed9fde57bf7..25f7062860b 100644
--- a/spec/models/merge_request_diff_spec.rb
+++ b/spec/models/merge_request_diff_spec.rb
@@ -36,7 +36,9 @@ describe MergeRequestDiff, models: true do
     end
 
     context 'when the raw diffs are empty' do
-      before { mr_diff.update_attributes(st_diffs: '') }
+      before do
+        mr_diff.update_attributes(st_diffs: '')
+      end
 
       it 'returns an empty DiffCollection' do
         expect(mr_diff.raw_diffs).to be_a(Gitlab::Git::DiffCollection)
@@ -45,7 +47,9 @@ describe MergeRequestDiff, models: true do
     end
 
     context 'when the raw diffs have invalid content' do
-      before { mr_diff.update_attributes(st_diffs: ["--broken-diff"]) }
+      before do
+        mr_diff.update_attributes(st_diffs: ["--broken-diff"])
+      end
 
       it 'returns an empty DiffCollection' do
         expect(mr_diff.raw_diffs.to_a).to be_empty
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 060754fab63..cd2f11dec96 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -892,7 +892,9 @@ describe MergeRequest, models: true do
     end
 
     context 'when broken' do
-      before { allow(subject).to receive(:broken?) { true } }
+      before do
+        allow(subject).to receive(:broken?) { true }
+      end
 
       it 'becomes unmergeable' do
         expect { subject.check_if_can_be_merged }.to change { subject.merge_status }.to('cannot_be_merged')
@@ -944,7 +946,9 @@ describe MergeRequest, models: true do
     end
 
     context 'when not open' do
-      before { subject.close }
+      before do
+        subject.close
+      end
 
       it 'returns false' do
         expect(subject.mergeable_state?).to be_falsey
@@ -952,7 +956,9 @@ describe MergeRequest, models: true do
     end
 
     context 'when working in progress' do
-      before { subject.title = 'WIP MR' }
+      before do
+        subject.title = 'WIP MR'
+      end
 
       it 'returns false' do
         expect(subject.mergeable_state?).to be_falsey
@@ -960,7 +966,9 @@ describe MergeRequest, models: true do
     end
 
     context 'when broken' do
-      before { allow(subject).to receive(:broken?) { true } }
+      before do
+        allow(subject).to receive(:broken?) { true }
+      end
 
       it 'returns false' do
         expect(subject.mergeable_state?).to be_falsey
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 7a01cef9b4b..d4d4fc86343 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -26,14 +26,18 @@ describe Note, models: true do
     it { is_expected.to validate_presence_of(:project) }
 
     context 'when note is on commit' do
-      before { allow(subject).to receive(:for_commit?).and_return(true) }
+      before do
+        allow(subject).to receive(:for_commit?).and_return(true)
+      end
 
       it { is_expected.to validate_presence_of(:commit_id) }
       it { is_expected.not_to validate_presence_of(:noteable_id) }
     end
 
     context 'when note is not on commit' do
-      before { allow(subject).to receive(:for_commit?).and_return(false) }
+      before do
+        allow(subject).to receive(:for_commit?).and_return(false)
+      end
 
       it { is_expected.not_to validate_presence_of(:commit_id) }
       it { is_expected.to validate_presence_of(:noteable_id) }
diff --git a/spec/models/project_services/bamboo_service_spec.rb b/spec/models/project_services/bamboo_service_spec.rb
index 4014d6129ee..e62fd69e567 100644
--- a/spec/models/project_services/bamboo_service_spec.rb
+++ b/spec/models/project_services/bamboo_service_spec.rb
@@ -24,7 +24,9 @@ describe BambooService, models: true, caching: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:build_key) }
       it { is_expected.to validate_presence_of(:bamboo_url) }
@@ -60,7 +62,9 @@ describe BambooService, models: true, caching: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:build_key) }
       it { is_expected.not_to validate_presence_of(:bamboo_url) }
diff --git a/spec/models/project_services/bugzilla_service_spec.rb b/spec/models/project_services/bugzilla_service_spec.rb
index 739cc72b2ff..5f17bbde390 100644
--- a/spec/models/project_services/bugzilla_service_spec.rb
+++ b/spec/models/project_services/bugzilla_service_spec.rb
@@ -8,7 +8,9 @@ describe BugzillaService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:project_url) }
       it { is_expected.to validate_presence_of(:issues_url) }
@@ -19,7 +21,9 @@ describe BugzillaService, models: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:project_url) }
       it { is_expected.not_to validate_presence_of(:issues_url) }
diff --git a/spec/models/project_services/buildkite_service_spec.rb b/spec/models/project_services/buildkite_service_spec.rb
index 05b602d8106..dd529597067 100644
--- a/spec/models/project_services/buildkite_service_spec.rb
+++ b/spec/models/project_services/buildkite_service_spec.rb
@@ -23,7 +23,9 @@ describe BuildkiteService, models: true, caching: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:project_url) }
       it { is_expected.to validate_presence_of(:token) }
@@ -31,7 +33,9 @@ describe BuildkiteService, models: true, caching: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:project_url) }
       it { is_expected.not_to validate_presence_of(:token) }
diff --git a/spec/models/project_services/campfire_service_spec.rb b/spec/models/project_services/campfire_service_spec.rb
index 953e664fb66..de55627dd27 100644
--- a/spec/models/project_services/campfire_service_spec.rb
+++ b/spec/models/project_services/campfire_service_spec.rb
@@ -8,13 +8,17 @@ describe CampfireService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:token) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:token) }
     end
diff --git a/spec/models/project_services/chat_message/wiki_page_message_spec.rb b/spec/models/project_services/chat_message/wiki_page_message_spec.rb
index 4ca1b8aa7b7..17355c1e6f1 100644
--- a/spec/models/project_services/chat_message/wiki_page_message_spec.rb
+++ b/spec/models/project_services/chat_message/wiki_page_message_spec.rb
@@ -23,7 +23,9 @@ describe ChatMessage::WikiPageMessage, models: true do
   context 'without markdown' do
     describe '#pretext' do
       context 'when :action == "create"' do
-        before { args[:object_attributes][:action] = 'create' }
+        before do
+          args[:object_attributes][:action] = 'create'
+        end
 
         it 'returns a message that a new wiki page was created' do
           expect(subject.pretext).to eq(
@@ -33,7 +35,9 @@ describe ChatMessage::WikiPageMessage, models: true do
       end
 
       context 'when :action == "update"' do
-        before { args[:object_attributes][:action] = 'update' }
+        before do
+          args[:object_attributes][:action] = 'update'
+        end
 
         it 'returns a message that a wiki page was updated' do
           expect(subject.pretext).to eq(
@@ -47,7 +51,9 @@ describe ChatMessage::WikiPageMessage, models: true do
       let(:color) { '#345' }
 
       context 'when :action == "create"' do
-        before { args[:object_attributes][:action] = 'create' }
+        before do
+          args[:object_attributes][:action] = 'create'
+        end
 
         it 'returns the attachment for a new wiki page' do
           expect(subject.attachments).to eq([
@@ -60,7 +66,9 @@ describe ChatMessage::WikiPageMessage, models: true do
       end
 
       context 'when :action == "update"' do
-        before { args[:object_attributes][:action] = 'update' }
+        before do
+          args[:object_attributes][:action] = 'update'
+        end
 
         it 'returns the attachment for an updated wiki page' do
           expect(subject.attachments).to eq([
@@ -81,7 +89,9 @@ describe ChatMessage::WikiPageMessage, models: true do
 
     describe '#pretext' do
       context 'when :action == "create"' do
-        before { args[:object_attributes][:action] = 'create' }
+        before do
+          args[:object_attributes][:action] = 'create'
+        end
 
         it 'returns a message that a new wiki page was created' do
           expect(subject.pretext).to eq(
@@ -90,7 +100,9 @@ describe ChatMessage::WikiPageMessage, models: true do
       end
 
       context 'when :action == "update"' do
-        before { args[:object_attributes][:action] = 'update' }
+        before do
+          args[:object_attributes][:action] = 'update'
+        end
 
         it 'returns a message that a wiki page was updated' do
           expect(subject.pretext).to eq(
@@ -101,7 +113,9 @@ describe ChatMessage::WikiPageMessage, models: true do
 
     describe '#attachments' do
       context 'when :action == "create"' do
-        before { args[:object_attributes][:action] = 'create' }
+        before do
+          args[:object_attributes][:action] = 'create'
+        end
 
         it 'returns the attachment for a new wiki page' do
           expect(subject.attachments).to eq('Wiki page description')
@@ -109,7 +123,9 @@ describe ChatMessage::WikiPageMessage, models: true do
       end
 
       context 'when :action == "update"' do
-        before { args[:object_attributes][:action] = 'update' }
+        before do
+          args[:object_attributes][:action] = 'update'
+        end
 
         it 'returns the attachment for an updated wiki page' do
           expect(subject.attachments).to eq('Wiki page description')
@@ -119,7 +135,9 @@ describe ChatMessage::WikiPageMessage, models: true do
 
     describe '#activity' do
       context 'when :action == "create"' do
-        before { args[:object_attributes][:action] = 'create' }
+        before do
+          args[:object_attributes][:action] = 'create'
+        end
 
         it 'returns the attachment for a new wiki page' do
           expect(subject.activity).to eq({
@@ -132,7 +150,9 @@ describe ChatMessage::WikiPageMessage, models: true do
       end
 
       context 'when :action == "update"' do
-        before { args[:object_attributes][:action] = 'update' }
+        before do
+          args[:object_attributes][:action] = 'update'
+        end
 
         it 'returns the attachment for an updated wiki page' do
           expect(subject.activity).to eq({
diff --git a/spec/models/project_services/custom_issue_tracker_service_spec.rb b/spec/models/project_services/custom_issue_tracker_service_spec.rb
index 63320931e76..9e574762232 100644
--- a/spec/models/project_services/custom_issue_tracker_service_spec.rb
+++ b/spec/models/project_services/custom_issue_tracker_service_spec.rb
@@ -8,7 +8,9 @@ describe CustomIssueTrackerService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:project_url) }
       it { is_expected.to validate_presence_of(:issues_url) }
@@ -19,7 +21,9 @@ describe CustomIssueTrackerService, models: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:project_url) }
       it { is_expected.not_to validate_presence_of(:issues_url) }
diff --git a/spec/models/project_services/drone_ci_service_spec.rb b/spec/models/project_services/drone_ci_service_spec.rb
index 044737c6026..1400175427f 100644
--- a/spec/models/project_services/drone_ci_service_spec.rb
+++ b/spec/models/project_services/drone_ci_service_spec.rb
@@ -10,7 +10,9 @@ describe DroneCiService, models: true, caching: true do
 
   describe 'validations' do
     context 'active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:token) }
       it { is_expected.to validate_presence_of(:drone_url) }
@@ -18,7 +20,9 @@ describe DroneCiService, models: true, caching: true do
     end
 
     context 'inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:token) }
       it { is_expected.not_to validate_presence_of(:drone_url) }
diff --git a/spec/models/project_services/emails_on_push_service_spec.rb b/spec/models/project_services/emails_on_push_service_spec.rb
index e6f78898c82..d9b7010e5e5 100644
--- a/spec/models/project_services/emails_on_push_service_spec.rb
+++ b/spec/models/project_services/emails_on_push_service_spec.rb
@@ -3,13 +3,17 @@ require 'spec_helper'
 describe EmailsOnPushService do
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:recipients) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:recipients) }
     end
diff --git a/spec/models/project_services/external_wiki_service_spec.rb b/spec/models/project_services/external_wiki_service_spec.rb
index bdeea1db1e3..291fc645a1c 100644
--- a/spec/models/project_services/external_wiki_service_spec.rb
+++ b/spec/models/project_services/external_wiki_service_spec.rb
@@ -9,14 +9,18 @@ describe ExternalWikiService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:external_wiki_url) }
       it_behaves_like 'issue tracker service URL attribute', :external_wiki_url
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:external_wiki_url) }
     end
diff --git a/spec/models/project_services/flowdock_service_spec.rb b/spec/models/project_services/flowdock_service_spec.rb
index a97e8c6e4ce..56ace04dd58 100644
--- a/spec/models/project_services/flowdock_service_spec.rb
+++ b/spec/models/project_services/flowdock_service_spec.rb
@@ -8,13 +8,17 @@ describe FlowdockService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:token) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:token) }
     end
diff --git a/spec/models/project_services/gemnasium_service_spec.rb b/spec/models/project_services/gemnasium_service_spec.rb
index a13fbae03eb..65c9e714bd1 100644
--- a/spec/models/project_services/gemnasium_service_spec.rb
+++ b/spec/models/project_services/gemnasium_service_spec.rb
@@ -8,14 +8,18 @@ describe GemnasiumService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:token) }
       it { is_expected.to validate_presence_of(:api_key) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:token) }
       it { is_expected.not_to validate_presence_of(:api_key) }
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 1200ae7eb22..c7c8e9651ab 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -8,13 +8,17 @@ describe HipchatService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:token) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:token) }
     end
diff --git a/spec/models/project_services/irker_service_spec.rb b/spec/models/project_services/irker_service_spec.rb
index d5a16226d9d..a5c4938b54e 100644
--- a/spec/models/project_services/irker_service_spec.rb
+++ b/spec/models/project_services/irker_service_spec.rb
@@ -10,13 +10,17 @@ describe IrkerService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:recipients) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:recipients) }
     end
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 0ee050196e4..e2b8226124f 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -10,7 +10,9 @@ describe JiraService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:url) }
       it { is_expected.to validate_presence_of(:project_key) }
@@ -18,7 +20,9 @@ describe JiraService, models: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:url) }
     end
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 35dd601351f..858ad595dbf 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -13,7 +13,9 @@ describe KubernetesService, models: true, caching: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.not_to validate_presence_of(:namespace) }
       it { is_expected.to validate_presence_of(:api_url) }
@@ -48,7 +50,9 @@ describe KubernetesService, models: true, caching: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:api_url) }
       it { is_expected.not_to validate_presence_of(:token) }
@@ -69,7 +73,9 @@ describe KubernetesService, models: true, caching: true do
     end
 
     context 'as template' do
-      before { subject.template = true }
+      before do
+        subject.template = true
+      end
 
       it 'sets the namespace to the default' do
         expect(kube_namespace).not_to be_nil
@@ -78,7 +84,9 @@ describe KubernetesService, models: true, caching: true do
     end
 
     context 'with associated project' do
-      before { subject.project = project }
+      before do
+        subject.project = project
+      end
 
       it 'sets the namespace to the default' do
         expect(kube_namespace).not_to be_nil
@@ -201,7 +209,9 @@ describe KubernetesService, models: true, caching: true do
     end
 
     context 'namespace is provided' do
-      before { subject.namespace = 'my-project' }
+      before do
+        subject.namespace = 'my-project'
+      end
 
       it 'sets the variables' do
         expect(subject.predefined_variables).to include(
@@ -274,7 +284,9 @@ describe KubernetesService, models: true, caching: true do
     subject { service.calculate_reactive_cache }
 
     context 'when service is inactive' do
-      before { service.active = false }
+      before do
+        service.active = false
+      end
 
       it { is_expected.to be_nil }
     end
diff --git a/spec/models/project_services/microsoft_teams_service_spec.rb b/spec/models/project_services/microsoft_teams_service_spec.rb
index facc034f69c..bd50a2d1470 100644
--- a/spec/models/project_services/microsoft_teams_service_spec.rb
+++ b/spec/models/project_services/microsoft_teams_service_spec.rb
@@ -11,14 +11,18 @@ describe MicrosoftTeamsService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:webhook) }
       it_behaves_like 'issue tracker service URL attribute', :webhook
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:webhook) }
     end
diff --git a/spec/models/project_services/pivotaltracker_service_spec.rb b/spec/models/project_services/pivotaltracker_service_spec.rb
index a76e909d04d..f4c1a9c94b6 100644
--- a/spec/models/project_services/pivotaltracker_service_spec.rb
+++ b/spec/models/project_services/pivotaltracker_service_spec.rb
@@ -8,13 +8,17 @@ describe PivotaltrackerService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:token) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:token) }
     end
diff --git a/spec/models/project_services/prometheus_service_spec.rb b/spec/models/project_services/prometheus_service_spec.rb
index 1f9d3c07b51..71b53732164 100644
--- a/spec/models/project_services/prometheus_service_spec.rb
+++ b/spec/models/project_services/prometheus_service_spec.rb
@@ -14,13 +14,17 @@ describe PrometheusService, models: true, caching: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:api_url) }
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:api_url) }
     end
diff --git a/spec/models/project_services/pushover_service_spec.rb b/spec/models/project_services/pushover_service_spec.rb
index a7e7594a7d5..9171d9604ee 100644
--- a/spec/models/project_services/pushover_service_spec.rb
+++ b/spec/models/project_services/pushover_service_spec.rb
@@ -8,7 +8,9 @@ describe PushoverService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:api_key) }
       it { is_expected.to validate_presence_of(:user_key) }
@@ -16,7 +18,9 @@ describe PushoverService, models: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:api_key) }
       it { is_expected.not_to validate_presence_of(:user_key) }
diff --git a/spec/models/project_services/redmine_service_spec.rb b/spec/models/project_services/redmine_service_spec.rb
index 0a7b237a051..6631d9040b1 100644
--- a/spec/models/project_services/redmine_service_spec.rb
+++ b/spec/models/project_services/redmine_service_spec.rb
@@ -8,7 +8,9 @@ describe RedmineService, models: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:project_url) }
       it { is_expected.to validate_presence_of(:issues_url) }
@@ -19,7 +21,9 @@ describe RedmineService, models: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:project_url) }
       it { is_expected.not_to validate_presence_of(:issues_url) }
diff --git a/spec/models/project_services/teamcity_service_spec.rb b/spec/models/project_services/teamcity_service_spec.rb
index 77b18e1c7d0..7349eb4149a 100644
--- a/spec/models/project_services/teamcity_service_spec.rb
+++ b/spec/models/project_services/teamcity_service_spec.rb
@@ -24,7 +24,9 @@ describe TeamcityService, models: true, caching: true do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:build_type) }
       it { is_expected.to validate_presence_of(:teamcity_url) }
@@ -60,7 +62,9 @@ describe TeamcityService, models: true, caching: true do
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:build_type) }
       it { is_expected.not_to validate_presence_of(:teamcity_url) }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 454eeb58ecd..63333b7af1f 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1005,13 +1005,17 @@ describe Project, models: true do
     subject { project.shared_runners_enabled }
 
     context 'are enabled' do
-      before { stub_application_setting(shared_runners_enabled: true) }
+      before do
+        stub_application_setting(shared_runners_enabled: true)
+      end
 
       it { is_expected.to be_truthy }
     end
 
     context 'are disabled' do
-      before { stub_application_setting(shared_runners_enabled: false) }
+      before do
+        stub_application_setting(shared_runners_enabled: false)
+      end
 
       it { is_expected.to be_falsey }
     end
@@ -1107,7 +1111,9 @@ describe Project, models: true do
     subject { project.pages_deployed? }
 
     context 'if public folder does exist' do
-      before { allow(Dir).to receive(:exist?).with(project.public_pages_path).and_return(true) }
+      before do
+        allow(Dir).to receive(:exist?).with(project.public_pages_path).and_return(true)
+      end
 
       it { is_expected.to be_truthy }
     end
@@ -1365,7 +1371,9 @@ describe Project, models: true do
 
     subject { project.container_registry_url }
 
-    before { stub_container_registry_config(**registry_settings) }
+    before do
+      stub_container_registry_config(**registry_settings)
+    end
 
     context 'for enabled registry' do
       let(:registry_settings) do
@@ -1389,7 +1397,9 @@ describe Project, models: true do
     let(:project) { create(:empty_project) }
 
     context 'when container registry is enabled' do
-      before { stub_container_registry_config(enabled: true) }
+      before do
+        stub_container_registry_config(enabled: true)
+      end
 
       context 'when tags are present for multi-level registries' do
         before do
@@ -1427,7 +1437,9 @@ describe Project, models: true do
     end
 
     context 'when container registry is disabled' do
-      before { stub_container_registry_config(enabled: false) }
+      before do
+        stub_container_registry_config(enabled: false)
+      end
 
       it 'should not have image tags' do
         expect(project).not_to have_container_registry_tags
@@ -1945,7 +1957,9 @@ describe Project, models: true do
   describe '#parent_changed?' do
     let(:project) { create(:empty_project) }
 
-    before { project.namespace_id = 7 }
+    before do
+      project.namespace_id = 7
+    end
 
     it { expect(project.parent_changed?).to be_truthy }
   end
diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb
index 497e3cdf415..ea3cd5fe10a 100644
--- a/spec/models/project_team_spec.rb
+++ b/spec/models/project_team_spec.rb
@@ -240,7 +240,9 @@ describe ProjectTeam, models: true do
         it { expect(project.team.max_member_access(requester.id)).to eq(Gitlab::Access::NO_ACCESS) }
 
         context 'but share_with_group_lock is true' do
-          before { project.namespace.update(share_with_group_lock: true) }
+          before do
+            project.namespace.update(share_with_group_lock: true)
+          end
 
           it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::NO_ACCESS) }
           it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::NO_ACCESS) }
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 224067f58dd..3f5f4eea4a1 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -8,7 +8,10 @@ describe ProjectWiki, models: true do
   let(:project_wiki) { ProjectWiki.new(project, user) }
 
   subject { project_wiki }
-  before { project_wiki.wiki }
+
+  before do
+    project_wiki.wiki
+  end
 
   describe "#path_with_namespace" do
     it "returns the project path with namespace with the .wiki extension" do
diff --git a/spec/models/route_spec.rb b/spec/models/route_spec.rb
index c1fe1b06c52..1754253e0f2 100644
--- a/spec/models/route_spec.rb
+++ b/spec/models/route_spec.rb
@@ -9,7 +9,10 @@ describe Route, models: true do
   end
 
   describe 'validations' do
-    before { route }
+    before do
+      expect(route).to be_persisted
+    end
+
     it { is_expected.to validate_presence_of(:source) }
     it { is_expected.to validate_presence_of(:path) }
     it { is_expected.to validate_uniqueness_of(:path) }
@@ -59,7 +62,9 @@ describe Route, models: true do
 
     context 'path update' do
       context 'when route name is set' do
-        before { route.update_attributes(path: 'bar') }
+        before do
+          route.update_attributes(path: 'bar')
+        end
 
         it 'updates children routes with new path' do
           expect(described_class.exists?(path: 'bar')).to be_truthy
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d5bd9946ab6..1a1bbd60504 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1584,7 +1584,9 @@ describe User, models: true do
     end
 
     context 'user is member of the top group' do
-      before { group.add_owner(user) }
+      before do
+        group.add_owner(user)
+      end
 
       if Group.supports_nested_groups?
         it 'returns all groups' do
@@ -1602,7 +1604,9 @@ describe User, models: true do
     end
 
     context 'user is member of the first child (internal node), branch 1', :nested_groups do
-      before { nested_group_1.add_owner(user) }
+      before do
+        nested_group_1.add_owner(user)
+      end
 
       it 'returns the groups in the hierarchy' do
         is_expected.to match_array [
@@ -1613,7 +1617,9 @@ describe User, models: true do
     end
 
     context 'user is member of the first child (internal node), branch 2', :nested_groups do
-      before { nested_group_2.add_owner(user) }
+      before do
+        nested_group_2.add_owner(user)
+      end
 
       it 'returns the groups in the hierarchy' do
         is_expected.to match_array [
@@ -1624,7 +1630,9 @@ describe User, models: true do
     end
 
     context 'user is member of the last child (leaf node)', :nested_groups do
-      before { nested_group_1_1.add_owner(user) }
+      before do
+        nested_group_1_1.add_owner(user)
+      end
 
       it 'returns the groups in the hierarchy' do
         is_expected.to match_array [
diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb
index 3f4ce222b60..48a139d4b83 100644
--- a/spec/policies/ci/build_policy_spec.rb
+++ b/spec/policies/ci/build_policy_spec.rb
@@ -10,7 +10,9 @@ describe Ci::BuildPolicy, :models do
   end
 
   shared_context 'public pipelines disabled' do
-    before { project.update_attribute(:public_builds, false) }
+    before do
+      project.update_attribute(:public_builds, false)
+    end
   end
 
   describe '#rules' do
@@ -54,7 +56,9 @@ describe Ci::BuildPolicy, :models do
       let(:project) { create(:empty_project, :public) }
 
       context 'team member is a guest' do
-        before { project.team << [user, :guest] }
+        before do
+          project.team << [user, :guest]
+        end
 
         context 'when public builds are enabled' do
           it 'includes ability to read build' do
@@ -72,7 +76,9 @@ describe Ci::BuildPolicy, :models do
       end
 
       context 'team member is a reporter' do
-        before { project.team << [user, :reporter] }
+        before do
+          project.team << [user, :reporter]
+        end
 
         context 'when public builds are enabled' do
           it 'includes ability to read build' do
diff --git a/spec/policies/project_snippet_policy_spec.rb b/spec/policies/project_snippet_policy_spec.rb
index ddbed5f781e..d2b2528c57a 100644
--- a/spec/policies/project_snippet_policy_spec.rb
+++ b/spec/policies/project_snippet_policy_spec.rb
@@ -78,7 +78,9 @@ describe ProjectSnippetPolicy, models: true do
     context 'project team member external user' do
       subject { abilities(external_user, :internal) }
 
-      before { project.team << [external_user, :developer] }
+      before do
+        project.team << [external_user, :developer]
+      end
 
       it do
         is_expected.to include(:read_project_snippet)
@@ -120,7 +122,9 @@ describe ProjectSnippetPolicy, models: true do
     context 'project team member normal user' do
       subject { abilities(regular_user, :private) }
 
-      before { project.team << [regular_user, :developer] }
+      before do
+        project.team << [regular_user, :developer]
+      end
 
       it do
         is_expected.to include(:read_project_snippet)
@@ -131,7 +135,9 @@ describe ProjectSnippetPolicy, models: true do
     context 'project team member external user' do
       subject { abilities(external_user, :private) }
 
-      before { project.team << [external_user, :developer] }
+      before do
+        project.team << [external_user, :developer]
+      end
 
       it do
         is_expected.to include(:read_project_snippet)
diff --git a/spec/requests/api/award_emoji_spec.rb b/spec/requests/api/award_emoji_spec.rb
index bbdef0aeb1b..6d822b5cb4f 100644
--- a/spec/requests/api/award_emoji_spec.rb
+++ b/spec/requests/api/award_emoji_spec.rb
@@ -9,7 +9,9 @@ describe API::AwardEmoji do
   let!(:downvote)       { create(:award_emoji, :downvote, awardable: merge_request, user: user) }
   let!(:note)           { create(:note, project: project, noteable: issue) }
 
-  before { project.team << [user, :master] }
+  before do
+    project.team << [user, :master]
+  end
 
   describe "GET /projects/:id/awardable/:awardable_id/award_emoji" do
     context 'on an issue' do
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index 6b637a03b6f..b8ca73c321c 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -34,7 +34,9 @@ describe API::CommitStatuses do
         let!(:status6) { create_status(master, status: 'success') }
 
         context 'latest commit statuses' do
-          before { get api(get_url, reporter) }
+          before do
+            get api(get_url, reporter)
+          end
 
           it 'returns latest commit statuses' do
             expect(response).to have_http_status(200)
@@ -48,7 +50,9 @@ describe API::CommitStatuses do
         end
 
         context 'all commit statuses' do
-          before { get api(get_url, reporter), all: 1 }
+          before do
+            get api(get_url, reporter), all: 1
+          end
 
           it 'returns all commit statuses' do
             expect(response).to have_http_status(200)
@@ -61,7 +65,9 @@ describe API::CommitStatuses do
         end
 
         context 'latest commit statuses for specific ref' do
-          before { get api(get_url, reporter), ref: 'develop' }
+          before do
+            get api(get_url, reporter), ref: 'develop'
+          end
 
           it 'returns latest commit statuses for specific ref' do
             expect(response).to have_http_status(200)
@@ -72,7 +78,9 @@ describe API::CommitStatuses do
         end
 
         context 'latest commit statues for specific name' do
-          before { get api(get_url, reporter), name: 'coverage' }
+          before do
+            get api(get_url, reporter), name: 'coverage'
+          end
 
           it 'return latest commit statuses for specific name' do
             expect(response).to have_http_status(200)
@@ -85,7 +93,9 @@ describe API::CommitStatuses do
     end
 
     context 'ci commit does not exist' do
-      before { get api(get_url, reporter) }
+      before do
+        get api(get_url, reporter)
+      end
 
       it 'returns empty array' do
         expect(response.status).to eq 200
@@ -95,7 +105,9 @@ describe API::CommitStatuses do
     end
 
     context "guest user" do
-      before { get api(get_url, guest) }
+      before do
+        get api(get_url, guest)
+      end
 
       it "does not return project commits" do
         expect(response).to have_http_status(403)
@@ -103,7 +115,9 @@ describe API::CommitStatuses do
     end
 
     context "unauthorized user" do
-      before { get api(get_url) }
+      before do
+        get api(get_url)
+      end
 
       it "does not return project commits" do
         expect(response).to have_http_status(401)
@@ -209,7 +223,9 @@ describe API::CommitStatuses do
       end
 
       context 'when status is invalid' do
-        before { post api(post_url, developer), state: 'invalid' }
+        before do
+          post api(post_url, developer), state: 'invalid'
+        end
 
         it 'does not create commit status' do
           expect(response).to have_http_status(400)
@@ -217,7 +233,9 @@ describe API::CommitStatuses do
       end
 
       context 'when request without a state made' do
-        before { post api(post_url, developer) }
+        before do
+          post api(post_url, developer)
+        end
 
         it 'does not create commit status' do
           expect(response).to have_http_status(400)
@@ -226,7 +244,10 @@ describe API::CommitStatuses do
 
       context 'when commit SHA is invalid' do
         let(:sha) { 'invalid_sha' }
-        before { post api(post_url, developer), state: 'running' }
+
+        before do
+          post api(post_url, developer), state: 'running'
+        end
 
         it 'returns not found error' do
           expect(response).to have_http_status(404)
@@ -248,7 +269,9 @@ describe API::CommitStatuses do
     end
 
     context 'reporter user' do
-      before { post api(post_url, reporter), state: 'running' }
+      before do
+        post api(post_url, reporter), state: 'running'
+      end
 
       it 'does not create commit status' do
         expect(response).to have_http_status(403)
@@ -256,7 +279,9 @@ describe API::CommitStatuses do
     end
 
     context 'guest user' do
-      before { post api(post_url, guest), state: 'running' }
+      before do
+        post api(post_url, guest), state: 'running'
+      end
 
       it 'does not create commit status' do
         expect(response).to have_http_status(403)
@@ -264,7 +289,9 @@ describe API::CommitStatuses do
     end
 
     context 'unauthorized user' do
-      before { post api(post_url) }
+      before do
+        post api(post_url)
+      end
 
       it 'does not create commit status' do
         expect(response).to have_http_status(401)
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index b0c265b6453..0dad547735d 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -9,11 +9,15 @@ describe API::Commits do
   let!(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
   let!(:another_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'another comment on a commit') }
 
-  before { project.team << [user, :reporter] }
+  before do
+    project.team << [user, :reporter]
+  end
 
   describe "List repository commits" do
     context "authorized user" do
-      before { project.team << [user2, :reporter] }
+      before do
+        project.team << [user2, :reporter]
+      end
 
       it "returns project commits" do
         commit = project.repository.commit
@@ -514,7 +518,9 @@ describe API::Commits do
 
   describe "Get the diff of a commit" do
     context "authorized user" do
-      before { project.team << [user2, :reporter] }
+      before do
+        project.team << [user2, :reporter]
+      end
 
       it "returns the diff of the selected commit" do
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff", user)
diff --git a/spec/requests/api/deploy_keys_spec.rb b/spec/requests/api/deploy_keys_spec.rb
index 4d9cd5f3a27..9c260f88f56 100644
--- a/spec/requests/api/deploy_keys_spec.rb
+++ b/spec/requests/api/deploy_keys_spec.rb
@@ -41,7 +41,9 @@ describe API::DeployKeys do
   end
 
   describe 'GET /projects/:id/deploy_keys' do
-    before { deploy_key }
+    before do
+      deploy_key
+    end
 
     it 'returns array of ssh keys' do
       get api("/projects/#{project.id}/deploy_keys", admin)
@@ -161,7 +163,9 @@ describe API::DeployKeys do
   end
 
   describe 'DELETE /projects/:id/deploy_keys/:key_id' do
-    before { deploy_key }
+    before do
+      deploy_key
+    end
 
     it 'deletes existing key' do
       expect do
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index d325c6eff9d..c5ec8be4f21 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -13,7 +13,9 @@ describe API::Files do
   let(:author_email) { 'user@example.org' }
   let(:author_name) { 'John Doe' }
 
-  before { project.team << [user, :developer] }
+  before do
+    project.team << [user, :developer]
+  end
 
   def route(file_path = nil)
     "/projects/#{project.id}/repository/files/#{file_path}"
diff --git a/spec/requests/api/helpers_spec.rb b/spec/requests/api/helpers_spec.rb
index ed392acc607..191c60aba31 100644
--- a/spec/requests/api/helpers_spec.rb
+++ b/spec/requests/api/helpers_spec.rb
@@ -55,40 +55,62 @@ describe API::Helpers do
     subject { current_user }
 
     describe "Warden authentication" do
-      before { doorkeeper_guard_returns false }
+      before do
+        doorkeeper_guard_returns false
+      end
 
       context "with invalid credentials" do
         context "GET request" do
-          before { env['REQUEST_METHOD'] = 'GET' }
+          before do
+            env['REQUEST_METHOD'] = 'GET'
+          end
+
           it { is_expected.to be_nil }
         end
       end
 
       context "with valid credentials" do
-        before { warden_authenticate_returns user }
+        before do
+          warden_authenticate_returns user
+        end
 
         context "GET request" do
-          before { env['REQUEST_METHOD'] = 'GET' }
+          before do
+            env['REQUEST_METHOD'] = 'GET'
+          end
+
           it { is_expected.to eq(user) }
         end
 
         context "HEAD request" do
-          before { env['REQUEST_METHOD'] = 'HEAD' }
+          before do
+            env['REQUEST_METHOD'] = 'HEAD'
+          end
+
           it { is_expected.to eq(user) }
         end
 
         context "PUT request" do
-          before { env['REQUEST_METHOD'] = 'PUT' }
+          before do
+            env['REQUEST_METHOD'] = 'PUT'
+          end
+
           it { is_expected.to be_nil }
         end
 
         context "POST request" do
-          before { env['REQUEST_METHOD'] = 'POST' }
+          before do
+            env['REQUEST_METHOD'] = 'POST'
+          end
+
           it { is_expected.to be_nil }
         end
 
         context "DELETE request" do
-          before { env['REQUEST_METHOD'] = 'DELETE' }
+          before do
+            env['REQUEST_METHOD'] = 'DELETE'
+          end
+
           it { is_expected.to be_nil }
         end
       end
diff --git a/spec/requests/api/keys_spec.rb b/spec/requests/api/keys_spec.rb
index ab957c72984..f534332ca6c 100644
--- a/spec/requests/api/keys_spec.rb
+++ b/spec/requests/api/keys_spec.rb
@@ -4,11 +4,9 @@ describe API::Keys do
   let(:user)  { create(:user) }
   let(:admin) { create(:admin) }
   let(:key)   { create(:key, user: user) }
-  let(:email)   { create(:email, user: user) }
+  let(:email) { create(:email, user: user) }
 
   describe 'GET /keys/:uid' do
-    before { admin }
-
     context 'when unauthenticated' do
       it 'returns authentication error' do
         get api("/keys/#{key.id}")
diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb
index 0c6b55c1630..f7e2f1908bb 100644
--- a/spec/requests/api/labels_spec.rb
+++ b/spec/requests/api/labels_spec.rb
@@ -339,7 +339,9 @@ describe API::Labels do
     end
 
     context "when user is already subscribed to label" do
-      before { label1.subscribe(user, project) }
+      before do
+        label1.subscribe(user, project)
+      end
 
       it "returns 304" do
         post api("/projects/#{project.id}/labels/#{label1.id}/subscribe", user)
@@ -358,7 +360,9 @@ describe API::Labels do
   end
 
   describe "POST /projects/:id/labels/:label_id/unsubscribe" do
-    before { label1.subscribe(user, project) }
+    before do
+      label1.subscribe(user, project)
+    end
 
     context "when label_id is a label title" do
       it "unsubscribes from the label" do
@@ -381,7 +385,9 @@ describe API::Labels do
     end
 
     context "when user is already unsubscribed from label" do
-      before { label1.unsubscribe(user, project) }
+      before do
+        label1.unsubscribe(user, project)
+      end
 
       it "returns 304" do
         post api("/projects/#{project.id}/labels/#{label1.id}/unsubscribe", user)
diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb
index dd74351a2b1..40934c25afc 100644
--- a/spec/requests/api/milestones_spec.rb
+++ b/spec/requests/api/milestones_spec.rb
@@ -6,7 +6,9 @@ describe API::Milestones do
   let!(:closed_milestone) { create(:closed_milestone, project: project, title: 'version1', description: 'closed milestone') }
   let!(:milestone) { create(:milestone, project: project, title: 'version2', description: 'open milestone') }
 
-  before { project.team << [user, :developer] }
+  before do
+    project.team << [user, :developer]
+  end
 
   describe 'GET /projects/:id/milestones' do
     it 'returns project milestones' do
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 6afcd237c3c..03f2b5950ee 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -28,7 +28,9 @@ describe API::Notes do
     system: true
   end
 
-  before { project.team << [user, :reporter] }
+  before do
+    project.team << [user, :reporter]
+  end
 
   describe "GET /projects/:id/noteable/:noteable_id/notes" do
     context "when noteable is an Issue" do
@@ -58,7 +60,9 @@ describe API::Notes do
         end
 
         context "and issue is confidential" do
-          before { ext_issue.update_attributes(confidential: true) }
+          before do
+            ext_issue.update_attributes(confidential: true)
+          end
 
           it "returns 404" do
             get api("/projects/#{ext_proj.id}/issues/#{ext_issue.iid}/notes", user)
@@ -150,7 +154,9 @@ describe API::Notes do
         end
 
         context "when issue is confidential" do
-          before { issue.update_attributes(confidential: true) }
+          before do
+            issue.update_attributes(confidential: true)
+          end
 
           it "returns 404" do
             get api("/projects/#{project.id}/issues/#{issue.iid}/notes/#{issue_note.id}", private_user)
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index 9e6957e9922..258085e503f 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -10,7 +10,9 @@ describe API::Pipelines do
                                ref: project.default_branch, user: user)
   end
 
-  before { project.team << [user, :master] }
+  before do
+    project.team << [user, :master]
+  end
 
   describe 'GET /projects/:id/pipelines ' do
     context 'authorized user' do
@@ -285,7 +287,9 @@ describe API::Pipelines do
   describe 'POST /projects/:id/pipeline ' do
     context 'authorized user' do
       context 'with gitlab-ci.yml' do
-        before { stub_ci_pipeline_to_return_yaml_file }
+        before do
+          stub_ci_pipeline_to_return_yaml_file
+        end
 
         it 'creates and returns a new pipeline' do
           expect do
@@ -419,7 +423,9 @@ describe API::Pipelines do
     context 'user without proper access rights' do
       let!(:reporter) { create(:user) }
 
-      before { project.team << [reporter, :reporter] }
+      before do
+        project.team << [reporter, :reporter]
+      end
 
       it 'rejects the action' do
         post api("/projects/#{project.id}/pipelines/#{pipeline.id}/cancel", reporter)
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 3e831373514..d92262a4c99 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -476,8 +476,9 @@ describe API::Projects do
   end
 
   describe 'POST /projects/user/:id' do
-    before { project }
-    before { admin }
+    before do
+      expect(project).to be_persisted
+    end
 
     it 'creates new project without path but with name and return 201' do
       expect { post api("/projects/user/#{user.id}", admin), name: 'Foo Project' }.to change {Project.count}.by(1)
@@ -581,7 +582,9 @@ describe API::Projects do
   end
 
   describe "POST /projects/:id/uploads" do
-    before { project }
+    before do
+      project
+    end
 
     it "uploads the file and returns its info" do
       post api("/projects/#{project.id}/uploads", user), file: fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
@@ -729,7 +732,9 @@ describe API::Projects do
 
       describe 'permissions' do
         context 'all projects' do
-          before { project.team << [user, :master] }
+          before do
+            project.team << [user, :master]
+          end
 
           it 'contains permission information' do
             get api("/projects", user)
@@ -756,7 +761,9 @@ describe API::Projects do
         context 'group project' do
           let(:project2) { create(:empty_project, group: create(:group)) }
 
-          before { project2.group.add_owner(user) }
+          before do
+            project2.group.add_owner(user)
+          end
 
           it 'sets the owner and return 200' do
             get api("/projects/#{project2.id}", user)
@@ -822,7 +829,9 @@ describe API::Projects do
   end
 
   describe 'GET /projects/:id/snippets' do
-    before { snippet }
+    before do
+      snippet
+    end
 
     it 'returns an array of project snippets' do
       get api("/projects/#{project.id}/snippets", user)
@@ -879,7 +888,9 @@ describe API::Projects do
   end
 
   describe 'DELETE /projects/:id/snippets/:snippet_id' do
-    before { snippet }
+    before do
+      snippet
+    end
 
     it 'deletes existing project snippet' do
       expect do
@@ -1074,14 +1085,16 @@ describe API::Projects do
   end
 
   describe 'PUT /projects/:id' do
-    before { project }
-    before { user }
-    before { user3 }
-    before { user4 }
-    before { project3 }
-    before { project4 }
-    before { project_member2 }
-    before { project_member }
+    before do
+      expect(project).to be_persisted
+      expect(user).to be_persisted
+      expect(user3).to be_persisted
+      expect(user4).to be_persisted
+      expect(project3).to be_persisted
+      expect(project4).to be_persisted
+      expect(project_member2).to be_persisted
+      expect(project_member).to be_persisted
+    end
 
     it 'returns 400 when nothing sent' do
       project_param = {}
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 5a4f0513248..d554c242916 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -190,17 +190,23 @@ describe API::Runner do
              pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0, commands: "ls\ndate")
     end
 
-    before { project.runners << runner }
+    before do
+      project.runners << runner
+    end
 
     describe 'POST /api/v4/jobs/request' do
       let!(:last_update) {}
       let!(:new_update) { }
       let(:user_agent) { 'gitlab-runner 9.0.0 (9-0-stable; go1.7.4; linux/amd64)' }
 
-      before { stub_container_registry_config(enabled: false) }
+      before do
+        stub_container_registry_config(enabled: false)
+      end
 
       shared_examples 'no jobs available' do
-        before { request_job }
+        before do
+          request_job
+        end
 
         context 'when runner sends version in User-Agent' do
           context 'for stable version' do
@@ -277,7 +283,9 @@ describe API::Runner do
         end
 
         context 'when jobs are finished' do
-          before { job.success }
+          before do
+            job.success
+          end
 
           it_behaves_like 'no jobs available'
         end
@@ -508,10 +516,14 @@ describe API::Runner do
           end
 
           context 'when job has no tags' do
-            before { job.update(tags: []) }
+            before do
+              job.update(tags: [])
+            end
 
             context 'when runner is allowed to pick untagged jobs' do
-              before { runner.update_column(:run_untagged, true) }
+              before do
+                runner.update_column(:run_untagged, true)
+              end
 
               it 'picks job' do
                 request_job
@@ -521,7 +533,9 @@ describe API::Runner do
             end
 
             context 'when runner is not allowed to pick untagged jobs' do
-              before { runner.update_column(:run_untagged, false) }
+              before do
+                runner.update_column(:run_untagged, false)
+              end
 
               it_behaves_like 'no jobs available'
             end
@@ -561,7 +575,9 @@ describe API::Runner do
             end
 
             context 'when registry is enabled' do
-              before { stub_container_registry_config(enabled: true, host_port: registry_url) }
+              before do
+                stub_container_registry_config(enabled: true, host_port: registry_url)
+              end
 
               it 'sends registry credentials key' do
                 request_job
@@ -572,7 +588,9 @@ describe API::Runner do
             end
 
             context 'when registry is disabled' do
-              before { stub_container_registry_config(enabled: false, host_port: registry_url) }
+              before do
+                stub_container_registry_config(enabled: false, host_port: registry_url)
+              end
 
               it 'does not send registry credentials' do
                 request_job
@@ -594,7 +612,9 @@ describe API::Runner do
     describe 'PUT /api/v4/jobs/:id' do
       let(:job) { create(:ci_build, :pending, :trace, pipeline: pipeline, runner_id: runner.id) }
 
-      before { job.run! }
+      before do
+        job.run!
+      end
 
       context 'when status is given' do
         it 'mark job as succeeded' do
@@ -649,7 +669,9 @@ describe API::Runner do
       let(:headers_with_range) { headers.merge({ 'Content-Range' => '11-20' }) }
       let(:update_interval) { 10.seconds.to_i }
 
-      before { initial_patch_the_trace }
+      before do
+        initial_patch_the_trace
+      end
 
       context 'when request is valid' do
         it 'gets correct response' do
@@ -791,7 +813,9 @@ describe API::Runner do
       let(:file_upload) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
       let(:file_upload2) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/gif') }
 
-      before { job.run! }
+      before do
+        job.run!
+      end
 
       describe 'POST /api/v4/jobs/:id/artifacts/authorize' do
         context 'when using token as parameter' do
@@ -897,13 +921,17 @@ describe API::Runner do
             end
 
             context 'when uses regular file post' do
-              before { upload_artifacts(file_upload, headers_with_token, false) }
+              before do
+                upload_artifacts(file_upload, headers_with_token, false)
+              end
 
               it_behaves_like 'successful artifacts upload'
             end
 
             context 'when uses accelerated file post' do
-              before { upload_artifacts(file_upload, headers_with_token, true) }
+              before do
+                upload_artifacts(file_upload, headers_with_token, true)
+              end
 
               it_behaves_like 'successful artifacts upload'
             end
@@ -1057,7 +1085,9 @@ describe API::Runner do
             allow(ArtifactUploader).to receive(:artifacts_upload_path).and_return(@tmpdir)
           end
 
-          after { FileUtils.remove_entry @tmpdir }
+          after do
+            FileUtils.remove_entry @tmpdir
+          end
 
           it' "fails to post artifacts for outside of tmp path"' do
             upload_artifacts(file_upload, headers_with_token)
@@ -1079,7 +1109,9 @@ describe API::Runner do
       describe 'GET /api/v4/jobs/:id/artifacts' do
         let(:token) { job.token }
 
-        before { download_artifact }
+        before do
+          download_artifact
+        end
 
         context 'when job has artifacts' do
           let(:job) { create(:ci_build, :artifacts) }
diff --git a/spec/requests/api/system_hooks_spec.rb b/spec/requests/api/system_hooks_spec.rb
index 2eb191d6049..f65b475fe44 100644
--- a/spec/requests/api/system_hooks_spec.rb
+++ b/spec/requests/api/system_hooks_spec.rb
@@ -5,7 +5,9 @@ describe API::SystemHooks do
   let(:admin) { create(:admin) }
   let!(:hook) { create(:system_hook, url: "http://example.com") }
 
-  before { stub_request(:post, hook.url) }
+  before do
+    stub_request(:post, hook.url)
+  end
 
   describe "GET /hooks" do
     context "when no user" do
diff --git a/spec/requests/api/templates_spec.rb b/spec/requests/api/templates_spec.rb
index cb55985e3f5..f8af9295842 100644
--- a/spec/requests/api/templates_spec.rb
+++ b/spec/requests/api/templates_spec.rb
@@ -2,14 +2,18 @@ require 'spec_helper'
 
 describe API::Templates do
   context 'the Template Entity' do
-    before { get api('/templates/gitignores/Ruby') }
+    before do
+      get api('/templates/gitignores/Ruby')
+    end
 
     it { expect(json_response['name']).to eq('Ruby') }
     it { expect(json_response['content']).to include('*.gem') }
   end
 
   context 'the TemplateList Entity' do
-    before { get api('/templates/gitignores') }
+    before do
+      get api('/templates/gitignores')
+    end
 
     it { expect(json_response.first['name']).not_to be_nil }
     it { expect(json_response.first['content']).to be_nil }
@@ -47,7 +51,9 @@ describe API::Templates do
   end
 
   context 'the License Template Entity' do
-    before { get api('/templates/licenses/mit') }
+    before do
+      get api('/templates/licenses/mit')
+    end
 
     it 'returns a license template' do
       expect(json_response['key']).to eq('mit')
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index ec51b96c86b..9dc4b6972a6 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -160,7 +160,9 @@ describe API::Users do
   end
 
   describe "POST /users" do
-    before { admin }
+    before do
+      admin
+    end
 
     it "creates user" do
       expect do
@@ -349,7 +351,9 @@ describe API::Users do
   describe "PUT /users/:id" do
     let!(:admin_user) { create(:admin) }
 
-    before { admin }
+    before do
+      admin
+    end
 
     it "updates user with new bio" do
       put api("/users/#{user.id}", admin), { bio: 'new test bio' }
@@ -502,7 +506,9 @@ describe API::Users do
   end
 
   describe "POST /users/:id/keys" do
-    before { admin }
+    before do
+      admin
+    end
 
     it "does not create invalid ssh key" do
       post api("/users/#{user.id}/keys", admin), { title: "invalid key" }
@@ -532,7 +538,9 @@ describe API::Users do
   end
 
   describe 'GET /user/:id/keys' do
-    before { admin }
+    before do
+      admin
+    end
 
     context 'when unauthenticated' do
       it 'returns authentication error' do
@@ -563,7 +571,9 @@ describe API::Users do
   end
 
   describe 'DELETE /user/:id/keys/:key_id' do
-    before { admin }
+    before do
+      admin
+    end
 
     context 'when unauthenticated' do
       it 'returns authentication error' do
@@ -601,7 +611,9 @@ describe API::Users do
   end
 
   describe "POST /users/:id/emails" do
-    before { admin }
+    before do
+      admin
+    end
 
     it "does not create invalid email" do
       post api("/users/#{user.id}/emails", admin), {}
@@ -625,7 +637,9 @@ describe API::Users do
   end
 
   describe 'GET /user/:id/emails' do
-    before { admin }
+    before do
+      admin
+    end
 
     context 'when unauthenticated' do
       it 'returns authentication error' do
@@ -662,7 +676,9 @@ describe API::Users do
   end
 
   describe 'DELETE /user/:id/emails/:email_id' do
-    before { admin }
+    before do
+      admin
+    end
 
     context 'when unauthenticated' do
       it 'returns authentication error' do
@@ -708,7 +724,10 @@ describe API::Users do
   describe "DELETE /users/:id" do
     let!(:namespace) { user.namespace }
     let!(:issue) { create(:issue, author: user) }
-    before { admin }
+
+    before do
+      admin
+    end
 
     it "deletes user" do
       Sidekiq::Testing.inline! { delete api("/users/#{user.id}", admin) }
@@ -1068,7 +1087,10 @@ describe API::Users do
   end
 
   describe 'POST /users/:id/block' do
-    before { admin }
+    before do
+      admin
+    end
+
     it 'blocks existing user' do
       post api("/users/#{user.id}/block", admin)
       expect(response).to have_http_status(201)
@@ -1096,7 +1118,10 @@ describe API::Users do
 
   describe 'POST /users/:id/unblock' do
     let(:blocked_user)  { create(:user, state: 'blocked') }
-    before { admin }
+
+    before do
+      admin
+    end
 
     it 'unblocks existing user' do
       post api("/users/#{user.id}/unblock", admin)
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 04cc7708858..83c675792f4 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -241,7 +241,9 @@ describe Ci::API::Builds do
         end
 
         context 'when runner is allowed to pick untagged builds' do
-          before { runner.update_column(:run_untagged, true) }
+          before do
+            runner.update_column(:run_untagged, true)
+          end
 
           it 'picks build' do
             register_builds
@@ -467,7 +469,9 @@ describe Ci::API::Builds do
       let(:token) { build.token }
       let(:headers_with_token) { headers.merge(Ci::API::Helpers::BUILD_TOKEN_HEADER => token) }
 
-      before { build.run! }
+      before do
+        build.run!
+      end
 
       describe "POST /builds/:id/artifacts/authorize" do
         context "authorizes posting artifact to running build" do
@@ -523,7 +527,9 @@ describe Ci::API::Builds do
         end
 
         context 'authorization token is invalid' do
-          before { post authorize_url, { token: 'invalid', filesize: 100 } }
+          before do
+            post authorize_url, { token: 'invalid', filesize: 100 }
+          end
 
           it 'responds with forbidden' do
             expect(response).to have_http_status(403)
diff --git a/spec/requests/ci/api/runners_spec.rb b/spec/requests/ci/api/runners_spec.rb
index 0b9733221d8..78b2be350cd 100644
--- a/spec/requests/ci/api/runners_spec.rb
+++ b/spec/requests/ci/api/runners_spec.rb
@@ -12,7 +12,9 @@ describe Ci::API::Runners do
 
   describe "POST /runners/register" do
     context 'when runner token is provided' do
-      before { post ci_api("/runners/register"), token: registration_token }
+      before do
+        post ci_api("/runners/register"), token: registration_token
+      end
 
       it 'creates runner with default values' do
         expect(response).to have_http_status 201
@@ -69,7 +71,10 @@ describe Ci::API::Runners do
 
     context 'when project token is provided' do
       let(:project) { FactoryGirl.create(:empty_project) }
-      before { post ci_api("/runners/register"), token: project.runners_token }
+
+      before do
+        post ci_api("/runners/register"), token: project.runners_token
+      end
 
       it 'creates runner' do
         expect(response).to have_http_status 201
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index 6a83024d0d5..dce78faefc9 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -627,7 +627,9 @@ describe 'Git HTTP requests', lib: true do
           let(:path) { "/#{project.path_with_namespace}/info/refs" }
 
           context "when no params are added" do
-            before { get path }
+            before do
+              get path
+            end
 
             it "redirects to the .git suffix version" do
               expect(response).to redirect_to("/#{project.path_with_namespace}.git/info/refs")
@@ -636,7 +638,10 @@ describe 'Git HTTP requests', lib: true do
 
           context "when the upload-pack service is requested" do
             let(:params) { { service: 'git-upload-pack' } }
-            before { get path, params }
+
+            before do
+              get path, params
+            end
 
             it "redirects to the .git suffix version" do
               expect(response).to redirect_to("/#{project.path_with_namespace}.git/info/refs?service=#{params[:service]}")
@@ -645,7 +650,10 @@ describe 'Git HTTP requests', lib: true do
 
           context "when the receive-pack service is requested" do
             let(:params) { { service: 'git-receive-pack' } }
-            before { get path, params }
+
+            before do
+              get path, params
+            end
 
             it "redirects to the .git suffix version" do
               expect(response).to redirect_to("/#{project.path_with_namespace}.git/info/refs?service=#{params[:service]}")
@@ -654,7 +662,10 @@ describe 'Git HTTP requests', lib: true do
 
           context "when the params are anything else" do
             let(:params) { { service: 'git-implode-pack' } }
-            before { get path, params }
+
+            before do
+              get path, params
+            end
 
             it "redirects to the sign-in page" do
               expect(response).to redirect_to(new_user_session_path)
@@ -695,7 +706,9 @@ describe 'Git HTTP requests', lib: true do
         end
 
         context "when the file does not exist" do
-          before { get "/#{project.path_with_namespace}/blob/master/info/refs" }
+          before do
+            get "/#{project.path_with_namespace}/blob/master/info/refs"
+          end
 
           it "returns not found" do
             expect(response).to have_http_status(:not_found)
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 54d7cf5f10d..5e4cf05748e 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -6,7 +6,9 @@ describe JwtController do
   let(:service_name) { 'test' }
   let(:parameters) { { service: service_name } }
 
-  before { stub_const('JwtController::SERVICES', service_name => service_class) }
+  before do
+    stub_const('JwtController::SERVICES', service_name => service_class)
+  end
 
   context 'existing service' do
     subject! { get '/jwt/auth', parameters }
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 0a6778ae2ef..95d40138fea 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -93,13 +93,17 @@ describe 'project routing' do
       end
 
       context 'name with dot' do
-        before { allow(Project).to receive(:find_by_full_path).with('gitlab/gitlabhq.keys', any_args).and_return(true) }
+        before do
+          allow(Project).to receive(:find_by_full_path).with('gitlab/gitlabhq.keys', any_args).and_return(true)
+        end
 
         it { expect(get('/gitlab/gitlabhq.keys')).to route_to('projects#show', namespace_id: 'gitlab', id: 'gitlabhq.keys') }
       end
 
       context 'with nested group' do
-        before { allow(Project).to receive(:find_by_full_path).with('gitlab/subgroup/gitlabhq', any_args).and_return(true) }
+        before do
+          allow(Project).to receive(:find_by_full_path).with('gitlab/subgroup/gitlabhq', any_args).and_return(true)
+        end
 
         it { expect(get('/gitlab/subgroup/gitlabhq')).to route_to('projects#show', namespace_id: 'gitlab/subgroup', id: 'gitlabhq') }
       end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index a62af13cf0c..a45839b16f5 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -286,7 +286,9 @@ end
 describe "Groups", "routing" do
   let(:name) { 'complex.group-namegit' }
 
-  before { allow_any_instance_of(GroupUrlConstrainer).to receive(:matches?).and_return(true) }
+  before do
+    allow_any_instance_of(GroupUrlConstrainer).to receive(:matches?).and_return(true)
+  end
 
   it "to #show" do
     expect(get("/groups/#{name}")).to route_to('groups#show', id: name)
diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb
index d2ad6c44702..4c52a00b442 100644
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
@@ -62,7 +62,9 @@ describe EnvironmentSerializer do
     subject { serializer.represent(resource) }
 
     context 'when there is a single environment' do
-      before { create(:environment, name: 'staging') }
+      before do
+        create(:environment, name: 'staging')
+      end
 
       it 'represents one standalone environment' do
         expect(subject.count).to eq 1
@@ -138,7 +140,9 @@ describe EnvironmentSerializer do
 
     context 'when resource is paginatable relation' do
       context 'when there is a single environment object in relation' do
-        before { create(:environment) }
+        before do
+          create(:environment)
+        end
 
         it 'serializes environments' do
           expect(subject.first).to have_key :id
@@ -146,7 +150,9 @@ describe EnvironmentSerializer do
       end
 
       context 'when multiple environment objects are serialized' do
-        before { create_list(:environment, 3) }
+        before do
+          create_list(:environment, 3)
+        end
 
         it 'serializes appropriate number of objects' do
           expect(subject.count).to be 2
diff --git a/spec/serializers/pipeline_details_entity_spec.rb b/spec/serializers/pipeline_details_entity_spec.rb
index 5cb9b9945b6..d28dec9592a 100644
--- a/spec/serializers/pipeline_details_entity_spec.rb
+++ b/spec/serializers/pipeline_details_entity_spec.rb
@@ -51,7 +51,9 @@ describe PipelineDetailsEntity do
       end
 
       context 'user has ability to retry pipeline' do
-        before { project.team << [user, :developer] }
+        before do
+          project.team << [user, :developer]
+        end
 
         it 'retryable flag is true' do
           expect(subject[:flags][:retryable]).to eq true
@@ -77,7 +79,9 @@ describe PipelineDetailsEntity do
       end
 
       context 'user has ability to cancel pipeline' do
-        before { project.add_developer(user) }
+        before do
+          project.add_developer(user)
+        end
 
         it 'cancelable flag is true' do
           expect(subject[:flags][:cancelable]).to eq true
diff --git a/spec/serializers/pipeline_entity_spec.rb b/spec/serializers/pipeline_entity_spec.rb
index a059c2cc736..46650f3a80d 100644
--- a/spec/serializers/pipeline_entity_spec.rb
+++ b/spec/serializers/pipeline_entity_spec.rb
@@ -51,7 +51,9 @@ describe PipelineEntity do
       end
 
       context 'user has ability to retry pipeline' do
-        before { project.team << [user, :developer] }
+        before do
+          project.team << [user, :developer]
+        end
 
         it 'contains retry path' do
           expect(subject[:retry_path]).to be_present
@@ -77,7 +79,9 @@ describe PipelineEntity do
       end
 
       context 'user has ability to cancel pipeline' do
-        before { project.add_developer(user) }
+        before do
+          project.add_developer(user)
+        end
 
         it 'contains cancel path' do
           expect(subject[:cancel_path]).to be_present
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 34b19fb9fc4..44813656aff 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -69,7 +69,9 @@ describe PipelineSerializer do
         let(:pagination) { { page: 1, per_page: 2 } }
 
         context 'when a single pipeline object is present in relation' do
-          before { create(:ci_empty_pipeline) }
+          before do
+            create(:ci_empty_pipeline)
+          end
 
           it 'serializes pipeline relation' do
             expect(subject.first).to have_key :id
@@ -77,7 +79,9 @@ describe PipelineSerializer do
         end
 
         context 'when a multiple pipeline objects are being serialized' do
-          before { create_list(:ci_empty_pipeline, 3) }
+          before do
+            create_list(:ci_empty_pipeline, 3)
+          end
 
           it 'serializes appropriate number of objects' do
             expect(subject.count).to be 2
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index e273dfe1552..60cb7a9440f 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -34,7 +34,9 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
       end
 
       context 'for changed configuration' do
-        before { stub_application_setting(container_registry_token_expire_delay: expire_delay) }
+        before do
+          stub_application_setting(container_registry_token_expire_delay: expire_delay)
+        end
 
         it { expect(expires_at).to be_within(2.seconds).of(Time.now + expire_delay.minutes) }
       end
@@ -117,7 +119,9 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
       end
 
       context 'allow developer to push images' do
-        before { project.team << [current_user, :developer] }
+        before do
+          project.team << [current_user, :developer]
+        end
 
         let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:push" }
@@ -128,7 +132,9 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
       end
 
       context 'allow reporter to pull images' do
-        before { project.team << [current_user, :reporter] }
+        before do
+          project.team << [current_user, :reporter]
+        end
 
         context 'when pulling from root level repository' do
           let(:current_params) do
@@ -141,7 +147,9 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
       end
 
       context 'return a least of privileges' do
-        before { project.team << [current_user, :reporter] }
+        before do
+          project.team << [current_user, :reporter]
+        end
 
         let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:push,pull" }
@@ -152,7 +160,9 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
       end
 
       context 'disallow guest to pull or push images' do
-        before { project.team << [current_user, :guest] }
+        before do
+          project.team << [current_user, :guest]
+        end
 
         let(:current_params) do
           { scope: "repository:#{project.path_with_namespace}:pull,push" }
@@ -355,7 +365,9 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
     context 'for project without container registry' do
       let(:project) { create(:empty_project, :public, container_registry_enabled: false) }
 
-      before { project.update(container_registry_enabled: false) }
+      before do
+        project.update(container_registry_enabled: false)
+      end
 
       context 'disallow when pulling' do
         let(:current_params) do
diff --git a/spec/services/ci/update_build_queue_service_spec.rb b/spec/services/ci/update_build_queue_service_spec.rb
index c44e6b2a48b..efefa8e8eca 100644
--- a/spec/services/ci/update_build_queue_service_spec.rb
+++ b/spec/services/ci/update_build_queue_service_spec.rb
@@ -9,7 +9,9 @@ describe Ci::UpdateBuildQueueService, :services do
     let(:runner) { create(:ci_runner) }
 
     context 'when there are runner that can pick build' do
-      before { build.project.runners << runner }
+      before do
+        build.project.runners << runner
+      end
 
       it 'ticks runner queue value' do
         expect { subject.execute(build) }
@@ -36,7 +38,9 @@ describe Ci::UpdateBuildQueueService, :services do
     end
 
     context 'when there are no runners that can pick build' do
-      before { build.tag_list = [:docker] }
+      before do
+        build.tag_list = [:docker]
+      end
 
       it 'does not tick runner queue value' do
         expect { subject.execute(build) }
diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb
index 5398b5c3f7e..6cf4342ad4c 100644
--- a/spec/services/create_deployment_service_spec.rb
+++ b/spec/services/create_deployment_service_spec.rb
@@ -204,7 +204,9 @@ describe CreateDeploymentService, services: true do
     let(:merge_request) { create(:merge_request, target_branch: 'master', source_branch: 'feature', source_project: project) }
 
     context "while updating the 'first_deployed_to_production_at' time" do
-      before { merge_request.mark_as_merged }
+      before do
+        merge_request.mark_as_merged
+      end
 
       context "for merge requests merged before the current deploy" do
         it "sets the time if the deploy's environment is 'production'" do
diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb
index bcb62429275..fbd9026640c 100644
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -14,7 +14,9 @@ describe Groups::CreateService, '#execute', services: true do
     end
 
     context "cannot create group with restricted visibility level" do
-      before { allow_any_instance_of(ApplicationSetting).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC]) }
+      before do
+        allow_any_instance_of(ApplicationSetting).to receive(:restricted_visibility_levels).and_return([Gitlab::VisibilityLevel::PUBLIC])
+      end
 
       it { is_expected.not_to be_persisted }
     end
@@ -25,7 +27,9 @@ describe Groups::CreateService, '#execute', services: true do
     let!(:service) { described_class.new(user, group_params.merge(parent_id: group.id)) }
 
     context 'as group owner' do
-      before { group.add_owner(user) }
+      before do
+        group.add_owner(user)
+      end
 
       it { is_expected.to be_persisted }
     end
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index dab1a3469f7..370bd352200 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -155,7 +155,9 @@ describe Issues::CreateService, services: true do
 
     context 'issue create service' do
       context 'assignees' do
-        before { project.team << [user, :master] }
+        before do
+          project.team << [user, :master]
+        end
 
         it 'removes assignee when user id is invalid' do
           opts = { title: 'Title', description: 'Description', assignee_ids: [-1] }
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 9f8346d52bb..d1dd1466d95 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -251,12 +251,18 @@ describe Issues::MoveService, services: true do
       end
 
       context 'user is reporter only in new project' do
-        before { new_project.team << [user, :reporter] }
+        before do
+          new_project.team << [user, :reporter]
+        end
+
         it { expect { move }.to raise_error(StandardError, /permissions/) }
       end
 
       context 'user is reporter only in old project' do
-        before { old_project.team << [user, :reporter] }
+        before do
+          old_project.team << [user, :reporter]
+        end
+
         it { expect { move }.to raise_error(StandardError, /permissions/) }
       end
 
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index a78866a2c32..c26642f5015 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -295,7 +295,9 @@ describe Issues::UpdateService, services: true do
       end
 
       context 'when issue has the `label` label' do
-        before { issue.labels << label }
+        before do
+          issue.labels << label
+        end
 
         it 'does not send notifications for existing labels' do
           opts = { label_ids: [label.id, label2.id] }
@@ -329,7 +331,9 @@ describe Issues::UpdateService, services: true do
       it { expect(issue.tasks?).to eq(true) }
 
       context 'when tasks are marked as completed' do
-        before { update_issue(description: "- [x] Task 1\n- [X] Task 2") }
+        before do
+          update_issue(description: "- [x] Task 1\n- [X] Task 2")
+        end
 
         it 'creates system note about task status change' do
           note1 = find_note('marked the task **Task 1** as completed')
@@ -417,7 +421,9 @@ describe Issues::UpdateService, services: true do
       context 'when remove_label_ids and label_ids are passed' do
         let(:params) { { label_ids: [], remove_label_ids: [label.id] } }
 
-        before { issue.update_attributes(labels: [label, label3]) }
+        before do
+          issue.update_attributes(labels: [label, label3])
+        end
 
         it 'ignores the label_ids parameter' do
           expect(result.label_ids).not_to be_empty
@@ -431,7 +437,9 @@ describe Issues::UpdateService, services: true do
       context 'when add_label_ids and remove_label_ids are passed' do
         let(:params) { { add_label_ids: [label3.id], remove_label_ids: [label.id] } }
 
-        before { issue.update_attributes(labels: [label]) }
+        before do
+          issue.update_attributes(labels: [label])
+        end
 
         it 'adds the passed labels' do
           expect(result.label_ids).to include(label3.id)
diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index 5ce8e17976b..5a05ab3ea50 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -5,7 +5,9 @@ describe Members::CreateService, services: true do
   let(:user) { create(:user) }
   let(:project_user) { create(:user) }
 
-  before { project.team << [user, :master] }
+  before do
+    project.team << [user, :master]
+  end
 
   it 'adds user to members' do
     params = { user_ids: project_user.id.to_s, access_level: Gitlab::Access::GUEST }
diff --git a/spec/services/merge_requests/build_service_spec.rb b/spec/services/merge_requests/build_service_spec.rb
index 6f9d1208b1d..01ef52396d7 100644
--- a/spec/services/merge_requests/build_service_spec.rb
+++ b/spec/services/merge_requests/build_service_spec.rb
@@ -206,7 +206,9 @@ describe MergeRequests::BuildService, services: true do
       context 'branch starts with external issue IID followed by a hyphen' do
         let(:source_branch) { '12345-fix-issue' }
 
-        before { allow(project).to receive(:default_issues_tracker?).and_return(false) }
+        before do
+          allow(project).to receive(:default_issues_tracker?).and_return(false)
+        end
 
         it 'sets the title to: Resolves External Issue $issue-iid' do
           expect(merge_request.title).to eq('Resolve External Issue 12345')
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index 2963f62cc7d..13fee953e41 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -150,7 +150,9 @@ describe MergeRequests::CreateService, services: true do
       context 'asssignee_id' do
         let(:assignee) { create(:user) }
 
-        before { project.team << [user, :master] }
+        before do
+          project.team << [user, :master]
+        end
 
         it 'removes assignee_id when user id is invalid' do
           opts = { title: 'Title', description: 'Description', assignee_id: -1 }
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index d96f819e66a..b3b188a805f 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -81,7 +81,9 @@ describe MergeRequests::MergeService, services: true do
         end
 
         context "when jira_issue_transition_id is not present" do
-          before { allow_any_instance_of(JIRA::Resource::Issue).to receive(:resolution).and_return(nil) }
+          before do
+            allow_any_instance_of(JIRA::Resource::Issue).to receive(:resolution).and_return(nil)
+          end
 
           it "does not close issue" do
             allow(jira_tracker).to receive_messages(jira_issue_transition_id: nil)
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 091c193aaa6..fd46020bbdb 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -356,7 +356,9 @@ describe MergeRequests::UpdateService, services: true do
       end
 
       context 'when issue has the `label` label' do
-        before { merge_request.labels << label }
+        before do
+          merge_request.labels << label
+        end
 
         it 'does not send notifications for existing labels' do
           opts = { label_ids: [label.id, label2.id] }
@@ -388,12 +390,16 @@ describe MergeRequests::UpdateService, services: true do
     end
 
     context 'when MergeRequest has tasks' do
-      before { update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" }) }
+      before do
+        update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" })
+      end
 
       it { expect(@merge_request.tasks?).to eq(true) }
 
       context 'when tasks are marked as completed' do
-        before { update_merge_request({ description: "- [x] Task 1\n- [X] Task 2" }) }
+        before do
+          update_merge_request({ description: "- [x] Task 1\n- [X] Task 2" })
+        end
 
         it 'creates system note about task status change' do
           note1 = find_note('marked the task **Task 1** as completed')
diff --git a/spec/services/notes/slash_commands_service_spec.rb b/spec/services/notes/slash_commands_service_spec.rb
index c9954dc3603..d5ffc1908a9 100644
--- a/spec/services/notes/slash_commands_service_spec.rb
+++ b/spec/services/notes/slash_commands_service_spec.rb
@@ -6,7 +6,9 @@ describe Notes::SlashCommandsService, services: true do
     let(:master) { create(:user).tap { |u| project.team << [u, :master] } }
     let(:assignee) { create(:user) }
 
-    before { project.team << [assignee, :master] }
+    before do
+      project.team << [assignee, :master]
+    end
   end
 
   shared_examples 'note on noteable that does not support slash commands' do
diff --git a/spec/services/pages_service_spec.rb b/spec/services/pages_service_spec.rb
index aa63fe3a5c1..cf38c7c75e5 100644
--- a/spec/services/pages_service_spec.rb
+++ b/spec/services/pages_service_spec.rb
@@ -10,10 +10,14 @@ describe PagesService, services: true do
   end
 
   context 'execute asynchronously for pages job' do
-    before { build.name = 'pages' }
+    before do
+      build.name = 'pages'
+    end
 
     context 'on success' do
-      before { build.success }
+      before do
+        build.success
+      end
 
       it 'executes worker' do
         expect(PagesWorker).to receive(:perform_async)
@@ -23,7 +27,9 @@ describe PagesService, services: true do
 
     %w(pending running failed canceled).each do |status|
       context "on #{status}" do
-        before { build.status = status }
+        before do
+          build.status = status
+        end
 
         it 'does not execute worker' do
           expect(PagesWorker).not_to receive(:perform_async)
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index b957517c715..5d2f4cf17fb 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -59,12 +59,16 @@ describe Projects::TransferService, services: true do
   context 'visibility level' do
     let(:internal_group) { create(:group, :internal) }
 
-    before { internal_group.add_owner(user) }
+    before do
+      internal_group.add_owner(user)
+    end
 
     context 'when namespace visibility level < project visibility level' do
       let(:public_project) { create(:project, :public, :repository, namespace: user.namespace) }
 
-      before { transfer_project(public_project, user, internal_group) }
+      before do
+        transfer_project(public_project, user, internal_group)
+      end
 
       it { expect(public_project.visibility_level).to eq(internal_group.visibility_level) }
     end
@@ -72,7 +76,9 @@ describe Projects::TransferService, services: true do
     context 'when namespace visibility level > project visibility level' do
       let(:private_project) { create(:project, :private, :repository, namespace: user.namespace) }
 
-      before { transfer_project(private_project, user, internal_group) }
+      before do
+        transfer_project(private_project, user, internal_group)
+      end
 
       it { expect(private_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE) }
     end
diff --git a/spec/services/slash_commands/interpret_service_spec.rb b/spec/services/slash_commands/interpret_service_spec.rb
index 4db491fd5f3..c12fb1a6e53 100644
--- a/spec/services/slash_commands/interpret_service_spec.rb
+++ b/spec/services/slash_commands/interpret_service_spec.rb
@@ -378,7 +378,9 @@ describe SlashCommands::InterpretService, services: true do
     context 'assign command with multiple assignees' do
       let(:content) { "/assign @#{developer.username} @#{developer2.username}" }
 
-      before{ project.team << [developer2, :developer] }
+      before do
+        project.team << [developer2, :developer]
+      end
 
       context 'Issue' do
         it 'fetches assignee and populates assignee_id if content contains /assign' do
@@ -798,7 +800,11 @@ describe SlashCommands::InterpretService, services: true do
 
       context 'if the project has multiple boards' do
         let(:issuable) { issue }
-        before { create(:board, project: project) }
+
+        before do
+          create(:board, project: project)
+        end
+
         it_behaves_like 'empty command'
       end
 
diff --git a/spec/services/spam_service_spec.rb b/spec/services/spam_service_spec.rb
index 74cba8c014b..5e6e43b7a90 100644
--- a/spec/services/spam_service_spec.rb
+++ b/spec/services/spam_service_spec.rb
@@ -70,7 +70,9 @@ describe SpamService, services: true do
         end
 
         context 'when not indicated as spam by akismet' do
-          before { allow(AkismetService).to receive(:new).and_return(double(is_spam?: false)) }
+          before do
+            allow(AkismetService).to receive(:new).and_return(double(is_spam?: false))
+          end
 
           it 'returns false' do
             expect(check_spam(issue, request, false)).to be_falsey
diff --git a/spec/support/milestone_tabs_examples.rb b/spec/support/milestone_tabs_examples.rb
index 7cfc1e06975..70b499198bf 100644
--- a/spec/support/milestone_tabs_examples.rb
+++ b/spec/support/milestone_tabs_examples.rb
@@ -15,7 +15,9 @@ shared_examples 'milestone tabs' do
 
   describe '#merge_requests' do
     context 'as html' do
-      before { go(:merge_requests, format: 'html') }
+      before do
+        go(:merge_requests, format: 'html')
+      end
 
       it 'redirects to milestone#show' do
         expect(response).to redirect_to(milestone_path)
@@ -23,7 +25,9 @@ shared_examples 'milestone tabs' do
     end
 
     context 'as json' do
-      before { go(:merge_requests, format: 'json') }
+      before do
+        go(:merge_requests, format: 'json')
+      end
 
       it 'renders the merge requests tab template to a string' do
         expect(response).to render_template('shared/milestones/_merge_requests_tab')
@@ -34,7 +38,9 @@ shared_examples 'milestone tabs' do
 
   describe '#participants' do
     context 'as html' do
-      before { go(:participants, format: 'html') }
+      before do
+        go(:participants, format: 'html')
+      end
 
       it 'redirects to milestone#show' do
         expect(response).to redirect_to(milestone_path)
@@ -42,7 +48,9 @@ shared_examples 'milestone tabs' do
     end
 
     context 'as json' do
-      before { go(:participants, format: 'json') }
+      before do
+        go(:participants, format: 'json')
+      end
 
       it 'renders the participants tab template to a string' do
         expect(response).to render_template('shared/milestones/_participants_tab')
@@ -53,7 +61,9 @@ shared_examples 'milestone tabs' do
 
   describe '#labels' do
     context 'as html' do
-      before { go(:labels, format: 'html') }
+      before do
+        go(:labels, format: 'html')
+      end
 
       it 'redirects to milestone#show' do
         expect(response).to redirect_to(milestone_path)
@@ -61,7 +71,9 @@ shared_examples 'milestone tabs' do
     end
 
     context 'as json' do
-      before { go(:labels, format: 'json') }
+      before do
+        go(:labels, format: 'json')
+      end
 
       it 'renders the labels tab template to a string' do
         expect(response).to render_template('shared/milestones/_labels_tab')
diff --git a/spec/support/reference_parser_shared_examples.rb b/spec/support/reference_parser_shared_examples.rb
index 8eb74635a60..bd83cb88058 100644
--- a/spec/support/reference_parser_shared_examples.rb
+++ b/spec/support/reference_parser_shared_examples.rb
@@ -3,7 +3,9 @@ RSpec.shared_examples "referenced feature visibility" do |*related_features|
     related_features.map { |feature| (feature + "_access_level").to_sym }
   end
 
-  before { link['data-project'] = project.id.to_s }
+  before do
+    link['data-project'] = project.id.to_s
+  end
 
   context "when feature is disabled" do
     it "does not create reference" do
@@ -13,7 +15,9 @@ RSpec.shared_examples "referenced feature visibility" do |*related_features|
   end
 
   context "when feature is enabled only for team members" do
-    before { set_features_fields_to(ProjectFeature::PRIVATE) }
+    before do
+      set_features_fields_to(ProjectFeature::PRIVATE)
+    end
 
     it "does not create reference for non member" do
       non_member = create(:user)
diff --git a/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb b/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
index 1dd3663b944..5e6f9f323a1 100644
--- a/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
+++ b/spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
@@ -11,7 +11,9 @@ shared_examples 'new issuable record that supports slash commands' do
   let(:params) { base_params.merge(defined?(default_params) ? default_params : {}).merge(example_params) }
   let(:issuable) { described_class.new(project, user, params).execute }
 
-  before { project.team << [assignee, :master] }
+  before do
+    project.team << [assignee, :master]
+  end
 
   context 'with labels in command only' do
     let(:example_params) do
diff --git a/spec/support/services/issuable_update_service_shared_examples.rb b/spec/support/services/issuable_update_service_shared_examples.rb
index 8947f20562f..ffbce6c42bf 100644
--- a/spec/support/services/issuable_update_service_shared_examples.rb
+++ b/spec/support/services/issuable_update_service_shared_examples.rb
@@ -4,7 +4,9 @@ shared_examples 'issuable update service' do
   end
 
   context 'changing state' do
-    before { expect(project).to receive(:execute_hooks).once }
+    before do
+      expect(project).to receive(:execute_hooks).once
+    end
 
     context 'to reopened' do
       it 'executes hooks only once' do
diff --git a/spec/support/slack_mattermost_notifications_shared_examples.rb b/spec/support/slack_mattermost_notifications_shared_examples.rb
index 7e35ebb6c97..a7deb038703 100644
--- a/spec/support/slack_mattermost_notifications_shared_examples.rb
+++ b/spec/support/slack_mattermost_notifications_shared_examples.rb
@@ -11,14 +11,18 @@ RSpec.shared_examples 'slack or mattermost notifications' do
 
   describe 'Validations' do
     context 'when service is active' do
-      before { subject.active = true }
+      before do
+        subject.active = true
+      end
 
       it { is_expected.to validate_presence_of(:webhook) }
       it_behaves_like 'issue tracker service URL attribute', :webhook
     end
 
     context 'when service is inactive' do
-      before { subject.active = false }
+      before do
+        subject.active = false
+      end
 
       it { is_expected.not_to validate_presence_of(:webhook) }
     end
diff --git a/spec/support/unique_ip_check_shared_examples.rb b/spec/support/unique_ip_check_shared_examples.rb
index 7cf5a65eeed..1986d202c4a 100644
--- a/spec/support/unique_ip_check_shared_examples.rb
+++ b/spec/support/unique_ip_check_shared_examples.rb
@@ -31,7 +31,9 @@ end
 
 shared_examples 'user login operation with unique ip limit' do
   include_context 'unique ips sign in limit' do
-    before { current_application_settings.update!(unique_ips_limit_per_user: 1) }
+    before do
+      current_application_settings.update!(unique_ips_limit_per_user: 1)
+    end
 
     it 'allows user authenticating from the same ip' do
       expect { operation_from_ip('ip') }.not_to raise_error
@@ -47,7 +49,9 @@ end
 
 shared_examples 'user login request with unique ip limit' do |success_status = 200|
   include_context 'unique ips sign in limit' do
-    before { current_application_settings.update!(unique_ips_limit_per_user: 1) }
+    before do
+      current_application_settings.update!(unique_ips_limit_per_user: 1)
+    end
 
     it 'allows user authenticating from the same ip' do
       expect(request_from_ip('ip')).to have_http_status(success_status)
diff --git a/spec/support/updating_mentions_shared_examples.rb b/spec/support/updating_mentions_shared_examples.rb
index e0c59a5c280..eeec3e1d79b 100644
--- a/spec/support/updating_mentions_shared_examples.rb
+++ b/spec/support/updating_mentions_shared_examples.rb
@@ -2,7 +2,9 @@ RSpec.shared_examples 'updating mentions' do |service_class|
   let(:mentioned_user) { create(:user) }
   let(:service_class) { service_class }
 
-  before { project.team << [mentioned_user, :developer] }
+  before do
+    project.team << [mentioned_user, :developer]
+  end
 
   def update_mentionable(opts)
     reset_delivered_emails!
@@ -15,7 +17,9 @@ RSpec.shared_examples 'updating mentions' do |service_class|
   end
 
   context 'in title' do
-    before { update_mentionable(title: mentioned_user.to_reference) }
+    before do
+      update_mentionable(title: mentioned_user.to_reference)
+    end
 
     it 'emails only the newly-mentioned user' do
       should_only_email(mentioned_user)
@@ -23,7 +27,9 @@ RSpec.shared_examples 'updating mentions' do |service_class|
   end
 
   context 'in description' do
-    before { update_mentionable(description: mentioned_user.to_reference) }
+    before do
+      update_mentionable(description: mentioned_user.to_reference)
+    end
 
     it 'emails only the newly-mentioned user' do
       should_only_email(mentioned_user)
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
index a0ed85cc0b3..5b6b38e0f76 100644
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -71,7 +71,9 @@ describe EmailsOnPushWorker do
     end
 
     context "when there are no errors in sending" do
-      before { perform }
+      before do
+        perform
+      end
 
       it "sends a mail with the correct subject" do
         expect(email.subject).to include('adds bar folder and branch-test text file')
diff --git a/spec/workers/expire_build_artifacts_worker_spec.rb b/spec/workers/expire_build_artifacts_worker_spec.rb
index 73cbadc13d9..b47b4a02a68 100644
--- a/spec/workers/expire_build_artifacts_worker_spec.rb
+++ b/spec/workers/expire_build_artifacts_worker_spec.rb
@@ -5,10 +5,14 @@ describe ExpireBuildArtifactsWorker do
 
   let(:worker) { described_class.new }
 
-  before { Sidekiq::Worker.clear_all }
+  before do
+    Sidekiq::Worker.clear_all
+  end
 
   describe '#perform' do
-    before { build }
+    before do
+      build
+    end
 
     subject! do
       Sidekiq::Testing.fake! { worker.perform }
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index 8c5303b61cc..f443bb2c9b4 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -23,7 +23,9 @@ describe GitGarbageCollectWorker do
     end
 
     shared_examples 'gc tasks' do
-      before { allow(subject).to receive(:bitmaps_enabled?).and_return(bitmaps_enabled) }
+      before do
+        allow(subject).to receive(:bitmaps_enabled?).and_return(bitmaps_enabled)
+      end
 
       it 'incremental repack adds a new packfile' do
         create_objects(project)
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 44163c735ba..3c93da63f2e 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -89,7 +89,9 @@ describe PostReceive do
       end
 
       context "does not create a Ci::Pipeline" do
-        before { stub_ci_pipeline_yaml_file(nil) }
+        before do
+          stub_ci_pipeline_yaml_file(nil)
+        end
 
         it { expect{ subject }.not_to change{ Ci::Pipeline.count } }
       end
diff --git a/spec/workers/stuck_ci_jobs_worker_spec.rb b/spec/workers/stuck_ci_jobs_worker_spec.rb
index 8434b0c8e5b..549635f7f33 100644
--- a/spec/workers/stuck_ci_jobs_worker_spec.rb
+++ b/spec/workers/stuck_ci_jobs_worker_spec.rb
@@ -34,7 +34,9 @@ describe StuckCiJobsWorker do
     let(:status) { 'pending' }
 
     context 'when job is not stuck' do
-      before { allow_any_instance_of(Ci::Build).to receive(:stuck?).and_return(false) }
+      before do
+        allow_any_instance_of(Ci::Build).to receive(:stuck?).and_return(false)
+      end
 
       context 'when job was not updated for more than 1 day ago' do
         let(:updated_at) { 2.days.ago }
@@ -53,7 +55,9 @@ describe StuckCiJobsWorker do
     end
 
     context 'when job is stuck' do
-      before { allow_any_instance_of(Ci::Build).to receive(:stuck?).and_return(true) }
+      before do
+        allow_any_instance_of(Ci::Build).to receive(:stuck?).and_return(true)
+      end
 
       context 'when job was not updated for more than 1 hour ago' do
         let(:updated_at) { 2.hours.ago }
@@ -93,7 +97,9 @@ describe StuckCiJobsWorker do
     let(:status) { 'running' }
     let(:updated_at) { 2.days.ago }
 
-    before { job.project.update(pending_delete: true) }
+    before do
+      job.project.update(pending_delete: true)
+    end
 
     it 'does not drop job' do
       expect_any_instance_of(Ci::Build).not_to receive(:drop)
-- 
cgit v1.2.3