Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 36 insertions, 13 deletions

diff --git a/spec/lib/gitlab/ci/status/build/waiting_for_approval_spec.rb b/spec/lib/gitlab/ci/status/build/waiting_for_approval_spec.rb
index b703a8a47ac..b79b78d911b 100644
--- a/spec/lib/gitlab/ci/status/build/waiting_for_approval_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/waiting_for_approval_spec.rb
@@ -5,22 +5,10 @@ require 'spec_helper'
 RSpec.describe Gitlab::Ci::Status::Build::WaitingForApproval do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
+  let_it_be(:build) { create(:ci_build, :manual, environment: 'production', project: project) }
 
   subject { described_class.new(Gitlab::Ci::Status::Core.new(build, user)) }
 
-  describe '#illustration' do
-    let(:build) { create(:ci_build, :manual, environment: 'production', project: project) }
-
-    before do
-      environment = create(:environment, name: 'production', project: project)
-      create(:deployment, :blocked, project: project, environment: environment, deployable: build)
-    end
-
-    it { expect(subject.illustration).to include(:image, :size) }
-    it { expect(subject.illustration[:title]).to eq('Waiting for approval') }
-    it { expect(subject.illustration[:content]).to include('This job deploys to the protected environment "production"') }
-  end
-
   describe '.matches?' do
     subject { described_class.matches?(build, user) }
 
@@ -46,4 +34,39 @@ RSpec.describe Gitlab::Ci::Status::Build::WaitingForApproval do
       end
     end
   end
+
+  describe '#illustration' do
+    before do
+      environment = create(:environment, name: 'production', project: project)
+      create(:deployment, :blocked, project: project, environment: environment, deployable: build)
+    end
+
+    it { expect(subject.illustration).to include(:image, :size) }
+    it { expect(subject.illustration[:title]).to eq('Waiting for approval') }
+    it { expect(subject.illustration[:content]).to include('This job deploys to the protected environment "production"') }
+  end
+
+  describe '#has_action?' do
+    it { expect(subject.has_action?).to be_truthy }
+  end
+
+  describe '#action_icon' do
+    it { expect(subject.action_icon).to be_nil }
+  end
+
+  describe '#action_title' do
+    it { expect(subject.action_title).to be_nil }
+  end
+
+  describe '#action_button_title' do
+    it { expect(subject.action_button_title).to eq('Go to environments page to approve or reject') }
+  end
+
+  describe '#action_path' do
+    it { expect(subject.action_path).to include('environments') }
+  end
+
+  describe '#action_method' do
+    it { expect(subject.action_method).to eq(:get) }
+  end
 end