diff options
Diffstat (limited to 'spec/features/merge_request')
16 files changed, 196 insertions, 100 deletions
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb index 25f2707146d..19680a827bf 100644 --- a/spec/features/merge_request/batch_comments_spec.rb +++ b/spec/features/merge_request/batch_comments_spec.rb @@ -28,7 +28,7 @@ RSpec.describe 'Merge request > Batch comments', :js do end it 'adds draft note' do - write_comment + write_diff_comment expect(find('.draft-note-component')).to have_content('Line is wrong') @@ -38,7 +38,7 @@ RSpec.describe 'Merge request > Batch comments', :js do end it 'publishes review' do - write_comment + write_diff_comment page.within('.review-bar-content') do click_button 'Submit review' @@ -52,7 +52,7 @@ RSpec.describe 'Merge request > Batch comments', :js do end it 'publishes single comment' do - write_comment + write_diff_comment click_button 'Add comment now' @@ -64,7 +64,7 @@ RSpec.describe 'Merge request > Batch comments', :js do end it 'deletes draft note' do - write_comment + write_diff_comment accept_alert { find('.js-note-delete').click } @@ -74,21 +74,70 @@ RSpec.describe 'Merge request > Batch comments', :js do end it 'edits draft note' do - write_comment + write_diff_comment find('.js-note-edit').click # make sure comment form is in view execute_script("window.scrollBy(0, 200)") - page.within('.js-discussion-note-form') do - fill_in('note_note', with: 'Testing update') - click_button('Save comment') + write_comment(text: 'Testing update', button_text: 'Save comment') + + expect(page).to have_selector('.draft-note-component', text: 'Testing update') + end + + context 'with image and file draft note' do + let(:merge_request) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project) } + let!(:draft_on_text) { create(:draft_note_on_text_diff, merge_request: merge_request, author: user, path: 'README.md', note: 'Lorem ipsum on text...') } + let!(:draft_on_image) { create(:draft_note_on_image_diff, merge_request: merge_request, author: user, path: 'files/images/ee_repo_logo.png', note: 'Lorem ipsum on an image...') } + + it 'does not show in overview' do + visit_overview + + expect(page).to have_no_text(draft_on_text.note) + expect(page).to have_no_text(draft_on_image.note) end + end - wait_for_requests + context 'adding single comment to review' do + before do + visit_overview + end - expect(page).to have_selector('.draft-note-component', text: 'Testing update') + it 'at first does not show `Add to review` and `Add comment now` buttons' do + expect(page).to have_no_button('Add to review') + expect(page).to have_no_button('Add comment now') + end + + context 'when review has started' do + before do + visit_diffs + + write_diff_comment + + visit_overview + end + + it 'can add comment to review' do + write_comment(selector: '.js-main-target-form', field: 'note-body', text: 'Its a draft comment', button_text: 'Add to review') + + expect(page).to have_selector('.draft-note-component', text: 'Its a draft comment') + + click_button('Pending comments') + + expect(page).to have_text('2 pending comments') + end + + it 'can add comment right away' do + write_comment(selector: '.js-main-target-form', field: 'note-body', text: 'Its a regular comment', button_text: 'Add comment now') + + expect(page).to have_selector('.note:not(.draft-note)', text: 'Its a regular comment') + + click_button('Pending comments') + + expect(page).to have_text('1 pending comment') + end + end end context 'in parallel diff' do @@ -197,46 +246,51 @@ RSpec.describe 'Merge request > Batch comments', :js do wait_for_requests end - def write_comment(button_text: 'Start a review', text: 'Line is wrong') - click_diff_line(find("[id='#{sample_compare.changes[0][:line_code]}']")) - - page.within('.js-discussion-note-form') do - fill_in('note_note', with: text) - click_button(button_text) - end + def visit_overview + visit project_merge_request_path(merge_request.project, merge_request) wait_for_requests end - def write_parallel_comment(line, button_text: 'Start a review', text: 'Line is wrong') + def write_diff_comment(**params) + click_diff_line(find("[id='#{sample_compare.changes[0][:line_code]}']")) + + write_comment(**params) + end + + def write_parallel_comment(line, **params) find("td[id='#{line}']").hover find(".is-over button").click - page.within("form[data-line-code='#{line}']") do - fill_in('note_note', with: text) + write_comment(selector: "form[data-line-code='#{line}']", **params) + end + + def write_comment(selector: '.js-discussion-note-form', field: 'note_note', button_text: 'Start a review', text: 'Line is wrong') + page.within(selector) do + fill_in(field, with: text) click_button(button_text) end wait_for_requests end -end -def write_reply_to_discussion(button_text: 'Start a review', text: 'Line is wrong', resolve: false, unresolve: false) - page.within(first('.diff-files-holder .discussion-reply-holder')) do - find_field('Reply…', match: :first).click + def write_reply_to_discussion(button_text: 'Start a review', text: 'Line is wrong', resolve: false, unresolve: false) + page.within(first('.diff-files-holder .discussion-reply-holder')) do + find_field('Reply…', match: :first).click - fill_in('note_note', with: text) + fill_in('note_note', with: text) - if resolve - page.check('Resolve thread') - end + if resolve + page.check('Resolve thread') + end + + if unresolve + page.check('Unresolve thread') + end - if unresolve - page.check('Unresolve thread') + click_button(button_text) end - click_button(button_text) + wait_for_requests end - - wait_for_requests end diff --git a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb index fd13083c185..d36abf86518 100644 --- a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb +++ b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb @@ -28,7 +28,7 @@ RSpec.describe 'create a merge request, allowing commits from members who can me check 'Allow commits from members who can merge to the target branch' - click_button 'Submit merge request' + click_button 'Create merge request' wait_for_requests diff --git a/spec/features/merge_request/user_awards_emoji_spec.rb b/spec/features/merge_request/user_awards_emoji_spec.rb index 62e4209f386..6f46cc20cba 100644 --- a/spec/features/merge_request/user_awards_emoji_spec.rb +++ b/spec/features/merge_request/user_awards_emoji_spec.rb @@ -17,33 +17,28 @@ RSpec.describe 'Merge request > User awards emoji', :js do end it 'adds award to merge request' do - first('.js-emoji-btn').click - expect(page).to have_selector('.js-emoji-btn.active') - expect(first('.js-emoji-btn')).to have_content '1' + first('[data-testid="award-button"]').click + expect(page).to have_selector('[data-testid="award-button"].is-active') + expect(first('[data-testid="award-button"]')).to have_content '1' visit project_merge_request_path(project, merge_request) - expect(first('.js-emoji-btn')).to have_content '1' + expect(first('[data-testid="award-button"]')).to have_content '1' end it 'removes award from merge request' do - first('.js-emoji-btn').click - find('.js-emoji-btn.active').click - expect(first('.js-emoji-btn')).to have_content '0' + first('[data-testid="award-button"]').click + find('[data-testid="award-button"].is-active').click + expect(first('[data-testid="award-button"]')).to have_content '0' visit project_merge_request_path(project, merge_request) - expect(first('.js-emoji-btn')).to have_content '0' - end - - it 'has only one menu on the page' do - first('.js-add-award').click - expect(page).to have_selector('.emoji-menu') - - expect(page).to have_selector('.emoji-menu', count: 1) + expect(first('[data-testid="award-button"]')).to have_content '0' end it 'adds awards to note' do - first('.js-note-emoji').click - first('.emoji-menu .js-emoji-btn').click + page.within('.note-actions') do + first('.note-emoji-button').click + find('gl-emoji[data-name="8ball"]').click + end wait_for_requests diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb index 37d329d4d5d..119cf31098c 100644 --- a/spec/features/merge_request/user_creates_merge_request_spec.rb +++ b/spec/features/merge_request/user_creates_merge_request_spec.rb @@ -31,7 +31,7 @@ RSpec.describe "User creates a merge request", :js do end fill_in("Title", with: title) - click_button("Submit merge request") + click_button("Create merge request") page.within(".merge-request") do expect(page).to have_content(title) @@ -87,7 +87,7 @@ RSpec.describe "User creates a merge request", :js do click_button("Compare branches and continue") - expect(page).to have_css("h3.page-title", text: "New Merge Request") + expect(page).to have_css("h3.page-title", text: "New merge request") page.within("form#new_merge_request") do fill_in("Title", with: title) @@ -103,7 +103,7 @@ RSpec.describe "User creates a merge request", :js do end find('.js-assignee-search').click - click_button("Submit merge request") + click_button("Create merge request") expect(page).to have_content(title).and have_content("Request to merge #{user.namespace.path}:#{source_branch} into master") end diff --git a/spec/features/merge_request/user_invites_from_a_comment_spec.rb b/spec/features/merge_request/user_invites_from_a_comment_spec.rb new file mode 100644 index 00000000000..79865094fd0 --- /dev/null +++ b/spec/features/merge_request/user_invites_from_a_comment_spec.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +require "spec_helper" + +RSpec.describe "User invites from a comment", :js do + let_it_be(:project) { create(:project, :public, :repository) } + let_it_be(:merge_request) { create(:merge_request, source_project: project) } + let_it_be(:user) { project.owner } + + before do + sign_in(user) + end + + it "launches the invite modal from invite link on a comment" do + stub_experiments(invite_members_in_comment: :invite_member_link) + + visit project_merge_request_path(project, merge_request) + + page.within(".new-note") do + click_button 'Invite Member' + end + + expect(page).to have_content("You're inviting members to the") + end +end diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb index 3099a893dc2..a6dfae72912 100644 --- a/spec/features/merge_request/user_posts_notes_spec.rb +++ b/spec/features/merge_request/user_posts_notes_spec.rb @@ -173,7 +173,7 @@ RSpec.describe 'Merge request > User posts notes', :js do it 'allows using markdown buttons after saving a note and then trying to edit it again' do page.within('.current-note-edit-form') do fill_in 'note[note]', with: 'This is the new content' - find('.btn-success').click + find('.btn-confirm').click end find('.note').hover @@ -182,16 +182,16 @@ RSpec.describe 'Merge request > User posts notes', :js do find('.js-note-edit').click page.within('.current-note-edit-form') do - expect(find('#note_note').value).to include('This is the new content') + expect(find_field('note[note]').value).to include('This is the new content') first('.js-md').click - expect(find('#note_note').value).to include('This is the new content****') + expect(find_field('note[note]').value).to include('This is the new content****') end end it 'appends the edited at time to the note' do page.within('.current-note-edit-form') do fill_in 'note[note]', with: 'Some new content' - find('.btn-success').click + find('.btn-confirm').click end page.within("#note_#{note.id}") do diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index caa04059469..9a3f97a0943 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -15,10 +15,6 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do diff_refs: merge_request.diff_refs) end - before do - stub_feature_flags(remove_resolve_note: false) - end - context 'no threads' do before do project.add_maintainer(user) @@ -67,7 +63,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to mark thread as resolved' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end expect(page).to have_selector('.discussion-body', visible: false) @@ -84,7 +80,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to unresolve thread' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click click_button 'Unresolve thread' end @@ -96,7 +92,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do describe 'resolved thread' do before do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end visit_merge_request @@ -197,7 +193,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to resolve from reply form without a comment' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end page.within '.line-resolve-all-container' do @@ -234,7 +230,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'hides jump to next button when all resolved' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end expect(page).to have_selector('.discussion-next-btn', visible: false) @@ -264,7 +260,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do visit_merge_request end - it 'does not mark thread as resolved when resolving single note' do + it 'marks thread as resolved when resolving single note' do page.within("#note_#{note.id}") do first('.line-resolve-btn').click @@ -273,15 +269,13 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do expect(first('.line-resolve-btn')['aria-label']).to eq("Resolved by #{user.name}") end - expect(page).to have_content('Last updated') - page.within '.line-resolve-all-container' do - expect(page).to have_content('1 unresolved thread') + expect(page).to have_content('All threads resolved') end end it 'resolves thread' do - resolve_buttons = page.all('.note .line-resolve-btn', count: 2) + resolve_buttons = page.all('.note .line-resolve-btn', count: 1) resolve_buttons.each do |button| button.click end @@ -332,7 +326,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to mark all threads as resolved' do page.all('.discussion-reply-holder', count: 2).each do |reply_holder| page.within reply_holder do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end end @@ -344,7 +338,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to quickly scroll to next unresolved thread' do page.within('.discussion-reply-holder', match: :first) do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end page.within '.line-resolve-all-container' do @@ -416,7 +410,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to mark thread as resolved' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click end page.within '.diff-content .note' do @@ -431,7 +425,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to unresolve thread' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click click_button 'Unresolve thread' end @@ -459,7 +453,7 @@ RSpec.describe 'Merge request > User resolves diff notes and threads', :js do it 'allows user to comment & unresolve thread' do page.within '.diff-content' do - click_button 'Resolve thread' + find('button[data-qa-selector="resolve_discussion_button"]').click find_field('Reply…').click diff --git a/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb b/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb index 95e435a333e..d8b258bac47 100644 --- a/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb +++ b/spec/features/merge_request/user_sees_breadcrumb_links_spec.rb @@ -13,7 +13,7 @@ RSpec.describe 'New merge request breadcrumb' do it 'displays link to project merge requests and new merge request' do page.within '.breadcrumbs' do - expect(find_link('Merge Requests')[:href]).to end_with(project_merge_requests_path(project)) + expect(find_link('Merge requests')[:href]).to end_with(project_merge_requests_path(project)) expect(find_link('New')[:href]).to end_with(project_new_merge_request_path(project)) end end 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 ad0e9b48903..733b5a97fea 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 @@ -26,7 +26,6 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', end before do - stub_feature_flags(new_pipelines_table: false) stub_application_setting(auto_devops_enabled: false) stub_ci_pipeline_yaml_file(YAML.dump(config)) project.add_maintainer(user) @@ -62,7 +61,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(page).to have_selector('.ci-created', count: 2) expect(first('[data-testid="pipeline-url-link"]')).to have_content("##{detached_merge_request_pipeline.id}") end end @@ -154,7 +153,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', context 'when detached merge request pipeline succeeds' do before do - detached_merge_request_pipeline.succeed! + detached_merge_request_pipeline.reload.succeed! wait_for_requests end @@ -168,7 +167,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', context 'when branch pipeline succeeds' do before do click_link 'Overview' - push_pipeline.succeed! + push_pipeline.reload.succeed! wait_for_requests end @@ -197,7 +196,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-pending', count: 1) + expect(page).to have_selector('.ci-created', count: 1) expect(first('[data-testid="pipeline-url-link"]')).to have_content("##{push_pipeline.id}") end end @@ -333,6 +332,31 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', end end + context 'when the latest pipeline is running in the parent project' do + before do + Ci::CreatePipelineService.new(project, user, ref: 'feature') + .execute(:merge_request_event, merge_request: merge_request) + end + + context 'when the previous pipeline failed in the fork project' do + before do + detached_merge_request_pipeline.reload.drop! + end + + context 'when the parent project enables pipeline must succeed' do + before do + project.update!(only_allow_merge_if_pipeline_succeeds: true) + end + + it 'shows MWPS button' do + visit project_merge_request_path(project, merge_request) + + expect(page).to have_button('Merge when pipeline succeeds') + end + end + end + end + context 'when a user merges a merge request from a forked project to the parent project' do before do click_link("Overview") @@ -351,7 +375,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', context 'when detached merge request pipeline succeeds' do before do - detached_merge_request_pipeline.succeed! + detached_merge_request_pipeline.reload.succeed! wait_for_requests end @@ -364,7 +388,7 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request', context 'when branch pipeline succeeds' do before do - push_pipeline.succeed! + push_pipeline.reload.succeed! wait_for_requests end diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index 05fa5459e06..0cb4107c21d 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -32,7 +32,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do end it 'shows widget status after creating new merge request' do - click_button 'Submit merge request' + click_button 'Create merge request' wait_for_requests diff --git a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb index c0dc2ec3baf..e5592ae9535 100644 --- a/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb +++ b/spec/features/merge_request/user_sees_mini_pipeline_graph_spec.rb @@ -23,7 +23,7 @@ RSpec.describe 'Merge request < User sees mini pipeline graph', :js do end it 'displays a mini pipeline graph' do - expect(page).to have_selector('.mr-widget-pipeline-graph') + expect(page).to have_selector('[data-testid="pipeline-mini-graph"]') end context 'as json' do @@ -57,6 +57,10 @@ RSpec.describe 'Merge request < User sees mini pipeline graph', :js do first(dropdown_selector) end + before do + wait_for_requests + end + # Status icon button styles should update as described in # https://gitlab.com/gitlab-org/gitlab-foss/issues/42769 it 'has unique styles for default, :hover, :active, and :focus states' do diff --git a/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb b/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb index ea46ae06329..b8b7fc2009f 100644 --- a/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb +++ b/spec/features/merge_request/user_sees_notes_from_forked_project_spec.rb @@ -28,8 +28,8 @@ RSpec.describe 'Merge request > User sees notes from forked project', :js do page.within('.discussion-notes') do find_field('Reply…').click - scroll_to(page.find('#note_note', visible: false)) - find('#note_note').send_keys('A reply comment') + scroll_to(find_field('note[note]', visible: false)) + fill_in 'note[note]', with: 'A reply comment' find('.js-comment-button').click end diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb index 77d2cb77ae3..a5047c8d550 100644 --- a/spec/features/merge_request/user_sees_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_pipelines_spec.rb @@ -41,7 +41,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do context 'with a detached merge request pipeline' do let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) } - it 'displays the Run Pipeline button' do + it 'displays the "Run pipeline" button' do visit project_merge_request_path(project, merge_request) page.within('.merge-request-tabs') do @@ -50,14 +50,14 @@ RSpec.describe 'Merge request > User sees pipelines', :js do wait_for_requests - expect(page.find('[data-testid="run_pipeline_button"]')).to have_text('Run Pipeline') + expect(page.find('[data-testid="run_pipeline_button"]')).to have_text('Run pipeline') end end context 'with a merged results pipeline' do let(:merge_request) { create(:merge_request, :with_merge_request_pipeline) } - it 'displays the Run Pipeline button' do + it 'displays the "Run pipeline" button' do visit project_merge_request_path(project, merge_request) page.within('.merge-request-tabs') do @@ -66,7 +66,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do wait_for_requests - expect(page.find('[data-testid="run_pipeline_button"]')).to have_text('Run Pipeline') + expect(page.find('[data-testid="run_pipeline_button"]')).to have_text('Run pipeline') end end end @@ -131,7 +131,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do visit project_merge_request_path(parent_project, merge_request) create_merge_request_pipeline - act_on_security_warning(action: 'Run Pipeline') + act_on_security_warning(action: 'Run pipeline') check_pipeline(expected_project: parent_project) check_head_pipeline(expected_project: parent_project) @@ -175,7 +175,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do def create_merge_request_pipeline page.within('.merge-request-tabs') { click_link('Pipelines') } - click_button('Run Pipeline') + click_button('Run pipeline') end def check_pipeline(expected_project:) diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb index 9850ca3f173..275a87ca391 100644 --- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb +++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb @@ -60,7 +60,7 @@ RSpec.describe 'Merge request > User selects branches for new MR', :js do expect(page).to have_content "wm.png" fill_in "merge_request_title", with: "Orphaned MR test" - click_button "Submit merge request" + click_button "Create merge request" click_button "Check out branch" @@ -200,7 +200,7 @@ RSpec.describe 'Merge request > User selects branches for new MR', :js do click_button "Compare branches" - expect(page).to have_button("Submit merge request") + expect(page).to have_button("Create merge request") end end end diff --git a/spec/features/merge_request/user_squashes_merge_request_spec.rb b/spec/features/merge_request/user_squashes_merge_request_spec.rb index 84964bd0637..15f59c0d7bc 100644 --- a/spec/features/merge_request/user_squashes_merge_request_spec.rb +++ b/spec/features/merge_request/user_squashes_merge_request_spec.rb @@ -92,7 +92,7 @@ RSpec.describe 'User squashes a merge request', :js do before do visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch }) check 'merge_request[squash]' - click_on 'Submit merge request' + click_on 'Create merge request' wait_for_requests end @@ -121,7 +121,7 @@ RSpec.describe 'User squashes a merge request', :js do context 'when squash is not enabled on merge request creation', :sidekiq_might_not_need_inline do before do visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch }) - click_on 'Submit merge request' + click_on 'Create merge request' wait_for_requests end diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb index 5f99d762ecb..f1b44010f63 100644 --- a/spec/features/merge_request/user_views_open_merge_request_spec.rb +++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb @@ -125,7 +125,7 @@ RSpec.describe 'User views an open merge request' do end it 'encodes branch name' do - expect(find('cite.ref-name')[:title]).to eq(source_branch) + expect(find("[data-testid='ref-name']")[:title]).to eq(source_branch) end end end |