Merge branch '211887-dedupe-jobs-ctrl-specs' into 'master'

De-duplicate jobs controller EE specs

See merge request gitlab-org/gitlab!27948

.rubocop.yml

@@ -202,7 +202,6 @@ GitlabSecurity/PublicSend:
 
 Gitlab/DuplicateSpecLocation:
   Exclude:
-    - ee/spec/controllers/projects/jobs_controller_spec.rb
     - ee/spec/helpers/auth_helper_spec.rb
     - ee/spec/lib/gitlab/gl_repository_spec.rb
     - ee/spec/lib/gitlab/usage_data_spec.rb
@@ -214,7 +213,6 @@ Gitlab/DuplicateSpecLocation:
     - ee/spec/services/merge_requests/refresh_service_spec.rb
     - ee/spec/services/merge_requests/update_service_spec.rb
     - ee/spec/services/system_hooks_service_spec.rb
-    - ee/spec/controllers/ee/projects/jobs_controller_spec.rb
     - ee/spec/helpers/ee/auth_helper_spec.rb
     - ee/spec/lib/ee/gitlab/gl_repository_spec.rb
     - ee/spec/lib/ee/gitlab/usage_data_spec.rb

ee/spec/controllers/ee/projects/jobs_controller_spec.rb

@@ -157,6 +157,124 @@ describe Projects::JobsController do
     end
   end
 
+  describe 'GET #show', :clean_gitlab_redis_shared_state do
+    context 'when requesting JSON' do
+      context 'with shared runner that has quota' do
+        let(:project) { create(:project, :private, shared_runners_enabled: true) }
+        let(:merge_request) { create(:merge_request, source_project: project) }
+        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
+        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
+
+        before do
+          project.add_developer(user)
+          sign_in(user)
+
+          allow_next_instance_of(Ci::Build) do |instance|
+            allow(instance).to receive(:merge_request).and_return(merge_request)
+          end
+
+          stub_application_setting(shared_runners_minutes: 2)
+
+          get_show(id: job.id, format: :json)
+        end
+
+        it 'exposes quota information' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to match_response_schema('job/job_details', dir: 'ee')
+          expect(json_response['runners']['quota']['used']).to eq 0
+          expect(json_response['runners']['quota']['limit']).to eq 2
+        end
+      end
+
+      context 'with shared runner quota exceeded' do
+        let(:group) { create(:group, :with_used_build_minutes_limit) }
+        let(:project) { create(:project, :repository, namespace: group, shared_runners_enabled: true) }
+        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
+        let(:pipeline) { create(:ci_pipeline, project: project) }
+        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
+
+        before do
+          project.add_developer(user)
+          sign_in(user)
+
+          get_show(id: job.id, format: :json)
+        end
+
+        it 'exposes quota information' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to match_response_schema('job/job_details', dir: 'ee')
+          expect(json_response['runners']['quota']['used']).to eq 1000
+          expect(json_response['runners']['quota']['limit']).to eq 500
+        end
+      end
+
+      context 'when shared runner has no quota' do
+        let(:project) { create(:project, :private, shared_runners_enabled: true) }
+        let(:merge_request) { create(:merge_request, source_project: project) }
+        let(:pipeline) { create(:ci_pipeline, project: project) }
+        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
+        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
+
+        before do
+          project.add_developer(user)
+          sign_in(user)
+
+          allow_next_instance_of(Ci::Build) do |instance|
+            allow(instance).to receive(:merge_request).and_return(merge_request)
+          end
+
+          stub_application_setting(shared_runners_minutes: 0)
+
+          get_show(id: job.id, format: :json)
+        end
+
+        it 'does not exposes quota information' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to match_response_schema('job/job_details', dir: 'ee')
+          expect(json_response['runners']).not_to have_key('quota')
+        end
+      end
+
+      context 'when project is public' do
+        let(:project) { create(:project, :public, shared_runners_enabled: true) }
+        let(:merge_request) { create(:merge_request, source_project: project) }
+        let(:pipeline) { create(:ci_pipeline, project: project) }
+        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
+        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
+
+        before do
+          project.add_developer(user)
+          sign_in(user)
+
+          allow_next_instance_of(Ci::Build) do |instance|
+            allow(instance).to receive(:merge_request).and_return(merge_request)
+          end
+
+          stub_application_setting(shared_runners_minutes: 2)
+
+          get_show(id: job.id, format: :json)
+        end
+
+        it 'does not exposes quota information' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to match_response_schema('job/job_details', dir: 'ee')
+          expect(json_response['runners']).not_to have_key('quota')
+        end
+      end
+    end
+
+    private
+
+    def get_show(**extra_params)
+      params = {
+          namespace_id: project.namespace.to_param,
+          project_id: project
+      }
+
+      get :show, params: params.merge(extra_params)
+    end
+  end
+
   describe 'GET #proxy_websocket_authorize' do
     let(:path) { :proxy_websocket_authorize }
     let(:render_method) { :channel_websocket }

