diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-11 08:36:16 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-11 15:45:29 +0100 |
| commit | 6b09e3e1b733f2ebeba5e3c20de2ced2d4c400f9 (patch) | |
| tree | 950fcf12934a13c893e2b83422a1b65bfcf29d5a | |
| parent | 881ec08ff9192780ed9208de237116b4d265eac7 (diff) | |
| download | gitlab-ce-6b09e3e1b733f2ebeba5e3c20de2ced2d4c400f9.tar.gz | |
Merge branch 'sh-fix-award-emoji-spec' into 'master'
Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`
Closes gitlab-ee#2890
See merge request !12770
| -rw-r--r-- | spec/helpers/award_emoji_helper_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/award_emoji_helper_spec.rb b/spec/helpers/award_emoji_helper_spec.rb index 7dfd6a3f6b4..035960ed96e 100644 --- a/spec/helpers/award_emoji_helper_spec.rb +++ b/spec/helpers/award_emoji_helper_spec.rb @@ -40,7 +40,7 @@ describe AwardEmojiHelper do it 'returns correct url' do @project = merge_request.project - expected_url = "/#{@project.namespace.path}/#{@project.path}/merge_requests/#{merge_request.id}/toggle_award_emoji" + expected_url = "/#{@project.namespace.path}/#{@project.path}/merge_requests/#{merge_request.iid}/toggle_award_emoji" expect(helper.toggle_award_url(merge_request)).to eq(expected_url) end @@ -52,7 +52,7 @@ describe AwardEmojiHelper do it 'returns correct url' do @project = issue.project - expected_url = "/#{@project.namespace.path}/#{@project.path}/issues/#{issue.id}/toggle_award_emoji" + expected_url = "/#{@project.namespace.path}/#{@project.path}/issues/#{issue.iid}/toggle_award_emoji" expect(helper.toggle_award_url(issue)).to eq(expected_url) end |