Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 2 deletions

diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index d7f12411a93..cee9b6d50ba 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -399,10 +399,12 @@ describe 'Environments page', :js do
 
   describe 'environments folders' do
     before do
-      create(:environment, project: project,
+      create(:environment, :will_auto_stop,
+                           project: project,
                            name: 'staging/review-1',
                            state: :available)
-      create(:environment, project: project,
+      create(:environment, :will_auto_stop,
+                           project: project,
                            name: 'staging/review-2',
                            state: :available)
     end
@@ -420,6 +422,14 @@ describe 'Environments page', :js do
 
       expect(page).to have_content 'review-1'
       expect(page).to have_content 'review-2'
+      within('.ci-table') do
+        within('.gl-responsive-table-row:nth-child(3)') do
+          expect(find('.js-auto-stop').text).not_to be_empty
+        end
+        within('.gl-responsive-table-row:nth-child(4)') do
+          expect(find('.js-auto-stop').text).not_to be_empty
+        end
+      end
     end
   end