diff options
Diffstat (limited to 'spec/features/merge_request/user_resolves_wip_mr_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_resolves_wip_mr_spec.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_resolves_wip_mr_spec.rb b/spec/features/merge_request/user_resolves_wip_mr_spec.rb index 34a3490a152..a9d4c4df507 100644 --- a/spec/features/merge_request/user_resolves_wip_mr_spec.rb +++ b/spec/features/merge_request/user_resolves_wip_mr_spec.rb @@ -11,6 +11,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do title: 'WIP: Bug NS-04', merge_params: { force_remove_source_branch: '1' }) end + let(:pipeline) do create(:ci_pipeline, project: project, sha: merge_request.diff_head_sha, @@ -32,9 +33,9 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do it 'retains merge request data after clicking Resolve WIP status' do expect(page.find('.ci-widget-content')).to have_content("Pipeline ##{pipeline.id}") - expect(page).to have_content "This is a Work in Progress" + expect(page).to have_content "This merge request is still a work in progress." - click_button('Resolve WIP status') + click_button('Mark as ready') wait_for_requests @@ -42,7 +43,7 @@ RSpec.describe 'Merge request > User resolves Work in Progress', :js do # merge request widget refreshes, which masks missing elements # that should already be present. expect(page.find('.ci-widget-content', wait: 0)).to have_content("Pipeline ##{pipeline.id}") - expect(page).not_to have_content('This is a Work in Progress') + expect(page).not_to have_content('This merge request is still a work in progress.') end end end |