Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

17 files changed, 46 insertions, 38 deletions

diff --git a/spec/lib/gitlab/ci/status/bridge/factory_spec.rb b/spec/lib/gitlab/ci/status/bridge/factory_spec.rb
index 040c3ec7f6e..ca1b00e2f5b 100644
--- a/spec/lib/gitlab/ci/status/bridge/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/bridge/factory_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Factory, feature_category: :continuou
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|created')
+      expect(status.text).to eq s_('CiStatusText|Created')
       expect(status.icon).to eq 'status_created'
       expect(status.favicon).to eq 'favicon_status_created'
       expect(status.label).to eq 'created'
@@ -49,11 +49,11 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Factory, feature_category: :continuou
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|failed')
+      expect(status.text).to eq s_('CiStatusText|Failed')
       expect(status.icon).to eq 'status_failed'
       expect(status.favicon).to eq 'favicon_status_failed'
       expect(status.label).to eq 'failed'
-      expect(status.status_tooltip).to eq "#{s_('CiStatusText|failed')} - (unknown failure)"
+      expect(status.status_tooltip).to eq "#{s_('CiStatusLabel|failed')} - (unknown failure)"
       expect(status).not_to have_details
       expect(status).to have_action
     end
@@ -67,7 +67,7 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Factory, feature_category: :continuou
 
       it 'fabricates correct status_tooltip' do
         expect(status.status_tooltip).to eq(
-          "#{s_('CiStatusText|failed')} - (downstream pipeline can not be created, Pipeline will not run for the selected trigger. " \
+          "#{s_('CiStatusLabel|failed')} - (downstream pipeline can not be created, Pipeline will not run for the selected trigger. " \
           "The rules configuration prevented any jobs from being added to the pipeline., other error)"
         )
       end
@@ -93,7 +93,7 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Factory, feature_category: :continuou
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|manual')
+      expect(status.text).to eq s_('CiStatusText|Manual')
       expect(status.group).to eq 'manual'
       expect(status.icon).to eq 'status_manual'
       expect(status.favicon).to eq 'favicon_status_manual'
@@ -128,7 +128,7 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Factory, feature_category: :continuou
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq 'waiting'
+      expect(status.text).to eq 'Waiting'
       expect(status.group).to eq 'waiting-for-resource'
       expect(status.icon).to eq 'status_pending'
       expect(status.favicon).to eq 'favicon_status_pending'
@@ -154,7 +154,7 @@ RSpec.describe Gitlab::Ci::Status::Bridge::Factory, feature_category: :continuou
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|passed')
+      expect(status.text).to eq s_('CiStatusText|Passed')
       expect(status.icon).to eq 'status_success'
       expect(status.favicon).to eq 'favicon_status_success'
       expect(status).to have_action
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index f71f3d47452..1d043966321 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|passed')
+      expect(status.text).to eq s_('CiStatusText|Passed')
       expect(status.icon).to eq 'status_success'
       expect(status.favicon).to eq 'favicon_status_success'
       expect(status.label).to eq s_('CiStatusLabel|passed')
@@ -58,7 +58,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|passed')
+      expect(status.text).to eq s_('CiStatusText|Passed')
       expect(status.icon).to eq 'status_success'
       expect(status.favicon).to eq 'favicon_status_success'
       expect(status.label).to eq s_('CiStatusLabel|passed')
@@ -86,11 +86,11 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
       end
 
       it 'fabricates status with correct details' do
-        expect(status.text).to eq s_('CiStatusText|failed')
+        expect(status.text).to eq s_('CiStatusText|Failed')
         expect(status.icon).to eq 'status_failed'
         expect(status.favicon).to eq 'favicon_status_failed'
         expect(status.label).to eq s_('CiStatusLabel|failed')
-        expect(status.status_tooltip).to eq "#{s_('CiStatusText|failed')} - (unknown failure)"
+        expect(status.status_tooltip).to eq "#{s_('CiStatusLabel|failed')} - (unknown failure)"
         expect(status).to have_details
         expect(status).to have_action
       end
@@ -115,7 +115,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
       end
 
       it 'fabricates status with correct details' do
-        expect(status.text).to eq s_('CiStatusText|failed')
+        expect(status.text).to eq s_('CiStatusText|Failed')
         expect(status.icon).to eq 'status_warning'
         expect(status.favicon).to eq 'favicon_status_failed'
         expect(status.label).to eq 'failed (allowed to fail)'
@@ -144,7 +144,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
       end
 
       it 'fabricates status with correct details' do
-        expect(status.text).to eq s_('CiStatusText|failed')
+        expect(status.text).to eq s_('CiStatusText|Failed')
         expect(status.icon).to eq 'status_failed'
         expect(status.favicon).to eq 'favicon_status_failed'
         expect(status.label).to eq s_('CiStatusLabel|failed')
@@ -173,7 +173,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|canceled')
+      expect(status.text).to eq s_('CiStatusText|Canceled')
       expect(status.icon).to eq 'status_canceled'
       expect(status.favicon).to eq 'favicon_status_canceled'
       expect(status.illustration).to include(:image, :size, :title)