ee/spec/controllers/projects/jobs_controller_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Projects::JobsController, :clean_gitlab_redis_shared_state do
-  include ApiHelpers
-  include HttpIOHelpers
-
-  let(:user) { create(:user) }
-
-  before do
-    stub_not_protect_default_branch
-  end
-
-  describe 'GET show' do
-    context 'when requesting JSON' do
-      context 'with shared runner that has quota' do
-        let(:project) { create(:project, :private, shared_runners_enabled: true) }
-        let(:merge_request) { create(:merge_request, source_project: project) }
-        let(:pipeline) { create(:ci_pipeline, project: project) }
-        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
-        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
-
-        before do
-          project.add_developer(user)
-          sign_in(user)
-
-          allow_next_instance_of(Ci::Build) do |instance|
-            allow(instance).to receive(:merge_request).and_return(merge_request)
-          end
-
-          stub_application_setting(shared_runners_minutes: 2)
-
-          get_show(id: job.id, format: :json)
-        end
-
-        it 'exposes quota information' do
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response).to match_response_schema('job/job_details', dir: 'ee')
-          expect(json_response['runners']['quota']['used']).to eq 0
-          expect(json_response['runners']['quota']['limit']).to eq 2
-        end
-      end
-
-      context 'with shared runner quota exceeded' do
-        let(:group) { create(:group, :with_used_build_minutes_limit) }
-        let(:project) { create(:project, :repository, namespace: group, shared_runners_enabled: true) }
-        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
-        let(:pipeline) { create(:ci_pipeline, project: project) }
-        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
-
-        before do
-          project.add_developer(user)
-          sign_in(user)
-
-          get_show(id: job.id, format: :json)
-        end
-
-        it 'exposes quota information' do
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response).to match_response_schema('job/job_details', dir: 'ee')
-          expect(json_response['runners']['quota']['used']).to eq 1000
-          expect(json_response['runners']['quota']['limit']).to eq 500
-        end
-      end
-
-      context 'when shared runner has no quota' do
-        let(:project) { create(:project, :private, shared_runners_enabled: true) }
-        let(:merge_request) { create(:merge_request, source_project: project) }
-        let(:pipeline) { create(:ci_pipeline, project: project) }
-        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
-        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
-
-        before do
-          project.add_developer(user)
-          sign_in(user)
-
-          allow_next_instance_of(Ci::Build) do |instance|
-            allow(instance).to receive(:merge_request).and_return(merge_request)
-          end
-
-          stub_application_setting(shared_runners_minutes: 0)
-
-          get_show(id: job.id, format: :json)
-        end
-
-        it 'does not exposes quota information' do
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response).to match_response_schema('job/job_details', dir: 'ee')
-          expect(json_response['runners']).not_to have_key('quota')
-        end
-      end
-
-      context 'when project is public' do
-        let(:project) { create(:project, :public, shared_runners_enabled: true) }
-        let(:merge_request) { create(:merge_request, source_project: project) }
-        let(:pipeline) { create(:ci_pipeline, project: project) }
-        let(:runner) { create(:ci_runner, :instance, description: 'Shared runner') }
-        let(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline, runner: runner) }
-
-        before do
-          project.add_developer(user)
-          sign_in(user)
-
-          allow_next_instance_of(Ci::Build) do |instance|
-            allow(instance).to receive(:merge_request).and_return(merge_request)
-          end
-
-          stub_application_setting(shared_runners_minutes: 2)
-
-          get_show(id: job.id, format: :json)
-        end
-
-        it 'does not exposes quota information' do
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response).to match_response_schema('job/job_details', dir: 'ee')
-          expect(json_response['runners']).not_to have_key('quota')
-        end
-      end
-    end
-
-    private
-
-    def get_show(**extra_params)
-      params = {
-          namespace_id: project.namespace.to_param,
-          project_id: project
-      }
-
-      get :show, params: params.merge(extra_params)
-    end
-  end
-end