diff options
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_requests/created_from_fork_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/projects/commit/builds_spec.rb | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb index 73c5ef31edc..142649297cc 100644 --- a/spec/features/merge_requests/created_from_fork_spec.rb +++ b/spec/features/merge_requests/created_from_fork_spec.rb @@ -54,14 +54,14 @@ feature 'Merge request created from fork' do scenario 'user visits a pipelines page', js: true do visit_merge_request(merge_request) - page.within('.merge-request-tabs') { click_link 'Pipelines' } + page.within('.merge-request-tabs') { click_link 'Builds' } page.within('table.ci-table') do - expect(page).to have_content pipeline.status - expect(page).to have_content pipeline.id + expect(page).to have_content 'rspec' + expect(page).to have_content 'spinach' end - expect(page.find('a.btn-remove')[:href]) + expect(find_link('Cancel running')[:href]) .to include fork_project.path_with_namespace end end diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb index 33f1c323af1..fcdf7870f34 100644 --- a/spec/features/projects/commit/builds_spec.rb +++ b/spec/features/projects/commit/builds_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'project commit pipelines' do +feature 'project commit builds' do given(:project) { create(:project) } background do @@ -16,13 +16,11 @@ feature 'project commit pipelines' do ref: 'master') end - scenario 'user views commit pipelines page' do - visit pipelines_namespace_project_commit_path(project.namespace, project, project.commit.sha) + scenario 'user views commit builds page' do + visit builds_namespace_project_commit_path(project.namespace, + project, project.commit.sha) - page.within('.table-holder') do - expect(page).to have_content project.pipelines[0].status # pipeline status - expect(page).to have_content project.pipelines[0].id # pipeline ids - end + expect(page).to have_content('Builds') end end end |