diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-12 21:43:20 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-12 21:43:20 +0300 |
commit | 8d7951d879d13894dcc1fd5d845c8d844bee321a (patch) | |
tree | ee1a7cc0f89edb8f79190ee66832c6fba2159d7f /spec/services/merge_requests/update_service_spec.rb | |
parent | e889b4e8c2f9e31ceac6e456793de357d96067f7 (diff) | |
parent | 7360703aabe448af7fec36cb806a5f3680afefd1 (diff) |
Merge branch '32834-task-note-only' into 'master'
Prevent Description Change Notes When Toggling Tasks
Closes #32834
See merge request !12057
Diffstat (limited to 'spec/services/merge_requests/update_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index d371fc68312..091c193aaa6 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -30,6 +30,13 @@ describe MergeRequests::UpdateService, services: true do end end + def find_notes(action) + @merge_request + .notes + .joins(:system_note_metadata) + .where(system_note_metadata: { action: action }) + end + def update_merge_request(opts) @merge_request = MergeRequests::UpdateService.new(project, user, opts).execute(merge_request) @merge_request.reload @@ -394,6 +401,9 @@ describe MergeRequests::UpdateService, services: true do expect(note1).not_to be_nil expect(note2).not_to be_nil + + description_notes = find_notes('description') + expect(description_notes.length).to eq(1) end end @@ -409,6 +419,9 @@ describe MergeRequests::UpdateService, services: true do expect(note1).not_to be_nil expect(note2).not_to be_nil + + description_notes = find_notes('description') + expect(description_notes.length).to eq(1) end end end |