Merge branch 'jprovazn-fix-resolvable' into 'master'

Check if note's noteable is not nil when checking resolvability

Closes #46573

See merge request gitlab-org/gitlab-ce!19081

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/concerns/resolvable_note_spec.rb b/spec/models/concerns/resolvable_note_spec.rb
index 91591017587..fcb5250278e 100644
--- a/spec/models/concerns/resolvable_note_spec.rb
+++ b/spec/models/concerns/resolvable_note_spec.rb
@@ -326,4 +326,12 @@ describe Note, ResolvableNote do
       end
     end
   end
+
+  describe "#potentially_resolvable?" do
+    it 'returns false if noteable could not be found' do
+      allow(subject).to receive(:noteable).and_return(nil)
+
+      expect(subject.potentially_resolvable?).to be_falsey
+    end
+  end
 end