diff options
author | haseeb <haseebeqx@yahoo.com> | 2017-08-13 18:09:30 +0530 |
---|---|---|
committer | haseeb <haseebeqx@yahoo.com> | 2017-08-13 18:09:30 +0530 |
commit | f2251d1978a7fc8bad7ebb3766ed97d05e5f49e9 (patch) | |
tree | 4ee95e0bb285a9a83be64743d577c8971ad7ea12 | |
parent | df948f8ac21568eac0cef059c2e96d009d702cc2 (diff) | |
download | gitlab-ce-f2251d1978a7fc8bad7ebb3766ed97d05e5f49e9.tar.gz |
fixes failing tests for full reference change
-rw-r--r-- | spec/features/merge_requests/merge_commit_message_toggle_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/merge_requests/merge_commit_message_toggle_spec.rb b/spec/features/merge_requests/merge_commit_message_toggle_spec.rb index 429bc277d73..08a3bb84aac 100644 --- a/spec/features/merge_requests/merge_commit_message_toggle_spec.rb +++ b/spec/features/merge_requests/merge_commit_message_toggle_spec.rb @@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do "Merge branch 'feature' into 'master'", merge_request.title, "Closes #{issue_1.to_reference} and #{issue_2.to_reference}", - "See merge request #{merge_request.to_reference}" + "See merge request #{merge_request.to_reference(full: true)}" ].join("\n\n") end let(:message_with_description) do @@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do "Merge branch 'feature' into 'master'", merge_request.title, merge_request.description, - "See merge request #{merge_request.to_reference}" + "See merge request #{merge_request.to_reference(full: true)}" ].join("\n\n") end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 026bdbd26d1..e2b0d9ab005 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -604,7 +604,7 @@ describe MergeRequest do request = build_stubbed(:merge_request) expect(request.merge_commit_message) - .to match("See merge request #{request.to_reference}") + .to match("See merge request #{request.to_reference(full: true)}") end it 'excludes multiple linebreak runs when description is blank' do |