summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-11-14 12:25:14 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-11-14 12:25:14 +0000
commitfb7abd87daa8930682b05870361fe9dd112f050f (patch)
tree3b7e73b8985666bef1d1ae5af69cea2453cbab2f /spec/models
parentacc60818caf34db81f276fa94daea7b6c3a37be4 (diff)
parentaefefbf11701042ae59a60818e3f957b30831dfd (diff)
downloadgitlab-ce-fb7abd87daa8930682b05870361fe9dd112f050f.tar.gz
Merge branch 'issue_40058' into 'master'
Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/diff_note_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb
index da972d2d86a..8389d5c5430 100644
--- a/spec/models/diff_note_spec.rb
+++ b/spec/models/diff_note_spec.rb
@@ -283,6 +283,12 @@ describe DiffNote do
expect(diff_line).to be nil
expect(subject).to be_valid
end
+
+ it "does not update the position" do
+ expect(subject).not_to receive(:update_position)
+
+ subject.save
+ end
end
it "returns true for on_image?" do