summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-16 21:18:38 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-20 12:10:26 -0200
commit7bed6ee21d1615b4625754f3af803496938ecef6 (patch)
treecc26ec53d423574aabf12cccdbe9dbcee3ba116e /spec/services/merge_requests
parent802bf6d012bf8edb8ea35429bd8b8cc4fe8e9bf1 (diff)
downloadgitlab-ce-7bed6ee21d1615b4625754f3af803496938ecef6.tar.gz
Marks pending tasks for an user as done when he edit a MR
Diffstat (limited to 'spec/services/merge_requests')
-rw-r--r--spec/services/merge_requests/update_service_spec.rb55
1 files changed, 54 insertions, 1 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 88853483784..77c661fd293 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -103,11 +103,35 @@ describe MergeRequests::UpdateService, services: true do
create(:pending_assigned_task, user: user, project: project, target: merge_request, author: user2)
end
+ context 'when the title change' do
+ before do
+ update_merge_request({ title: 'New title' })
+ end
+
+ it 'marks pending tasks as done' do
+ expect(pending_task.reload).to be_done
+ end
+ end
+
+ context 'when the description change' do
+ before do
+ update_merge_request({ description: 'Also please fix' })
+ end
+
+ it 'marks pending tasks as done' do
+ expect(pending_task.reload).to be_done
+ end
+ end
+
context 'when is reassigned' do
before do
update_merge_request({ assignee: user2 })
end
+ it 'marks previous assignee pending tasks as done' do
+ expect(pending_task.reload).to be_done
+ end
+
it 'creates a pending task for new assignee' do
attributes = {
project: project,
@@ -121,6 +145,36 @@ describe MergeRequests::UpdateService, services: true do
expect(Task.where(attributes).count).to eq 1
end
end
+
+ context 'when the milestone change' do
+ before do
+ update_merge_request({ milestone: create(:milestone) })
+ end
+
+ it 'marks pending tasks as done' do
+ expect(pending_task.reload).to be_done
+ end
+ end
+
+ context 'when the labels change' do
+ before do
+ update_merge_request({ label_ids: [label.id] })
+ end
+
+ it 'marks pending tasks as done' do
+ expect(pending_task.reload).to be_done
+ end
+ end
+
+ context 'when the target branch change' do
+ before do
+ update_merge_request({ target_branch: 'target' })
+ end
+
+ it 'marks pending tasks as done' do
+ expect(pending_task.reload).to be_done
+ end
+ end
end
context 'when MergeRequest has tasks' do
@@ -155,6 +209,5 @@ describe MergeRequests::UpdateService, services: true do
end
end
end
-
end
end