diff options
author | Miranda Fluharty <mfluharty@gitlab.com> | 2019-03-07 09:38:39 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-07 09:38:39 +0000 |
commit | fcd2358530ae67a50b506d864891febfff93810a (patch) | |
tree | c989d9828e1ca3dd77b861eed0bc8834f1761636 /spec/features/projects/environments | |
parent | 57b5413893490ad6f3ef93a635f052ee3c50dcc6 (diff) | |
download | gitlab-ce-fcd2358530ae67a50b506d864891febfff93810a.tar.gz |
Use gitlab-ci job name in environment dropdown
Use plain job name in the "Deploy to..." dropdown
Both in the old haml template and in the new vue component
Diffstat (limited to 'spec/features/projects/environments')
-rw-r--r-- | spec/features/projects/environments/environment_spec.rb | 6 | ||||
-rw-r--r-- | spec/features/projects/environments/environments_spec.rb | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb index a8a3b6910fb..3090f1a2131 100644 --- a/spec/features/projects/environments/environment_spec.rb +++ b/spec/features/projects/environments/environment_spec.rb @@ -120,7 +120,7 @@ describe 'Environment' do end it 'does show a play button' do - expect(page).to have_link(action.name.humanize) + expect(page).to have_link(action.name) end it 'does allow to play manual action', :js do @@ -128,7 +128,7 @@ describe 'Environment' do find('button.dropdown').click - expect { click_link(action.name.humanize) } + expect { click_link(action.name) } .not_to change { Ci::Pipeline.count } wait_for_all_requests @@ -140,7 +140,7 @@ describe 'Environment' do context 'when user has no ability to trigger a deployment' do it 'does not show a play button' do - expect(page).not_to have_link(action.name.humanize) + expect(page).not_to have_link(action.name) end end diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index 66c6545204b..b2a435e554d 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -183,14 +183,14 @@ describe 'Environments page', :js do it 'shows a play button' do find('.js-environment-actions-dropdown').click - expect(page).to have_content(action.name.humanize) + expect(page).to have_content(action.name) end it 'allows to play a manual action', :js do expect(action).to be_manual find('.js-environment-actions-dropdown').click - expect(page).to have_content(action.name.humanize) + expect(page).to have_content(action.name) expect { find('.js-manual-action-link').click } .not_to change { Ci::Pipeline.count } @@ -311,7 +311,7 @@ describe 'Environments page', :js do it "has link to the delayed job's action" do find('.js-environment-actions-dropdown').click - expect(page).to have_button('Delayed job') + expect(page).to have_button('delayed job') expect(page).to have_content(/\d{2}:\d{2}:\d{2}/) end @@ -333,7 +333,7 @@ describe 'Environments page', :js do context 'when user played a delayed job immediately' do before do find('.js-environment-actions-dropdown').click - page.accept_confirm { click_button('Delayed job') } + page.accept_confirm { click_button('delayed job') } wait_for_requests end |