Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 1 deletions

diff --git a/spec/workers/build_success_worker_spec.rb b/spec/workers/build_success_worker_spec.rb
index 0583d79ed46..2456acef53f 100644
--- a/spec/workers/build_success_worker_spec.rb
+++ b/spec/workers/build_success_worker_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe BuildSuccessWorker do
 
     context 'when build exists' do
       context 'when the build will stop an environment' do
-        let!(:build) { create(:ci_build, :stop_review_app, environment: environment.name, project: environment.project) }
+        let!(:build) { create(:ci_build, :stop_review_app, environment: environment.name, project: environment.project, status: :success) }
         let(:environment) { create(:environment, state: :available) }
 
         it 'stops the environment' do
@@ -18,6 +18,33 @@ RSpec.describe BuildSuccessWorker do
 
           expect(environment.reload).to be_stopped
         end
+
+        context 'when the build fails' do
+          before do
+            build.update!(status: :failed)
+            environment.update!(state: :available)
+          end
+
+          it 'does not stop the environment' do
+            expect(environment).to be_available
+
+            stub_feature_flags(env_stopped_on_stop_success: true)
+
+            subject
+
+            expect(environment.reload).not_to be_stopped
+          end
+
+          it 'does stop the environment when feature flag is disabled' do
+            expect(environment).to be_available
+
+            stub_feature_flags(env_stopped_on_stop_success: false)
+
+            subject
+
+            expect(environment.reload).to be_stopped
+          end
+        end
       end
     end