Correct RSpec/SingleLineHook cop offenses

42 files changed, 388 insertions, 124 deletions

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 [