Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index f6db809c2e3..8ccbc0d3fe2 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1094,7 +1094,7 @@ RSpec.describe Projects::MergeRequestsController do
end
context 'when processing coverage reports is completed' do
- let(:report) { { status: :parsed, data: pipeline.coverage_reports } }
+ let(:report) { { status: :parsed, data: { 'files' => {} } } }
it 'returns coverage reports' do
subject
@@ -1730,7 +1730,7 @@ RSpec.describe Projects::MergeRequestsController do
describe 'POST remove_wip' do
before do
- merge_request.title = merge_request.wip_title
+ merge_request.title = merge_request.draft_title
merge_request.save!
post :remove_wip,
@@ -1743,8 +1743,8 @@ RSpec.describe Projects::MergeRequestsController do
xhr: true
end
- it 'removes the wip status' do
- expect(merge_request.reload.title).to eq(merge_request.wipless_title)
+ it 'removes the draft status' do
+ expect(merge_request.reload.title).to eq(merge_request.draftless_title)
end
it 'renders MergeRequest as JSON' do