1 files changed, 48 insertions, 16 deletions

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) }