Merge branch '4635-unify-jobs-and-builds-sepc-ee' into 'master'

EE: Unify and split CE/EE for spec/requests/api/jobs_spec.rb

Closes #4635

See merge request gitlab-org/gitlab-ee!4321

spec/ee/spec/requests/api/jobs_spec.rb

+require 'spec_helper'
+
+describe API::Jobs do
+  set(:project) do
+    create(:project, :repository, public_builds: false)
+  end
+
+  set(:pipeline) do
+    create(:ci_empty_pipeline, project: project,
+                               sha: project.commit.id,
+                               ref: project.default_branch)
+  end
+
+  let!(:job) { create(:ci_build, :success, pipeline: pipeline) }
+
+  let(:user) { create(:user) }
+  let(:api_user) { user }
+  let(:reporter) { create(:project_member, :reporter, project: project).user }
+  let(:cross_project_pipeline_enabled) { true }
+  let(:object_storage_enabled) { true }
+
+  before do
+    stub_licensed_features(cross_project_pipelines: cross_project_pipeline_enabled,
+                           object_storage: object_storage_enabled)
+    project.add_developer(user)
+  end
+
+  describe 'GET /projects/:id/jobs/:job_id/artifacts' do
+    shared_examples 'downloads artifact' do
+      let(:download_headers) do
+        { 'Content-Transfer-Encoding' => 'binary',
+          'Content-Disposition' => 'attachment; filename=ci_build_artifacts.zip' }
+      end
+
+      it 'returns specific job artifacts' do
+        expect(response).to have_gitlab_http_status(200)
+        expect(response.headers).to include(download_headers)
+        expect(response.body).to match_file(job.artifacts_file.file.file)
+      end
+    end
+
+    context 'normal authentication' do
+      before do
+        stub_artifacts_object_storage
+      end
+
+      context 'when job with artifacts are stored remotely' do
+        let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: job) }
+
+        before do
+          job.reload
+
+          get api("/projects/#{project.id}/jobs/#{job.id}/artifacts", api_user)
+        end
+
+        it 'returns location redirect' do
+          expect(response).to have_gitlab_http_status(302)
+        end
+      end
+    end
+
+    context 'authorized by job_token' do
+      let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
+
+      before do
+        get api("/projects/#{project.id}/jobs/#{job.id}/artifacts"), job_token: job.token
+      end
+
+      context 'user is developer' do
+        let(:api_user) { user }
+
+        it_behaves_like 'downloads artifact'
+      end
+
+      context 'when anonymous user is accessing private artifacts' do
+        let(:api_user) { nil }
+
+        it 'hides artifacts and rejects request' do
+          expect(project).to be_private
+          expect(response).to have_gitlab_http_status(404)
+        end
+      end
+
+      context 'feature is disabled for EES' do
+        let(:api_user) { user }
+        let(:cross_project_pipeline_enabled) { false }
+
+        it 'disallows access to the artifacts' do
+          expect(response).to have_gitlab_http_status(404)
+        end
+      end
+    end
+  end
+
+  describe 'GET /projects/:id/artifacts/:ref_name/download?job=name' do
+    let(:api_user) { reporter }
+    let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
+
+    before do
+      stub_artifacts_object_storage(licensed: :skip)
+      job.success
+    end
+
+    def get_for_ref(ref = pipeline.ref, job_name = job.name)
+      get api("/projects/#{project.id}/jobs/artifacts/#{ref}/download", api_user), job: job_name
+    end
+
+    context 'find proper job' do
+      shared_examples 'a valid file' do
+        context 'when artifacts are stored remotely' do
+          let(:job) { create(:ci_build, pipeline: pipeline, user: api_user) }
+          let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: job) }
+
+          before do
+            job.reload
+
+            get api("/projects/#{project.id}/jobs/#{job.id}/artifacts", api_user)
+          end
+
+          it 'returns location redirect' do
+            expect(response).to have_gitlab_http_status(302)
+          end
+        end
+      end
+
+      context 'with regular branch' do
+        before do
+          pipeline.reload
+          pipeline.update(ref: 'master',
+                          sha: project.commit('master').sha)
+
+          get_for_ref('master')
+        end
+
+        it_behaves_like 'a valid file'
+      end
+
+      context 'with branch name containing slash' do
+        before do
+          pipeline.reload
+          pipeline.update(ref: 'improve/awesome',
+                          sha: project.commit('improve/awesome').sha)
+
+          get_for_ref('improve/awesome')
+        end
+
+        it_behaves_like 'a valid file'
+      end
+
+      context 'when using job_token to authenticate' do
+        before do
+          pipeline.reload
+          pipeline.update(ref: 'master',
+                          sha: project.commit('master').sha)
+
+          get api("/projects/#{project.id}/jobs/artifacts/master/download"), job: job.name, job_token: job.token
+        end
+
+        context 'when user is reporter' do
+          it_behaves_like 'a valid file'
+        end
+
+        context 'when user is admin, but not member' do
+          let(:api_user) { create(:admin) }
+          let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
+
+          it 'does not allow to see that artfiact is present' do
+            expect(response).to have_gitlab_http_status(404)
+          end
+        end
+      end
+    end
+  end
+end

