summaryrefslogtreecommitdiff
path: root/spec/presenters
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-07-11 09:48:59 -0500
committerClement Ho <ClemMakesApps@gmail.com>2017-07-11 09:48:59 -0500
commit09193a4fe18044a61021afef1282ec60b81810b1 (patch)
treeec6107dd34bacca03bd71e6a04a5eb528d5d2dc7 /spec/presenters
parent9e4e1afb4a7907f2a79d18fd9b5d03c9f6599ccf (diff)
downloadgitlab-ce-09193a4fe18044a61021afef1282ec60b81810b1.tar.gz
Convert target branch link to use tree
Diffstat (limited to 'spec/presenters')
-rw-r--r--spec/presenters/merge_request_presenter_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb
index 40fe9e3c004..ef12611cff8 100644
--- a/spec/presenters/merge_request_presenter_spec.rb
+++ b/spec/presenters/merge_request_presenter_spec.rb
@@ -317,10 +317,10 @@ describe MergeRequestPresenter do
end
end
- describe '#target_branch_commits_path' do
+ describe '#target_branch_tree_path' do
subject do
described_class.new(resource, current_user: user)
- .target_branch_commits_path
+ .target_branch_tree_path
end
context 'when target branch exists' do
@@ -328,7 +328,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}/tree/#{resource.target_branch}")
end
end