diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /spec/presenters | |
parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/presenters')
-rw-r--r-- | spec/presenters/issue_presenter_spec.rb | 4 | ||||
-rw-r--r-- | spec/presenters/merge_request_presenter_spec.rb | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/presenters/issue_presenter_spec.rb b/spec/presenters/issue_presenter_spec.rb index 1eb674d1f8f..4a4caef9d28 100644 --- a/spec/presenters/issue_presenter_spec.rb +++ b/spec/presenters/issue_presenter_spec.rb @@ -17,7 +17,7 @@ describe IssuePresenter do describe '#web_url' do it 'returns correct path' do - expect(presenter.web_url).to eq("http://localhost/#{group.name}/#{project.name}/issues/#{issue.iid}") + expect(presenter.web_url).to eq("http://localhost/#{group.name}/#{project.name}/-/issues/#{issue.iid}") end end @@ -37,7 +37,7 @@ describe IssuePresenter do describe '#issue_path' do it 'returns correct path' do - expect(presenter.issue_path).to eq("/#{group.name}/#{project.name}/issues/#{issue.iid}") + expect(presenter.issue_path).to eq("/#{group.name}/#{project.name}/-/issues/#{issue.iid}") end end end diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb index 025f083ab27..f184e767f8c 100644 --- a/spec/presenters/merge_request_presenter_spec.rb +++ b/spec/presenters/merge_request_presenter_spec.rb @@ -128,11 +128,11 @@ describe MergeRequestPresenter do subject { described_class.new(resource, current_user: user).closing_issues_links } it 'presents closing issues links' do - is_expected.to match("#{project.full_path}/issues/#{issue_a.iid}") + is_expected.to match("#{project.full_path}/-/issues/#{issue_a.iid}") end it 'does not present related issues links' do - is_expected.not_to match("#{project.full_path}/issues/#{issue_b.iid}") + is_expected.not_to match("#{project.full_path}/-/issues/#{issue_b.iid}") end it 'appends status when closing issue is already closed' do @@ -148,11 +148,11 @@ describe MergeRequestPresenter do end it 'presents related issues links' do - is_expected.to match("#{project.full_path}/issues/#{issue_b.iid}") + is_expected.to match("#{project.full_path}/-/issues/#{issue_b.iid}") end it 'does not present closing issues links' do - is_expected.not_to match("#{project.full_path}/issues/#{issue_a.iid}") + is_expected.not_to match("#{project.full_path}/-/issues/#{issue_a.iid}") end it 'appends status when mentioned issue is already closed' do @@ -275,7 +275,7 @@ describe MergeRequestPresenter do project.add_maintainer(user) is_expected - .to eq("/#{resource.project.full_path}/issues/new?merge_request_to_resolve_discussions_of=#{resource.iid}") + .to eq("/#{resource.project.full_path}/-/issues/new?merge_request_to_resolve_discussions_of=#{resource.iid}") end end |