summaryrefslogtreecommitdiff
path: root/spec/models/user_spec.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
committerPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
commita2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch)
treee7d5e3e097ef85b871c7ab5b4673e6903c294144 /spec/models/user_spec.rb
parent13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff)
parent3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff)
downloadgitlab-ce-issue-board-sidebar.tar.gz
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r--spec/models/user_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 65b2896930a..10c39b90212 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -15,11 +15,11 @@ describe User, models: true do
describe 'associations' do
it { is_expected.to have_one(:namespace) }
- it { is_expected.to have_many(:snippets).class_name('Snippet').dependent(:destroy) }
+ it { is_expected.to have_many(:snippets).dependent(:destroy) }
it { is_expected.to have_many(:project_members).dependent(:destroy) }
it { is_expected.to have_many(:groups) }
it { is_expected.to have_many(:keys).dependent(:destroy) }
- it { is_expected.to have_many(:events).class_name('Event').dependent(:destroy) }
+ it { is_expected.to have_many(:events).dependent(:destroy) }
it { is_expected.to have_many(:recent_events).class_name('Event') }
it { is_expected.to have_many(:issues).dependent(:destroy) }
it { is_expected.to have_many(:notes).dependent(:destroy) }