Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 13 insertions, 20 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb
index 9f7281fb714..51185be3e74 100644
--- a/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb
@@ -90,29 +90,22 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Deployment do
       end
     end
 
-    context 'when job has environment attribute with stop action' do
-      let(:attributes) do
-        {
-          environment: 'production',
-          options: { environment: { name: 'production', action: 'stop' } }
-        }
-      end
-
-      it 'returns nothing' do
-        is_expected.to be_nil
+    context 'when job does not start environment' do
+      where(:action) do
+        %w(stop prepare verify access)
       end
-    end
 
-    context 'when job has environment attribute with prepare action' do
-      let(:attributes) do
-        {
-          environment: 'production',
-          options: { environment: { name: 'production', action: 'prepare' } }
-        }
-      end
+      with_them do
+        let(:attributes) do
+          {
+            environment: 'production',
+            options: { environment: { name: 'production', action: action } }
+          }
+        end
 
-      it 'returns nothing' do
-        is_expected.to be_nil
+        it 'returns nothing' do
+          is_expected.to be_nil
+        end
       end
     end