summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-04 22:30:55 +0000
committerRémy Coutable <remy@rymai.me>2017-04-04 22:30:55 +0000
commitced322c5f6de61c30794140a08fa45b612474850 (patch)
treeeacdbe9e2cd65537d5692a83b0aa79bbefe2481f
parentbf305c3d5875c8b248ef32dc5704d4647833172c (diff)
parent6910c908073732030ce4f7cf91545256428c2b5f (diff)
downloadgitlab-ce-ced322c5f6de61c30794140a08fa45b612474850.tar.gz
Merge branch 'backport-transient-failure-1567' into 'master'
Backport changes of ee fix for transient failure in environments spec See merge request !10459
-rw-r--r--spec/features/projects/environments/environments_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb
index 92a8abdca7b..cf393afccbb 100644
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
@@ -30,6 +30,7 @@ feature 'Environments page', :feature, :js do
describe 'in available tab page' do
it 'should show one environment' do
visit namespace_project_environments_path(project.namespace, project, scope: 'available')
+ expect(page).to have_css('.environments-container')
expect(page.all('tbody > tr').length).to eq(1)
end
end
@@ -37,6 +38,7 @@ feature 'Environments page', :feature, :js do
describe 'in stopped tab page' do
it 'should show no environments' do
visit namespace_project_environments_path(project.namespace, project, scope: 'stopped')
+ expect(page).to have_css('.environments-container')
expect(page).to have_content('You don\'t have any environments right now')
end
end
@@ -48,6 +50,7 @@ feature 'Environments page', :feature, :js do
describe 'in available tab page' do
it 'should show no environments' do
visit namespace_project_environments_path(project.namespace, project, scope: 'available')
+ expect(page).to have_css('.environments-container')
expect(page).to have_content('You don\'t have any environments right now')
end
end
@@ -55,6 +58,7 @@ feature 'Environments page', :feature, :js do
describe 'in stopped tab page' do
it 'should show one environment' do
visit namespace_project_environments_path(project.namespace, project, scope: 'stopped')
+ expect(page).to have_css('.environments-container')
expect(page.all('tbody > tr').length).to eq(1)
end
end