diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-06 15:34:38 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-19 23:19:27 +0700 |
| commit | aee119c0cd44edd008f3167258bf45cb94ee5522 (patch) | |
| tree | 53d2134cfbff85361f4875a1aa8eed075a282657 /spec/serializers | |
| parent | 7fb9dff43dcf56472e22be7a26805ee5fa339e8b (diff) | |
| download | gitlab-ce-aee119c0cd44edd008f3167258bf45cb94ee5522.tar.gz | |
Update pipeline detail view to accommodate post-merge pipelines
Commit changes
Add spec
Add changelog
fix
fix
Fix
Fix spec
Finish spec
ok
nice
ok
ok
ok
fix
Diffstat (limited to 'spec/serializers')
| -rw-r--r-- | spec/serializers/pipeline_entity_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/serializers/pipeline_entity_spec.rb b/spec/serializers/pipeline_entity_spec.rb index c8308a0ae85..1d992e8a483 100644 --- a/spec/serializers/pipeline_entity_spec.rb +++ b/spec/serializers/pipeline_entity_spec.rb @@ -159,13 +159,13 @@ describe PipelineEntity do expect(subject[:merge_request][:source_branch]) .to eq(merge_request.source_branch) - expect(project_branch_path(project, merge_request.source_branch)) + expect(project_commits_path(project, merge_request.source_branch)) .to include(subject[:merge_request][:source_branch_path]) expect(subject[:merge_request][:target_branch]) .to eq(merge_request.target_branch) - expect(project_branch_path(project, merge_request.target_branch)) + expect(project_commits_path(project, merge_request.target_branch)) .to include(subject[:merge_request][:target_branch_path]) end end |