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
path: root/spec
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-07-11 17:48:59 +0300
committerClement Ho <ClemMakesApps@gmail.com>2017-07-11 17:48:59 +0300
commit09193a4fe18044a61021afef1282ec60b81810b1 (patch)
treeec6107dd34bacca03bd71e6a04a5eb528d5d2dc7 /spec
parent9e4e1afb4a7907f2a79d18fd9b5d03c9f6599ccf (diff)
Convert target branch link to use tree
Diffstat (limited to 'spec')
-rw-r--r--spec/fixtures/api/schemas/entities/merge_request.json2
-rw-r--r--spec/presenters/merge_request_presenter_spec.rb6
-rw-r--r--spec/serializers/merge_request_entity_spec.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json
index b6a59a6cc47..b6cda963ffa 100644
--- a/spec/fixtures/api/schemas/entities/merge_request.json
+++ b/spec/fixtures/api/schemas/entities/merge_request.json
@@ -74,7 +74,7 @@
},
"additionalProperties": false
},
- "target_branch_commits_path": { "type": "string" },
+ "target_branch_tree_path": { "type": "string" },
"source_branch_path": { "type": "string" },
"conflict_resolution_path": { "type": ["string", "null"] },
"cancel_merge_when_pipeline_succeeds_path": { "type": "string" },
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
diff --git a/spec/serializers/merge_request_entity_spec.rb b/spec/serializers/merge_request_entity_spec.rb
index d38433c2365..0c1db82aa55 100644
--- a/spec/serializers/merge_request_entity_spec.rb
+++ b/spec/serializers/merge_request_entity_spec.rb
@@ -46,7 +46,7 @@ describe MergeRequestEntity do
:conflict_resolution_path,
:cancel_merge_when_pipeline_succeeds_path,
:create_issue_to_resolve_discussions_path,
- :source_branch_path, :target_branch_commits_path,
+ :source_branch_path, :target_branch_tree_path,
:commits_count)
end