@@ -200,10 +200,10 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatus|running')
+      expect(status.text).to eq s_('CiStatusText|Running')
       expect(status.icon).to eq 'status_running'
       expect(status.favicon).to eq 'favicon_status_running'
-      expect(status.label).to eq s_('CiStatus|running')
+      expect(status.label).to eq s_('CiStatusLabel|running')
       expect(status).to have_details
       expect(status).to have_action
     end
@@ -226,7 +226,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|pending')
+      expect(status.text).to eq s_('CiStatusText|Pending')
       expect(status.icon).to eq 'status_pending'
       expect(status.favicon).to eq 'favicon_status_pending'
       expect(status.illustration).to include(:image, :size, :title, :content)
@@ -252,7 +252,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|skipped')
+      expect(status.text).to eq s_('CiStatusText|Skipped')
       expect(status.icon).to eq 'status_skipped'
       expect(status.favicon).to eq 'favicon_status_skipped'
       expect(status.illustration).to include(:image, :size, :title)
@@ -282,7 +282,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
       end
 
       it 'fabricates status with correct details' do
-        expect(status.text).to eq s_('CiStatusText|manual')
+        expect(status.text).to eq s_('CiStatusText|Manual')
         expect(status.group).to eq 'manual'
         expect(status.icon).to eq 'status_manual'
         expect(status.favicon).to eq 'favicon_status_manual'
@@ -339,7 +339,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
         end
 
         it 'fabricates status with correct details' do
-          expect(status.text).to eq s_('CiStatusText|manual')
+          expect(status.text).to eq s_('CiStatusText|Manual')
           expect(status.group).to eq 'manual'
           expect(status.icon).to eq 'status_manual'
           expect(status.favicon).to eq 'favicon_status_manual'
@@ -370,7 +370,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Factory do
     end
 
     it 'fabricates status with correct details' do
-      expect(status.text).to eq s_('CiStatusText|scheduled')
+      expect(status.text).to eq s_('CiStatusText|Scheduled')
       expect(status.group).to eq 'scheduled'
       expect(status.icon).to eq 'status_scheduled'
       expect(status.favicon).to eq 'favicon_status_scheduled'
diff --git a/spec/lib/gitlab/ci/status/canceled_spec.rb b/spec/lib/gitlab/ci/status/canceled_spec.rb
index 7fae76f61ea..ddb8b7ecff9 100644
--- a/spec/lib/gitlab/ci/status/canceled_spec.rb
+++ b/spec/lib/gitlab/ci/status/canceled_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Canceled do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'canceled' }
+    it { expect(subject.text).to eq 'Canceled' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/created_spec.rb b/spec/lib/gitlab/ci/status/created_spec.rb
index 1e54d1ed8c5..19fecbb33b9 100644
--- a/spec/lib/gitlab/ci/status/created_spec.rb
+++ b/spec/lib/gitlab/ci/status/created_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Created do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'created' }
+    it { expect(subject.text).to eq 'Created' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/factory_spec.rb b/spec/lib/gitlab/ci/status/factory_spec.rb
index 94a6255f1e2..277b440a21d 100644
--- a/spec/lib/gitlab/ci/status/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/factory_spec.rb
@@ -74,7 +74,7 @@ RSpec.describe Gitlab::Ci::Status::Factory do
       end
 
       it 'delegates to core status' do
-        expect(fabricated_status.text).to eq 'passed'
+        expect(fabricated_status.text).to eq 'Passed'
       end
 
       it 'latest matches status becomes a status name' do
@@ -104,7 +104,7 @@ RSpec.describe Gitlab::Ci::Status::Factory do
       end
 
       it 'delegates to core status' do
-        expect(fabricated_status.text).to eq 'passed'
+        expect(fabricated_status.text).to eq 'Passed'
       end
 
       it 'matches correct core status' do
diff --git a/spec/lib/gitlab/ci/status/failed_spec.rb b/spec/lib/gitlab/ci/status/failed_spec.rb
index f3f3304b04d..48df3e99855 100644
--- a/spec/lib/gitlab/ci/status/failed_spec.rb
+++ b/spec/lib/gitlab/ci/status/failed_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Failed do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'failed' }
+    it { expect(subject.text).to eq 'Failed' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/manual_spec.rb b/spec/lib/gitlab/ci/status/manual_spec.rb
index a9203438898..6e02772f670 100644
--- a/spec/lib/gitlab/ci/status/manual_spec.rb
+++ b/spec/lib/gitlab/ci/status/manual_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Manual do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'manual' }
+    it { expect(subject.text).to eq 'Manual' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/pending_spec.rb b/spec/lib/gitlab/ci/status/pending_spec.rb
index 1c062a0133d..82ea987e4c9 100644
--- a/spec/lib/gitlab/ci/status/pending_spec.rb
+++ b/spec/lib/gitlab/ci/status/pending_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Pending do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'pending' }
+    it { expect(subject.text).to eq 'Pending' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/pipeline/blocked_spec.rb b/spec/lib/gitlab/ci/status/pipeline/blocked_spec.rb
index 8fd974972e4..8948d83f9cb 100644
--- a/spec/lib/gitlab/ci/status/pipeline/blocked_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/blocked_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Gitlab::Ci::Status::Pipeline::Blocked do
 
   describe '#text' do
     it 'overrides status text' do
-      expect(subject.text).to eq 'blocked'
+      expect(subject.text).to eq 'Blocked'
     end
   end
 
diff --git a/spec/lib/gitlab/ci/status/pipeline/delayed_spec.rb b/spec/lib/gitlab/ci/status/pipeline/delayed_spec.rb
index 1302c2069ff..072ea642e70 100644
--- a/spec/lib/gitlab/ci/status/pipeline/delayed_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/delayed_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Gitlab::Ci::Status::Pipeline::Delayed do
 
   describe '#text' do
     it 'overrides status text' do
-      expect(subject.text).to eq 'delayed'
+      expect(subject.text).to eq 'Delayed'
     end
   end
 
diff --git a/spec/lib/gitlab/ci/status/preparing_spec.rb b/spec/lib/gitlab/ci/status/preparing_spec.rb
index ec1850c1959..f9033bce5f2 100644
--- a/spec/lib/gitlab/ci/status/preparing_spec.rb
+++ b/spec/lib/gitlab/ci/status/preparing_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Preparing do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'preparing' }
+    it { expect(subject.text).to eq 'Preparing' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/running_spec.rb b/spec/lib/gitlab/ci/status/running_spec.rb
index e40d696ee4d..aefc7e90e85 100644
--- a/spec/lib/gitlab/ci/status/running_spec.rb
+++ b/spec/lib/gitlab/ci/status/running_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Running do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'running' }
+    it { expect(subject.text).to eq 'Running' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/scheduled_spec.rb b/spec/lib/gitlab/ci/status/scheduled_spec.rb
index df72455d3c1..1a8e48052ec 100644
--- a/spec/lib/gitlab/ci/status/scheduled_spec.rb
+++ b/spec/lib/gitlab/ci/status/scheduled_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Scheduled, feature_category: :continuous_inte
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'scheduled' }
+    it { expect(subject.text).to eq 'Scheduled' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/skipped_spec.rb b/spec/lib/gitlab/ci/status/skipped_spec.rb
index ac3c2f253f7..da674df2090 100644
--- a/spec/lib/gitlab/ci/status/skipped_spec.rb
+++ b/spec/lib/gitlab/ci/status/skipped_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Skipped do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'skipped' }
+    it { expect(subject.text).to eq 'Skipped' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/success_spec.rb b/spec/lib/gitlab/ci/status/success_spec.rb
index f2069334abd..c6567684ac0 100644
--- a/spec/lib/gitlab/ci/status/success_spec.rb
+++ b/spec/lib/gitlab/ci/status/success_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::Success do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'passed' }
+    it { expect(subject.text).to eq 'Passed' }
   end
 
   describe '#label' do
