diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-03-07 00:13:27 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-03-07 00:13:27 +0300 |
commit | d617182a1a6f9b19a8a6d117fa3e507fa2b338a8 (patch) | |
tree | e24db462cfb8ed1854e2203a78d6d22b071232e5 /spec/models/group_spec.rb | |
parent | f96d5112dca596fb85718b3cca2a7b30b3877207 (diff) | |
parent | b70d151db99d6d64f3514006c4fa6c8142e1b785 (diff) |
Merge branch 'master' into 'rs-carrierwave-db'
# Conflicts:
# spec/models/group_spec.rb
Diffstat (limited to 'spec/models/group_spec.rb')
-rw-r--r-- | spec/models/group_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index eac3d962dd1..5d87938235a 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -14,6 +14,7 @@ describe Group, models: true do it { is_expected.to have_many(:notification_settings).dependent(:destroy) } it { is_expected.to have_many(:labels).class_name('GroupLabel') } it { is_expected.to have_many(:uploads).dependent(:destroy) } + it { is_expected.to have_one(:chat_team) } describe '#members & #requesters' do let(:requester) { create(:user) } |