Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

2 files changed, 32 insertions, 7 deletions

diff --git a/spec/lib/gitlab/ci/status/composite_spec.rb b/spec/lib/gitlab/ci/status/composite_spec.rb
index cceabc35e85..cbf0976c976 100644
--- a/spec/lib/gitlab/ci/status/composite_spec.rb
+++ b/spec/lib/gitlab/ci/status/composite_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Status::Composite do
+RSpec.describe Gitlab::Ci::Status::Composite, feature_category: :continuous_integration do
   let_it_be(:pipeline) { create(:ci_pipeline) }
 
   before_all do
@@ -15,6 +15,18 @@ RSpec.describe Gitlab::Ci::Status::Composite do
     end
   end
 
+  describe '.initialize' do
+    subject(:composite_status) { described_class.new(all_statuses) }
+
+    context 'when passing a single status' do
+      let(:all_statuses) { @statuses[:success] }
+
+      it 'raises ArgumentError' do
+        expect { composite_status }.to raise_error(ArgumentError, 'all_jobs needs to respond to `.pluck`')
+      end
+    end
+  end
+
   describe '#status' do
     using RSpec::Parameterized::TableSyntax
 
@@ -51,8 +63,8 @@ RSpec.describe Gitlab::Ci::Status::Composite do
         %i(created success pending)         | false | 'running'              | false
         %i(skipped success failed)          | false | 'failed'               | false
         %i(skipped success failed)          | true  | 'skipped'              | false
-        %i(success manual)                  | true  | 'pending'              | false
-        %i(success failed created)          | true  | 'pending'              | false
+        %i(success manual)                  | true  | 'manual'               | false
+        %i(success failed created)          | true  | 'running'              | false
       end
 
       with_them do
diff --git a/spec/lib/gitlab/ci/status/processable/waiting_for_resource_spec.rb b/spec/lib/gitlab/ci/status/processable/waiting_for_resource_spec.rb
index 26087fd771c..e1baa1097e4 100644
--- a/spec/lib/gitlab/ci/status/processable/waiting_for_resource_spec.rb
+++ b/spec/lib/gitlab/ci/status/processable/waiting_for_resource_spec.rb
@@ -2,12 +2,25 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Status::Processable::WaitingForResource do
+RSpec.describe Gitlab::Ci::Status::Processable::WaitingForResource, feature_category: :continuous_integration do
   let(:user) { create(:user) }
+  let(:processable) { create(:ci_build, :waiting_for_resource, :resource_group) }
 
-  subject do
-    processable = create(:ci_build, :waiting_for_resource, :resource_group)
-    described_class.new(Gitlab::Ci::Status::Core.new(processable, user))
+  subject { described_class.new(Gitlab::Ci::Status::Core.new(processable, user)) }
+
+  it 'fabricates status with correct details' do
+    expect(subject.has_action?).to eq false
+  end
+
+  context 'when resource is retained by a build' do
+    before do
+      processable.resource_group.assign_resource_to(create(:ci_build))
+    end
+
+    it 'fabricates status with correct details' do
+      expect(subject.has_action?).to eq true
+      expect(subject.action_path).to include 'jobs'
+    end
   end
 
   describe '#illustration' do