summaryrefslogtreecommitdiff
path: root/spec/models/user_spec.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2015-09-29 18:08:55 +0200
committerrymai <remy@rymai.me>2015-09-29 21:47:01 +0200
commitea72d53ec083676ee1171e97c0869132f360d0c9 (patch)
treed512e83b668cf9223bab25c5f5dd6b715a82b204 /spec/models/user_spec.rb
parent5f95a5e070c76c582a2b394377b0f350f4b1cff9 (diff)
downloadgitlab-ce-ea72d53ec083676ee1171e97c0869132f360d0c9.tar.gz
This simplifies the "Report button" to not use open a dropdown and adds a tooltip on this button. This also removes an extra spec and adds missing specs.
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r--spec/models/user_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 6342c3b8d13..b7b525bfca2 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -73,7 +73,6 @@ describe User do
describe 'associations' do
it { is_expected.to have_one(:namespace) }
- it { is_expected.to have_one(:abuse_report) }
it { is_expected.to have_many(:snippets).class_name('Snippet').dependent(:destroy) }
it { is_expected.to have_many(:project_members).dependent(:destroy) }
it { is_expected.to have_many(:groups) }
@@ -86,6 +85,7 @@ describe User do
it { is_expected.to have_many(:merge_requests).dependent(:destroy) }
it { is_expected.to have_many(:assigned_merge_requests).dependent(:destroy) }
it { is_expected.to have_many(:identities).dependent(:destroy) }
+ it { is_expected.to have_one(:abuse_report) }
end
describe 'validations' do