diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
| commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
| tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /spec/models/note_spec.rb | |
| parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
| download | gitlab-ce-6b75320f525f841454f1ab162d141d3610f2e77b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 83c7464757f..8a47b8c206b 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -972,13 +972,13 @@ describe Note do project = create(:project) note = create(:note_on_issue, project: project) - expect(note.parent).to eq(project) + expect(note.resource_parent).to eq(project) end it 'returns nil for personal snippet note' do note = create(:note_on_personal_snippet) - expect(note.parent).to be_nil + expect(note.resource_parent).to be_nil end end |