diff options
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/commits_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/import_export/test_project_export.tar.gz | bin | 681774 -> 679415 bytes | |||
-rw-r--r-- | spec/features/projects/pipelines/pipeline_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/projects/services/slack_service_spec.rb | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb index 23a504ff965..8f561c8f90b 100644 --- a/spec/features/commits_spec.rb +++ b/spec/features/commits_spec.rb @@ -107,7 +107,7 @@ describe 'Commits' do describe 'Cancel build' do it 'cancels build' do visit ci_status_path(pipeline) - click_on 'Cancel' + find('a.btn[title="Cancel"]').click expect(page).to have_content 'canceled' end end diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz Binary files differindex bfe59bdb90e..d3165d07d7b 100644 --- a/spec/features/projects/import_export/test_project_export.tar.gz +++ b/spec/features/projects/import_export/test_project_export.tar.gz diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index 9d43d264bdf..0a77eaa123c 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -38,8 +38,8 @@ describe "Pipelines", feature: true, js: true do expect(page).to have_css('#js-tab-pipeline.active') end - context 'pipeline graph' do - context 'running build' do + describe 'pipeline graph' do + context 'when pipeline has running builds' do it 'shows a running icon and a cancel action for the running build' do page.within('a[data-title="deploy - running"]') do expect(page).to have_selector('.ci-status-icon-running') @@ -58,7 +58,7 @@ describe "Pipelines", feature: true, js: true do end end - context 'success build' do + context 'when pipeline has successful builds' do it 'shows the success icon and a retry action for the successfull build' do page.within('a[data-title="build - passed"]') do expect(page).to have_selector('.ci-status-icon-success') @@ -77,7 +77,7 @@ describe "Pipelines", feature: true, js: true do end end - context 'failed build' do + context 'when pipeline has failed builds' do it 'shows the failed icon and a retry action for the failed build' do page.within('a[data-title="test - failed"]') do expect(page).to have_selector('.ci-status-icon-failed') @@ -96,7 +96,7 @@ describe "Pipelines", feature: true, js: true do end end - context 'manual build' do + context 'when pipeline has manual builds' do it 'shows the skipped icon and a play action for the manual build' do page.within('a[data-title="manual build - manual play action"]') do expect(page).to have_selector('.ci-status-icon-skipped') @@ -115,7 +115,7 @@ describe "Pipelines", feature: true, js: true do end end - context 'external build' do + context 'when pipeline has external build' do it 'shows the success icon and the generic comit status build' do expect(page).to have_selector('.ci-status-icon-success') expect(page).to have_content('jenkins') diff --git a/spec/features/projects/services/slack_service_spec.rb b/spec/features/projects/services/slack_service_spec.rb index 16541f51d98..320ed13a01d 100644 --- a/spec/features/projects/services/slack_service_spec.rb +++ b/spec/features/projects/services/slack_service_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' feature 'Projects > Slack service > Setup events', feature: true do let(:user) { create(:user) } - let(:service) { SlackService.new } - let(:project) { create(:project, slack_service: service) } + let(:service) { SlackNotificationService.new } + let(:project) { create(:project, slack_notification_service: service) } background do service.fields |