diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 04:34:35 +0300 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-21 04:34:35 +0300 |
| commit | 8c449310e245083e72513ec3addd0d2355333127 (patch) | |
| tree | a9ca028f0f19cab55e9d3d8afeffd58cc85bf192 /spec/services/system_note_service_spec.rb | |
| parent | 52b4a74a73cbd0b13d46d0bcd9b063e36b520f05 (diff) | |
| parent | 5d8d72f18e9329978987fcb046467ceacd13c3ab (diff) | |
Merge branch 'master' into refactor-cluster-show-pagerefactor-cluster-show-page
Diffstat (limited to 'spec/services/system_note_service_spec.rb')
| -rw-r--r-- | spec/services/system_note_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index 47412110b4b..9025589ae0b 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -927,7 +927,7 @@ describe SystemNoteService do # We need a custom noteable in order to the shared examples to be green. let(:noteable) do mr = create(:merge_request, source_project: project) - mr.spend_time(duration: 360000, user: author) + mr.spend_time(duration: 360000, user_id: author.id) mr.save! mr end @@ -965,7 +965,7 @@ describe SystemNoteService do end def spend_time!(seconds) - noteable.spend_time(duration: seconds, user: author) + noteable.spend_time(duration: seconds, user_id: author.id) noteable.save! end end |