Commit 6dd71888 authored by Douwe Maan's avatar Douwe Maan

Make `DiffNote#update_position` private

parent 70a64f6a
...@@ -72,6 +72,20 @@ class DiffNote < Note ...@@ -72,6 +72,20 @@ class DiffNote < Note
self.position.diff_refs == diff_refs self.position.diff_refs == diff_refs
end end
private
def supported?
!self.for_merge_request? || self.noteable.support_new_diff_notes?
end
def set_original_position
self.original_position = self.position.dup
end
def set_line_code
self.line_code = self.position.line_code(self.project.repository)
end
def update_position def update_position
return unless supported? return unless supported?
return if for_commit? return if for_commit?
...@@ -87,25 +101,6 @@ class DiffNote < Note ...@@ -87,25 +101,6 @@ class DiffNote < Note
).execute(self) ).execute(self)
end end
def update_position!
update_position &&
Gitlab::Timeless.timeless(self, &:save)
end
private
def supported?
!self.for_merge_request? || self.noteable.support_new_diff_notes?
end
def set_original_position
self.original_position = self.position.dup
end
def set_line_code
self.line_code = self.position.line_code(self.project.repository)
end
def verify_supported def verify_supported
return if supported? return if supported?
......
...@@ -9,7 +9,7 @@ describe DiffNote, models: true do ...@@ -9,7 +9,7 @@ describe DiffNote, models: true do
let(:path) { "files/ruby/popen.rb" } let(:path) { "files/ruby/popen.rb" }
let(:position) do let!(:position) do
Gitlab::Diff::Position.new( Gitlab::Diff::Position.new(
old_path: path, old_path: path,
new_path: path, new_path: path,
...@@ -19,7 +19,7 @@ describe DiffNote, models: true do ...@@ -19,7 +19,7 @@ describe DiffNote, models: true do
) )
end end
let(:new_position) do let!(:new_position) do
Gitlab::Diff::Position.new( Gitlab::Diff::Position.new(
old_path: path, old_path: path,
new_path: path, new_path: path,
...@@ -129,56 +129,61 @@ describe DiffNote, models: true do ...@@ -129,56 +129,61 @@ describe DiffNote, models: true do
end end
end end
describe "#update_position" do describe "creation" do
describe "updating of position" do
context "when noteable is a commit" do context "when noteable is a commit" do
subject { create(:diff_note_on_commit, project: project, position: position) } let(:diff_note) { create(:diff_note_on_commit, project: project, position: position) }
it "doesn't use the DiffPositionUpdateService" do it "doesn't use the DiffPositionUpdateService" do
expect(Notes::DiffPositionUpdateService).not_to receive(:new) expect(Notes::DiffPositionUpdateService).not_to receive(:new)
subject.update_position diff_note
end end
it "doesn't update the position" do it "doesn't update the position" do
subject.update_position diff_note
expect(subject.original_position).to eq(position) expect(diff_note.original_position).to eq(position)
expect(subject.position).to eq(position) expect(diff_note.position).to eq(position)
end end
end end
context "when noteable is a merge request" do context "when noteable is a merge request" do
let(:diff_note) { create(:diff_note_on_merge_request, project: project, position: position, noteable: merge_request) }
context "when the note is active" do context "when the note is active" do
it "doesn't use the DiffPositionUpdateService" do it "doesn't use the DiffPositionUpdateService" do
expect(Notes::DiffPositionUpdateService).not_to receive(:new) expect(Notes::DiffPositionUpdateService).not_to receive(:new)
subject.update_position diff_note
end end
it "doesn't update the position" do it "doesn't update the position" do
subject.update_position diff_note
expect(subject.original_position).to eq(position) expect(diff_note.original_position).to eq(position)
expect(subject.position).to eq(position) expect(diff_note.position).to eq(position)
end end
end end
context "when the note is outdated" do context "when the note is outdated" do
before do before do
allow(subject.noteable).to receive(:diff_refs).and_return(commit.diff_refs) allow(merge_request).to receive(:diff_refs).and_return(commit.diff_refs)
end end
it "uses the DiffPositionUpdateService" do it "uses the DiffPositionUpdateService" do
service = instance_double("Notes::DiffPositionUpdateService")
expect(Notes::DiffPositionUpdateService).to receive(:new).with( expect(Notes::DiffPositionUpdateService).to receive(:new).with(
project, project,
nil, nil,
old_diff_refs: position.diff_refs, old_diff_refs: position.diff_refs,
new_diff_refs: commit.diff_refs, new_diff_refs: commit.diff_refs,
paths: [path] paths: [path]
).and_call_original ).and_return(service)
expect_any_instance_of(Notes::DiffPositionUpdateService).to receive(:execute).with(subject) expect(service).to receive(:execute)
subject.update_position diff_note
end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment