diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-21 15:22:28 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-21 15:22:28 +0000 |
| commit | 24fed567876a679be660551afea7677f2ea57665 (patch) | |
| tree | 0b6695468e1e1a069845e36200275bf3c2c839ff /spec/models | |
| parent | ab49c1a3a326ad44cc3481becf0cad9095205703 (diff) | |
| parent | e41a3912daaeabe19dc434df8837c9e7d7da7842 (diff) | |
| download | gitlab-ce-24fed567876a679be660551afea7677f2ea57665.tar.gz | |
Merge branch 'and-you-get-awards' into 'master'
And Snippets get awards
## What does this MR do?
Makes snippets more awesome, by making them awardables
## Why was this MR needed?
Because Snippets were left behind.
## What are the relevant issue numbers?
Closes #17878
See merge request !4456
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/snippet_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb index 0621c6a06ce..e6bc5296398 100644 --- a/spec/models/snippet_spec.rb +++ b/spec/models/snippet_spec.rb @@ -9,12 +9,14 @@ describe Snippet, models: true do it { is_expected.to include_module(Participable) } it { is_expected.to include_module(Referable) } it { is_expected.to include_module(Sortable) } + it { is_expected.to include_module(Awardable) } end describe 'associations' do it { is_expected.to belong_to(:author).class_name('User') } it { is_expected.to belong_to(:project) } it { is_expected.to have_many(:notes).dependent(:destroy) } + it { is_expected.to have_many(:award_emoji).dependent(:destroy) } end describe 'validation' do |