diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 03:08:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-01 03:08:25 +0300 |
commit | e0a8496a094971dae746dae511b6a41d0cdc92c7 (patch) | |
tree | bec9f08c6fd696caf71e3da31c792d268bc93f9d /spec/factories | |
parent | 5609a96272636cf12b26bd805ad557a72f07ca73 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/notes.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index a7d4b4eb57a..3db4723a1e9 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -23,11 +23,6 @@ FactoryBot.define do factory :discussion_note_on_merge_request, traits: [:on_merge_request], class: 'DiscussionNote' do association :project, :repository - - trait :resolved do - resolved_at { Time.now } - resolved_by { create(:user) } - end end factory :track_mr_picking_note, traits: [:on_merge_request, :system] do @@ -76,11 +71,6 @@ FactoryBot.define do end end - trait :resolved do - resolved_at { Time.now } - resolved_by { create(:user) } - end - factory :image_diff_note_on_merge_request do position do build(:image_diff_position, @@ -155,6 +145,11 @@ FactoryBot.define do end end + trait :resolved do + resolved_at { Time.now } + resolved_by { association(:user) } + end + trait :system do system { true } end |