Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/services/deployments/after_create_service_spec.rb b/spec/services/deployments/after_create_service_spec.rb
index 94532ed81ae..4ca96658db0 100644
--- a/spec/services/deployments/after_create_service_spec.rb
+++ b/spec/services/deployments/after_create_service_spec.rb
@@ -115,6 +115,21 @@ describe Deployments::AfterCreateService do
         expect(subject.environment.external_url).to eq('http://master.review-apps.gitlab.com')
       end
     end
+
+    context 'when auto_stop_in are used' do
+      let(:options) do
+        { name: 'production', auto_stop_in: '1 day' }
+      end
+
+      it 'renews auto stop at' do
+        Timecop.freeze do
+          environment.update!(auto_stop_at: nil)
+
+          expect { subject.execute }
+            .to change { environment.reset.auto_stop_at&.round }.from(nil).to(1.day.since.round)
+        end
+      end
+    end
   end
 
   describe '#expanded_environment_url' do