Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/serializers/environment_entity_spec.rb b/spec/serializers/environment_entity_spec.rb
index b8910fd6eee..e4d1d7f9049 100644
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
@@ -62,4 +62,12 @@ describe EnvironmentEntity do
       end
     end
   end
+
+  context 'with auto_stop_in' do
+    let(:environment) { create(:environment, :will_auto_stop) }
+
+    it 'exposes auto stop related information' do
+      expect(subject).to include(:cancel_auto_stop_path, :auto_stop_at)
+    end
+  end
 end