Add latest changes from gitlab-org/gitlab@master

3 files changed, 144 insertions, 0 deletions

diff --git a/spec/services/ci/update_pending_build_service_spec.rb b/spec/services/ci/update_pending_build_service_spec.rb
new file mode 100644
index 00000000000..d842042de40
--- /dev/null
+++ b/spec/services/ci/update_pending_build_service_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::UpdatePendingBuildService do
+  describe '#execute' do
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project) { create(:project, namespace: group) }
+    let_it_be(:pending_build_1) { create(:ci_pending_build, project: project, instance_runners_enabled: false) }
+    let_it_be(:pending_build_2) { create(:ci_pending_build, project: project, instance_runners_enabled: true) }
+    let_it_be(:update_params) { { instance_runners_enabled: true } }
+
+    subject(:service) { described_class.new(model, update_params).execute }
+
+    context 'validations' do
+      context 'when model is invalid' do
+        let(:model) { pending_build_1 }
+
+        it 'raises an error' do
+          expect { service }.to raise_error(described_class::InvalidModelError)
+        end
+      end
+
+      context 'when params is invalid' do
+        let(:model) { group }
+        let(:update_params) { { minutes_exceeded: true } }
+
+        it 'raises an error' do
+          expect { service }.to raise_error(described_class::InvalidParamsError)
+        end
+      end
+    end
+
+    context 'when model is a group with pending builds' do
+      let(:model) { group }
+
+      it 'updates all pending builds', :aggregate_failures do
+        service
+
+        expect(pending_build_1.reload.instance_runners_enabled).to be_truthy
+        expect(pending_build_2.reload.instance_runners_enabled).to be_truthy
+      end
+
+      context 'when ci_pending_builds_maintain_shared_runners_data is disabled' do
+        before do
+          stub_feature_flags(ci_pending_builds_maintain_shared_runners_data: false)
+        end
+
+        it 'does not update all pending builds', :aggregate_failures do
+          service
+
+          expect(pending_build_1.reload.instance_runners_enabled).to be_falsey
+          expect(pending_build_2.reload.instance_runners_enabled).to be_truthy
+        end
+      end
+    end
+
+    context 'when model is a project with pending builds' do
+      let(:model) { project }
+
+      it 'updates all pending builds', :aggregate_failures do
+        service
+
+        expect(pending_build_1.reload.instance_runners_enabled).to be_truthy
+        expect(pending_build_2.reload.instance_runners_enabled).to be_truthy
+      end
+
+      context 'when ci_pending_builds_maintain_shared_runners_data is disabled' do
+        before do
+          stub_feature_flags(ci_pending_builds_maintain_shared_runners_data: false)
+        end
+
+        it 'does not update all pending builds', :aggregate_failures do
+          service
+
+          expect(pending_build_1.reload.instance_runners_enabled).to be_falsey
+          expect(pending_build_2.reload.instance_runners_enabled).to be_truthy
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/groups/update_shared_runners_service_spec.rb b/spec/services/groups/update_shared_runners_service_spec.rb
index e941958eb8c..fe18277b5cd 100644
--- a/spec/services/groups/update_shared_runners_service_spec.rb
+++ b/spec/services/groups/update_shared_runners_service_spec.rb
@@ -55,6 +55,31 @@ RSpec.describe Groups::UpdateSharedRunnersService do
             expect(subject[:status]).to eq(:success)
           end
         end
+
+        context 'when group has pending builds' do
+          let_it_be(:group) { create(:group, :shared_runners_disabled) }
+          let_it_be(:project) { create(:project, namespace: group, shared_runners_enabled: false) }
+          let_it_be(:pending_build_1) { create(:ci_pending_build, project: project, instance_runners_enabled: false) }
+          let_it_be(:pending_build_2) { create(:ci_pending_build, project: project, instance_runners_enabled: false) }
+
+          it 'updates pending builds for the group' do
+            subject
+
+            expect(pending_build_1.reload.instance_runners_enabled).to be_truthy
+            expect(pending_build_2.reload.instance_runners_enabled).to be_truthy
+          end
+
+          context 'when shared runners is not toggled' do
+            let(:params) { { shared_runners_setting: 'invalid_enabled' } }
+
+            it 'does not update pending builds for the group' do
+              subject
+
+              expect(pending_build_1.reload.instance_runners_enabled).to be_falsey
+              expect(pending_build_2.reload.instance_runners_enabled).to be_falsey
+            end
+          end
+        end
       end
 
       context 'disable shared Runners' do
@@ -67,6 +92,19 @@ RSpec.describe Groups::UpdateSharedRunnersService do
 
           expect(subject[:status]).to eq(:success)
         end
+
+        context 'when group has pending builds' do
+          let_it_be(:project) { create(:project, namespace: group) }
+          let_it_be(:pending_build_1) { create(:ci_pending_build, project: project, instance_runners_enabled: true) }
+          let_it_be(:pending_build_2) { create(:ci_pending_build, project: project, instance_runners_enabled: true) }
+
+          it 'updates pending builds for the group' do
+            subject
+
+            expect(pending_build_1.reload.instance_runners_enabled).to be_falsey
+            expect(pending_build_2.reload.instance_runners_enabled).to be_falsey
+          end
+        end
       end
 
       context 'allow descendants to override' do
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index c74a8295d0a..115f3098185 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -441,6 +441,30 @@ RSpec.describe Projects::UpdateService do
       end
     end
 
+    context 'when updating #shared_runners', :https_pages_enabled do
+      let!(:pending_build) { create(:ci_pending_build, project: project, instance_runners_enabled: true) }
+
+      subject(:call_service) do
+        update_project(project, admin, shared_runners_enabled: shared_runners_enabled)
+      end
+
+      context 'when shared runners is toggled' do
+        let(:shared_runners_enabled) { false }
+
+        it 'updates ci pending builds' do
+          expect { call_service }.to change { pending_build.reload.instance_runners_enabled }.to(false)
+        end
+      end
+
+      context 'when shared runners is not toggled' do
+        let(:shared_runners_enabled) { true }
+
+        it 'updates ci pending builds' do
+          expect { call_service }.to not_change { pending_build.reload.instance_runners_enabled }
+        end
+      end
+    end
+
     context 'with external authorization enabled' do
       before do
         enable_external_authorization_service_check