diff options
author | Douwe Maan <douwe@selenight.nl> | 2018-12-20 15:22:58 +0100 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2018-12-20 15:22:58 +0100 |
commit | f6dd6e566a2c656f97cf7c78df482bd4ec77d006 (patch) | |
tree | faabdccc290136b54d53a62799908288e3ebe0b3 | |
parent | f7ac8041f7ba3639085c26b4185eda00fd54a6e7 (diff) | |
download | gitlab-ce-f6dd6e566a2c656f97cf7c78df482bd4ec77d006.tar.gz |
Add image_diff_note_on_merge_request factory
-rw-r--r-- | spec/factories/notes.rb | 15 | ||||
-rw-r--r-- | spec/models/diff_note_spec.rb | 17 |
2 files changed, 16 insertions, 16 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 2d1f48bf249..c51f2f958f9 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -64,6 +64,21 @@ FactoryBot.define do resolved_at { Time.now } resolved_by { create(:user) } end + + factory :image_diff_note_on_merge_request do + position do + Gitlab::Diff::Position.new( + old_path: "files/images/any_image.png", + new_path: "files/images/any_image.png", + width: 10, + height: 10, + x: 1, + y: 1, + diff_refs: diff_refs, + position_type: "image" + ) + end + end end factory :diff_note_on_commit, traits: [:on_commit], class: DiffNote do diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb index 40ce8ab736a..fda00a693f0 100644 --- a/spec/models/diff_note_spec.rb +++ b/spec/models/diff_note_spec.rb @@ -337,24 +337,9 @@ describe DiffNote do end describe "image diff notes" do - let(:path) { "files/images/any_image.png" } - - let!(:position) do - Gitlab::Diff::Position.new( - old_path: path, - new_path: path, - width: 10, - height: 10, - x: 1, - y: 1, - diff_refs: merge_request.diff_refs, - position_type: "image" - ) - end + subject { build(:image_diff_note_on_merge_request, project: project, noteable: merge_request) } describe "validations" do - subject { build(:diff_note_on_merge_request, project: project, position: position, noteable: merge_request) } - it { is_expected.not_to validate_presence_of(:line_code) } it "does not validate diff line" do |