diff --git a/spec/lib/gitlab/ci/status/success_warning_spec.rb b/spec/lib/gitlab/ci/status/success_warning_spec.rb
index 1725f90a0cf..4a669da358e 100644
--- a/spec/lib/gitlab/ci/status/success_warning_spec.rb
+++ b/spec/lib/gitlab/ci/status/success_warning_spec.rb
@@ -9,8 +9,8 @@ RSpec.describe Gitlab::Ci::Status::SuccessWarning, feature_category: :continuous
     described_class.new(status)
   end
 
-  describe '#test' do
-    it { expect(subject.text).to eq 'warning' }
+  describe '#text' do
+    it { expect(subject.text).to eq 'Warning' }
   end
 
   describe '#label' do
@@ -25,6 +25,10 @@ RSpec.describe Gitlab::Ci::Status::SuccessWarning, feature_category: :continuous
     it { expect(subject.group).to eq 'success-with-warnings' }
   end
 
+  describe '#name' do
+    it { expect(subject.name).to eq 'SUCCESS_WITH_WARNINGS' }
+  end
+
   describe '.matches?' do
     let(:matchable) { double('matchable') }
 
diff --git a/spec/lib/gitlab/ci/status/waiting_for_resource_spec.rb b/spec/lib/gitlab/ci/status/waiting_for_resource_spec.rb
index 6f5ab77a358..bd9663fb80f 100644
--- a/spec/lib/gitlab/ci/status/waiting_for_resource_spec.rb
+++ b/spec/lib/gitlab/ci/status/waiting_for_resource_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Gitlab::Ci::Status::WaitingForResource do
   end
 
   describe '#text' do
-    it { expect(subject.text).to eq 'waiting' }
+    it { expect(subject.text).to eq 'Waiting' }
   end
 
   describe '#label' do
@@ -27,6 +27,10 @@ RSpec.describe Gitlab::Ci::Status::WaitingForResource do
     it { expect(subject.group).to eq 'waiting-for-resource' }
   end
 
+  describe '#name' do
+    it { expect(subject.name).to eq 'WAITING_FOR_RESOURCE' }
+  end
+
   describe '#details_path' do
     it { expect(subject.details_path).to be_nil }
   end