diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 12:20:17 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 12:20:17 +0300 |
commit | 7ad7e10feed624e263b5b80f5cafd4b0ed900ad7 (patch) | |
tree | c5eb47727ba96c77e61a132ceaedd89218b60ae4 /features/steps/project/merge_requests.rb | |
parent | 9614c52266fd7009c1dd2960564d4f65b1a12f80 (diff) | |
parent | fc809d689a03e69c581c1bb8ed0cf246953a7c08 (diff) |
Merge remote-tracking branch 'origin/master' into rename-ci-commit
Diffstat (limited to 'features/steps/project/merge_requests.rb')
-rw-r--r-- | features/steps/project/merge_requests.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 0ac7d3a250a..4f19274f571 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -179,14 +179,14 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'merge request "Bug NS-04" have 2 upvotes and 1 downvote' do merge_request = MergeRequest.find_by(title: 'Bug NS-04') - create_list(:upvote_note, 2, project: project, noteable: merge_request) - create(:downvote_note, project: project, noteable: merge_request) + create_list(:award_emoji, 2, awardable: merge_request) + create(:award_emoji, :downvote, awardable: merge_request) end step 'merge request "Bug NS-06" have 1 upvote and 2 downvotes' do - merge_request = MergeRequest.find_by(title: 'Bug NS-06') - create(:upvote_note, project: project, noteable: merge_request) - create_list(:downvote_note, 2, project: project, noteable: merge_request) + awardable = MergeRequest.find_by(title: 'Bug NS-06') + create(:award_emoji, awardable: awardable) + create_list(:award_emoji, 2, :downvote, awardable: awardable) end step 'The list should be sorted by "Least popular"' do |