diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-12-11 14:17:11 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-12-11 14:17:11 +0100 |
commit | 9b9c62202c205e453de9fcaade9a5f598df4ba50 (patch) | |
tree | 393a4223ce2b712fcd4b00c976b9954a8a510ec1 /spec/factories/notes.rb | |
parent | de7901ff59b9a4070b1355ecc2098b33e3674de9 (diff) | |
parent | 95daf62bef31f28525cd044716d4b336decdd97a (diff) | |
download | gitlab-ce-9b9c62202c205e453de9fcaade9a5f598df4ba50.tar.gz |
Merge branch 'master' into qa/gb/selenium-handle-domain-sessions
* master: (93 commits)
Diffstat (limited to 'spec/factories/notes.rb')
-rw-r--r-- | spec/factories/notes.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index ab4ae123429..471bfb3213a 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -63,13 +63,19 @@ FactoryGirl.define do factory :diff_note_on_commit, traits: [:on_commit], class: DiffNote do association :project, :repository + + transient do + line_number 14 + diff_refs { project.commit(commit_id).try(:diff_refs) } + end + position do Gitlab::Diff::Position.new( old_path: "files/ruby/popen.rb", new_path: "files/ruby/popen.rb", old_line: nil, - new_line: 14, - diff_refs: project.commit(commit_id).try(:diff_refs) + new_line: line_number, + diff_refs: diff_refs ) end end |