diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 00:07:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 00:07:37 +0300 |
commit | 7f8330873c1a5860b8a9a52d111083a65d210249 (patch) | |
tree | e6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/presenters/merge_request_presenter_spec.rb | |
parent | bbe243060399191abcba33c7ebd611f6ec34c6cd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/presenters/merge_request_presenter_spec.rb')
-rw-r--r-- | spec/presenters/merge_request_presenter_spec.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb index 025f083ab27..ce437090d43 100644 --- a/spec/presenters/merge_request_presenter_spec.rb +++ b/spec/presenters/merge_request_presenter_spec.rb @@ -101,7 +101,7 @@ describe MergeRequestPresenter do allow(presenter).to receive_message_chain(:conflicts, :can_be_resolved_by?).with(user) { true } expect(path) - .to eq("/#{project.full_path}/-/merge_requests/#{resource.iid}/conflicts") + .to eq("/#{project.full_path}/merge_requests/#{resource.iid}/conflicts") end end end @@ -179,7 +179,7 @@ describe MergeRequestPresenter do it 'returns correct link with correct text' do is_expected - .to match("#{project.full_path}/-/merge_requests/#{resource.iid}/assign_related_issues") + .to match("#{project.full_path}/merge_requests/#{resource.iid}/assign_related_issues") is_expected .to match("Assign yourself to this issue") @@ -192,7 +192,7 @@ describe MergeRequestPresenter do it 'returns correct link with correct text' do is_expected - .to match("#{project.full_path}/-/merge_requests/#{resource.iid}/assign_related_issues") + .to match("#{project.full_path}/merge_requests/#{resource.iid}/assign_related_issues") is_expected .to match("Assign yourself to these issues") @@ -221,7 +221,7 @@ describe MergeRequestPresenter do .with(user) .and_return(true) - is_expected.to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}/cancel_auto_merge") + is_expected.to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}/cancel_auto_merge") end end @@ -248,7 +248,7 @@ describe MergeRequestPresenter do .and_return(true) is_expected - .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}/merge") + .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}/merge") end end @@ -312,7 +312,7 @@ describe MergeRequestPresenter do project.add_maintainer(user) is_expected - .to eq("/#{resource.project.full_path}/-/merge_requests/#{resource.iid}/remove_wip") + .to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}/remove_wip") end end @@ -334,7 +334,7 @@ describe MergeRequestPresenter do allow(resource).to receive(:target_branch_exists?) { true } is_expected - .to eq("/#{resource.target_project.full_path}/-/commits/#{resource.target_branch}") + .to eq("/#{resource.target_project.full_path}/commits/#{resource.target_branch}") end end @@ -358,7 +358,7 @@ describe MergeRequestPresenter do allow(resource).to receive(:source_branch_exists?) { true } is_expected - .to eq("/#{resource.source_project.full_path}/-/commits/#{resource.source_branch}") + .to eq("/#{resource.source_project.full_path}/commits/#{resource.source_branch}") end end @@ -382,7 +382,7 @@ describe MergeRequestPresenter do allow(resource).to receive(:target_branch_exists?) { true } is_expected - .to eq("/#{resource.target_project.full_path}/-/tree/#{resource.target_branch}") + .to eq("/#{resource.target_project.full_path}/tree/#{resource.target_branch}") end end @@ -496,7 +496,7 @@ describe MergeRequestPresenter do allow(resource).to receive(:source_branch_exists?) { true } is_expected - .to eq("<a href=\"/#{resource.source_project.full_path}/-/tree/#{resource.source_branch}\">#{resource.source_branch}</a>") + .to eq("<a href=\"/#{resource.source_project.full_path}/tree/#{resource.source_branch}\">#{resource.source_branch}</a>") end it 'escapes html, when source_branch does not exist' do @@ -535,7 +535,7 @@ describe MergeRequestPresenter do it 'returns path' do is_expected - .to eq("/#{project.full_path}/-/merge_requests/#{resource.iid}/rebase") + .to eq("/#{project.full_path}/merge_requests/#{resource.iid}/rebase") end end |