diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-11 11:36:16 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-11 11:36:16 +0300 |
commit | 3c2fd9d54db073e045eddfecd784bd1c82d5ddbc (patch) | |
tree | 46f0c1faef7d1bf2a15440a4886d18504842922f /spec/helpers | |
parent | d7bbafd8970f89bbdd30fa219b3901c3eae4331c (diff) | |
parent | cd7f03ef83ab5657a6fb31f5e54f0cf3c67b4f72 (diff) |
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
Diffstat (limited to 'spec/helpers')
-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 |