5 files changed, 43 insertions, 13 deletions
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