diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 15:12:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 15:12:28 +0000 |
commit | 98014c0c43c1b1114d17c5851cd6313a9011d3ab (patch) | |
tree | 405bb6fb3e3e1bbdad0be2e4de43e353db8aeebd /spec/features/merge_request | |
parent | 3f274363e9dc9a1be75edfcd3dd5adb64b1e8c29 (diff) | |
download | gitlab-ce-98014c0c43c1b1114d17c5851cd6313a9011d3ab.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-ee
Diffstat (limited to 'spec/features/merge_request')
-rw-r--r-- | spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb | 22 | ||||
-rw-r--r-- | spec/features/merge_request/user_sees_pipelines_spec.rb | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb index b77b3d69fc1..2a49109d360 100644 --- a/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb @@ -64,7 +64,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', it 'sees branch pipelines and detached merge request pipelines in correct order' do page.within('.ci-table') do expect(page).to have_selector('.ci-created', count: 2) - expect(first('[data-testid="pipeline-identifier"]')).to have_content("##{detached_merge_request_pipeline.id}") + expect(first('[data-testid="pipeline-url-link"]')).to have_content("##{detached_merge_request_pipeline.id}") end end @@ -101,16 +101,16 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', page.within('.ci-table') do expect(page).to have_selector('.ci-pending', count: 4) - expect(all('[data-testid="pipeline-identifier"]')[0]) + expect(all('[data-testid="pipeline-url-link"]')[0]) .to have_content("##{detached_merge_request_pipeline_2.id}") - expect(all('[data-testid="pipeline-identifier"]')[1]) + expect(all('[data-testid="pipeline-url-link"]')[1]) .to have_content("##{detached_merge_request_pipeline.id}") - expect(all('[data-testid="pipeline-identifier"]')[2]) + expect(all('[data-testid="pipeline-url-link"]')[2]) .to have_content("##{push_pipeline_2.id}") - expect(all('[data-testid="pipeline-identifier"]')[3]) + expect(all('[data-testid="pipeline-url-link"]')[3]) .to have_content("##{push_pipeline.id}") end end @@ -201,7 +201,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', it 'sees a branch pipeline in pipeline tab' do page.within('.ci-table') do expect(page).to have_selector('.ci-created', count: 1) - expect(first('[data-testid="pipeline-identifier"]')).to have_content("##{push_pipeline.id}") + expect(first('[data-testid="pipeline-url-link"]')).to have_content("##{push_pipeline.id}") end end @@ -252,7 +252,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', it 'sees branch pipelines and detached merge request pipelines in correct order' do page.within('.ci-table') do expect(page).to have_selector('.ci-pending', count: 2) - expect(first('[data-testid="pipeline-identifier"]')).to have_content("##{detached_merge_request_pipeline.id}") + expect(first('[data-testid="pipeline-url-link"]')).to have_content("##{detached_merge_request_pipeline.id}") end end @@ -295,16 +295,16 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', page.within('.ci-table') do expect(page).to have_selector('.ci-pending', count: 4) - expect(all('[data-testid="pipeline-identifier"]')[0]) + expect(all('[data-testid="pipeline-url-link"]')[0]) .to have_content("##{detached_merge_request_pipeline_2.id}") - expect(all('[data-testid="pipeline-identifier"]')[1]) + expect(all('[data-testid="pipeline-url-link"]')[1]) .to have_content("##{detached_merge_request_pipeline.id}") - expect(all('[data-testid="pipeline-identifier"]')[2]) + expect(all('[data-testid="pipeline-url-link"]')[2]) .to have_content("##{push_pipeline_2.id}") - expect(all('[data-testid="pipeline-identifier"]')[3]) + expect(all('[data-testid="pipeline-url-link"]')[3]) .to have_content("##{push_pipeline.id}") end end diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb index a356dd50898..266ae0d8c37 100644 --- a/spec/features/merge_request/user_sees_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_pipelines_spec.rb @@ -134,7 +134,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do create_merge_request_pipeline act_on_security_warning(action: 'Run pipeline') - check_pipeline(expected_project: parent_project, link_selector: 'pipeline-url-link') + check_pipeline(expected_project: parent_project) check_head_pipeline(expected_project: parent_project) end @@ -179,13 +179,13 @@ RSpec.describe 'Merge request > User sees pipelines', :js do click_button('Run pipeline') end - def check_pipeline(expected_project:, link_selector: 'commit-title') + def check_pipeline(expected_project:) page.within('.ci-table') do expect(page).to have_selector('.commit', count: 2) page.within(first('.commit')) do page.within('.pipeline-tags') do - expect(page.find("[data-testid=#{link_selector}]")[:href]).to include(expected_project.full_path) + expect(page.find('[data-testid="pipeline-url-link"]')[:href]).to include(expected_project.full_path) expect(page).to have_content('detached') end page.within('.pipeline-triggerer') do |