diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
| commit | dc04fdc1a3165134fc9245e9a591daceee857ef4 (patch) | |
| tree | e3b01475f2e224cd1595167c9a5dd0d0dc013a89 /spec/models/note_spec.rb | |
| parent | ec302c6c0cf7d4b3a19bea43ce380dbaa60b363d (diff) | |
| parent | 48c51e207e4cba8a69e4ca65cba1e169d384cefa (diff) | |
| download | gitlab-ce-dc04fdc1a3165134fc9245e9a591daceee857ef4.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'spec/models/note_spec.rb')
| -rw-r--r-- | spec/models/note_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index e2b80cb6e61..cbe6d42ef53 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Note, models: true do +describe Note do include RepoHelpers describe 'associations' do @@ -525,7 +525,7 @@ describe Note, models: true do it "has a discussion id" do # The discussion_id is set in `after_initialize`, so `reload` won't work - reloaded_note = Note.find(note.id) + reloaded_note = described_class.find(note.id) expect(reloaded_note.discussion_id).not_to be_nil expect(reloaded_note.discussion_id).to match(/\A\h{40}\z/) |