spec/ee/spec/requests/api/v3/builds_spec.rb

+require 'spec_helper'
+
+describe API::V3::Builds do
+  set(:user) { create(:user) }
+  let(:api_user) { user }
+  set(:project) { create(:project, :repository, creator: user, public_builds: false) }
+  let!(:developer) { create(:project_member, :developer, user: user, project: project) }
+  let(:reporter) { create(:project_member, :reporter, project: project) }
+  let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id, ref: project.default_branch) }
+  let(:build) { create(:ci_build, pipeline: pipeline) }
+
+  before do
+    stub_artifacts_object_storage
+  end
+
+  describe 'GET /projects/:id/builds/:build_id/artifacts' do
+    before do
+      get v3_api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
+    end
+
+    context 'when job with artifacts are stored remotely' do
+      let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: build) }
+
+      it 'returns location redirect' do
+        get v3_api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
+
+        expect(response).to have_gitlab_http_status(302)
+      end
+    end
+  end
+
+  describe 'GET /projects/:id/artifacts/:ref_name/download?job=name' do
+    let(:api_user) { reporter.user }
+
+    before do
+      build.success
+    end
+
+    def path_for_ref(ref = pipeline.ref, job = build.name)
+      v3_api("/projects/#{project.id}/builds/artifacts/#{ref}/download?job=#{job}", api_user)
+    end
+
+    shared_examples 'a valid file' do
+      context 'when artifacts are stored remotely' do
+        let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: build) }
+
+        before do
+          build.reload
+
+          get v3_api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
+        end
+
+        it 'returns location redirect' do
+          expect(response).to have_gitlab_http_status(302)
+        end
+      end
+    end
+
+    context 'with regular branch' do
+      before do
+        pipeline.reload
+        pipeline.update(ref: 'master',
+                        sha: project.commit('master').sha)
+
+        get path_for_ref('master')
+      end
+
+      it_behaves_like 'a valid file'
+    end
+
+    context 'with branch name containing slash' do
+      before do
+        pipeline.reload
+        pipeline.update(ref: 'improve/awesome',
+                        sha: project.commit('improve/awesome').sha)
+
+        get path_for_ref('improve/awesome')
+      end
+
+      it_behaves_like 'a valid file'
+    end
+  end
+end

spec/requests/api/jobs_spec.rb

@@ -17,12 +17,8 @@ describe API::Jobs do
   let(:api_user) { user }
   let(:reporter) { create(:project_member, :reporter, project: project).user }
   let(:guest) { create(:project_member, :guest, project: project).user }
-  let(:cross_project_pipeline_enabled) { true }
-  let(:object_storage_enabled) { true }
 
   before do
-    stub_licensed_features(cross_project_pipelines: cross_project_pipeline_enabled,
-                           object_storage: object_storage_enabled)
     project.add_developer(user)
   end
 
@@ -30,8 +26,6 @@ describe API::Jobs do
     let(:query) { Hash.new }
 
     before do |example|
-      job
-
       unless example.metadata[:skip_before_request]
         get api("/projects/#{project.id}/jobs", api_user), query
       end
@@ -118,7 +112,6 @@ describe API::Jobs do
     let(:query) { Hash.new }
 
     before do
-      job
       get api("/projects/#{project.id}/pipelines/#{pipeline.id}/jobs", api_user), query
     end
 
@@ -321,10 +314,6 @@ describe API::Jobs do
     end
 
     context 'normal authentication' do
-      before do
-        stub_artifacts_object_storage
-      end
-
       context 'job with artifacts' do
         context 'when artifacts are stored locally' do
           let(:job) { create(:ci_build, :artifacts, pipeline: pipeline) }
@@ -346,21 +335,6 @@ describe API::Jobs do
           end
         end
 
-        context 'when artifacts are stored remotely' do
-          let(:job) { create(:ci_build, pipeline: pipeline) }
-          let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: job) }
-
-          before do
-            job.reload
-
-            get api("/projects/#{project.id}/jobs/#{job.id}/artifacts", api_user)
-          end
-
-          it 'returns location redirect' do
-            expect(response).to have_gitlab_http_status(302)
-          end
-        end
-
         it 'does not return job artifacts if not uploaded' do
           get api("/projects/#{project.id}/jobs/#{job.id}/artifacts", api_user)
 
