diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-26 15:08:40 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-26 15:08:40 +0000 |
commit | a1908447b77a6d005a77f1be2f717cd35274c82d (patch) | |
tree | 8348f9346b1631d78b0ae5e5493ebdef5273d5cb /spec/services/merge_requests | |
parent | 6e320396b26439a0c3fa1df1ce9f4c2395518227 (diff) | |
download | gitlab-ce-a1908447b77a6d005a77f1be2f717cd35274c82d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index d603cbb16aa..3ccf02fcdfb 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -683,14 +683,14 @@ RSpec.describe MergeRequests::RefreshService do end end - context 'marking the merge request as work in progress' do + context 'marking the merge request as draft' do let(:refresh_service) { service.new(@project, @user) } before do allow(refresh_service).to receive(:execute_hooks) end - it 'marks the merge request as work in progress from fixup commits' do + it 'marks the merge request as draft from fixup commits' do fixup_merge_request = create(:merge_request, source_project: @project, source_branch: 'wip', @@ -705,11 +705,11 @@ RSpec.describe MergeRequests::RefreshService do expect(fixup_merge_request.work_in_progress?).to eq(true) expect(fixup_merge_request.notes.last.note).to match( - /marked as a \*\*Work In Progress\*\* from #{Commit.reference_pattern}/ + /marked this merge request as \*\*draft\*\* from #{Commit.reference_pattern}/ ) end - it 'references the commit that caused the Work in Progress status' do + it 'references the commit that caused the draft status' do wip_merge_request = create(:merge_request, source_project: @project, source_branch: 'wip', @@ -724,11 +724,11 @@ RSpec.describe MergeRequests::RefreshService do refresh_service.execute(oldrev, newrev, 'refs/heads/wip') expect(wip_merge_request.reload.notes.last.note).to eq( - "marked as a **Work In Progress** from #{wip_commit.id}" + "marked this merge request as **draft** from #{wip_commit.id}" ) end - it 'does not mark as WIP based on commits that do not belong to an MR' do + it 'does not mark as draft based on commits that do not belong to an MR' do allow(refresh_service).to receive(:find_new_commits) refresh_service.instance_variable_set("@commits", [ double( |