Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/environment_spec.rb b/spec/lib/gitlab/ci/config/entry/environment_spec.rb
index 36c26c8ee4f..3562706ff33 100644
--- a/spec/lib/gitlab/ci/config/entry/environment_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/environment_spec.rb
@@ -230,12 +230,12 @@ RSpec.describe Gitlab::Ci::Config::Entry::Environment do
       end
     end
 
-    context 'when auto_stop_in is invalid format' do
-      let(:auto_stop_in) { 'invalid' }
+    context 'when variables are used for auto_stop_in' do
+      let(:auto_stop_in) { '$TTL' }
 
-      it 'becomes invalid' do
-        expect(entry).not_to be_valid
-        expect(entry.errors).to include 'environment auto stop in should be a duration'
+      it 'becomes valid' do
+        expect(entry).to be_valid
+        expect(entry.auto_stop_in).to eq(auto_stop_in)
       end
     end
   end