@@ -368,38 +342,6 @@ describe API::Jobs do
         end
       end
     end
-
-    context 'authorized by job_token' do
-      let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
-
-      before do
-        get api("/projects/#{project.id}/jobs/#{job.id}/artifacts"), job_token: job.token
-      end
-
-      context 'user is developer' do
-        let(:api_user) { user }
-
-        it_behaves_like 'downloads artifact'
-      end
-
-      context 'when anonymous user is accessing private artifacts' do
-        let(:api_user) { nil }
-
-        it 'hides artifacts and rejects request' do
-          expect(project).to be_private
-          expect(response).to have_gitlab_http_status(404)
-        end
-      end
-
-      context 'feature is disabled for EES' do
-        let(:api_user) { user }
-        let(:cross_project_pipeline_enabled) { false }
-
-        it 'disallows access to the artifacts' do
-          expect(response).to have_gitlab_http_status(404)
-        end
-      end
-    end
   end
 
   describe 'GET /projects/:id/artifacts/:ref_name/download?job=name' do
@@ -407,7 +349,6 @@ describe API::Jobs do
     let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
 
     before do
-      stub_artifacts_object_storage(licensed: :skip)
       job.success
     end
 
@@ -474,21 +415,6 @@ describe API::Jobs do
           it { expect(response).to have_gitlab_http_status(200) }
           it { expect(response.headers).to include(download_headers) }
         end
-
-        context 'when artifacts are stored remotely' do
-          let(:job) { create(:ci_build, pipeline: pipeline, user: api_user) }
-          let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: job) }
-
-          before do
-            job.reload
-
-            get api("/projects/#{project.id}/jobs/#{job.id}/artifacts", api_user)
-          end
-
-          it 'returns location redirect' do
-            expect(response).to have_gitlab_http_status(302)
-          end
-        end
       end
 
       context 'with regular branch' do
@@ -516,29 +442,6 @@ describe API::Jobs do
 
         it_behaves_like 'a valid file'
       end
-
-      context 'when using job_token to authenticate' do
-        before do
-          pipeline.reload
-          pipeline.update(ref: 'master',
-                          sha: project.commit('master').sha)
-
-          get api("/projects/#{project.id}/jobs/artifacts/master/download"), job: job.name, job_token: job.token
-        end
-
-        context 'when user is reporter' do
-          it_behaves_like 'a valid file'
-        end
-
-        context 'when user is admin, but not member' do
-          let(:api_user) { create(:admin) }
-          let(:job) { create(:ci_build, :artifacts, pipeline: pipeline, user: api_user) }
-
-          it 'does not allow to see that artfiact is present' do
-            expect(response).to have_gitlab_http_status(404)
-          end
-        end
-      end
     end
   end
 

spec/requests/api/v3/builds_spec.rb

@@ -216,7 +216,6 @@ describe API::V3::Builds do
 
   describe 'GET /projects/:id/builds/:build_id/artifacts' do
     before do
-      stub_artifacts_object_storage
       get v3_api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
     end
 
@@ -238,17 +237,6 @@ describe API::V3::Builds do
         end
       end
 
-      context 'when artifacts are stored remotely' do
-        let(:build) { create(:ci_build, pipeline: pipeline) }
-        let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: build) }
-
-        it 'returns location redirect' do
-          get v3_api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
-
-          expect(response).to have_gitlab_http_status(302)
-        end
-      end
-
       context 'unauthorized user' do
         let(:api_user) { nil }
 
@@ -268,7 +256,6 @@ describe API::V3::Builds do
     let(:build) { create(:ci_build, :artifacts, pipeline: pipeline) }
 
     before do
-      stub_artifacts_object_storage
       build.success
     end
 
@@ -334,21 +321,6 @@ describe API::V3::Builds do
           it { expect(response).to have_gitlab_http_status(200) }
           it { expect(response.headers).to include(download_headers) }
         end
-
-        context 'when artifacts are stored remotely' do
-          let(:build) { create(:ci_build, pipeline: pipeline) }
-          let!(:artifact) { create(:ci_job_artifact, :archive, :remote_store, job: build) }
-
-          before do
-            build.reload
-
-            get v3_api("/projects/#{project.id}/builds/#{build.id}/artifacts", api_user)
-          end
-
-          it 'returns location redirect' do
-            expect(response).to have_gitlab_http_status(302)
-          end
-        end
       end
 
       context 'with regular branch' do