diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-06 08:10:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-06 08:10:19 +0000 |
| commit | 84f562e7040f1da818157853de84874d57135ca9 (patch) | |
| tree | 792ee15661a9377be78ec5ea49a23dff19d96790 | |
| parent | 57bc28e7907cc5166030c10638a2c756cb45dcaa (diff) | |
| parent | ef68b8737f49b119f2350fc8a3502afb4f46d210 (diff) | |
| download | gitlab-ce-84f562e7040f1da818157853de84874d57135ca9.tar.gz | |
Merge branch 'tc-fix-failing-awardable-spec' into 'master'
Fix failing master
See merge request gitlab-org/gitlab-ce!22830
| -rw-r--r-- | spec/models/concerns/awardable_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/concerns/awardable_spec.rb b/spec/models/concerns/awardable_spec.rb index debc02fa51f..5713106418d 100644 --- a/spec/models/concerns/awardable_spec.rb +++ b/spec/models/concerns/awardable_spec.rb @@ -37,8 +37,8 @@ describe Awardable do create(:award_emoji, awardable: issue3, name: "star", user: award_emoji.user) create(:award_emoji, awardable: issue3, name: "star", user: award_emoji2.user) - expect(Issue.awarded(award_emoji.user)).to eq [issue, issue3] - expect(Issue.awarded(award_emoji2.user)).to eq [issue2, issue3] + expect(Issue.awarded(award_emoji.user)).to contain_exactly(issue, issue3) + expect(Issue.awarded(award_emoji2.user)).to contain_exactly(issue2, issue3) end end |