Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 16 deletions

diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index 32cd10d9805..f35d8af165e 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -9,11 +9,13 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
   let_it_be(:project) { create(:project, :repository, :public) }
 
   let_it_be(:pipeline, reload: true) do
-    create(:ci_pipeline,
-            project: project,
-            sha: project.commit.sha,
-            ref: project.default_branch,
-            status: 'success')
+    create(
+      :ci_pipeline,
+      project: project,
+      sha: project.commit.sha,
+      ref: project.default_branch,
+      status: 'success'
+    )
   end
 
   let!(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
@@ -177,9 +179,10 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
           end
 
           it 'sends the codequality report' do
-            expect(controller).to receive(:send_file)
-                              .with(job.job_artifacts_codequality.file.path,
-                                    hash_including(disposition: 'attachment', filename: filename)).and_call_original
+            expect(controller).to receive(:send_file).with(
+              job.job_artifacts_codequality.file.path,
+              hash_including(disposition: 'attachment', filename: filename)
+            ).and_call_original
 
             download_artifact(file_type: file_type)
 
@@ -555,8 +558,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
 
       context 'with regular branch' do
         before do
-          pipeline.update!(ref: 'master',
-                           sha: project.commit('master').sha)
+          pipeline.update!(ref: 'master', sha: project.commit('master').sha)
 
           get :latest_succeeded, params: params_from_ref('master')
         end
@@ -566,8 +568,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
 
       context 'with branch name containing slash' do
         before do
-          pipeline.update!(ref: 'improve/awesome',
-                           sha: project.commit('improve/awesome').sha)
+          pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha)
 
           get :latest_succeeded, params: params_from_ref('improve/awesome')
         end
@@ -577,8 +578,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
 
       context 'with branch name and path containing slashes' do
         before do
-          pipeline.update!(ref: 'improve/awesome',
-                           sha: project.commit('improve/awesome').sha)
+          pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha)
 
           get :latest_succeeded, params: params_from_ref('improve/awesome', job.name, 'file/README.md')
         end
@@ -594,11 +594,13 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
         before do
           create_file_in_repo(project, 'master', 'master', 'test.txt', 'This is test')
 
-          create(:ci_pipeline,
+          create(
+            :ci_pipeline,
             project: project,
             sha: project.commit.sha,
             ref: project.default_branch,
-            status: 'failed')
+            status: 'failed'
+          )
 
           get :latest_succeeded, params: params_from_ref(project.default_branch)
         end