Merge branch 'improve-mr-services' into 'master'

Improve MR services

Merge branch 'improve-mr-services' into 'master'
Improve MR services
Dmitriy Zaporozhets
2 parents 8cc5e855 860f159d
Showing 4 changed files with 108 additions and 0 deletions Show diff stats
app/services/merge_requests/base_service.rb
spec/services/merge_requests/close_service_spec.rb
spec/services/merge_requests/create_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
@@ -3,6 +3,10 @@ module MergeRequests
  
     private
  
+    def create_assignee_note(merge_request)
+      Note.create_assignee_change_note(merge_request, merge_request.project, current_user, merge_request.assignee)
+    end
+
     def create_note(merge_request)
       Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
     end
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe MergeRequests::CloseService do
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:merge_request) { create(:merge_request, assignee: user2) }
+  let(:project) { merge_request.project }
+
+  before do
+    project.team << [user, :master]
+    project.team << [user2, :developer]
+  end
+
+  describe :execute do
+    context "valid params" do
+      before do
+        @merge_request = MergeRequests::CloseService.new(project, user, {}).execute(merge_request)
+      end
+
+      it { @merge_request.should be_valid }
+      it { @merge_request.should be_closed }
+
+      it 'should send email to user2 about assign of new merge_request' do
+        email = ActionMailer::Base.deliveries.last
+        email.to.first.should == user2.email
+        email.subject.should include(merge_request.title)
+      end
+
+      it 'should create system note about merge_request reassign' do
+        note = @merge_request.notes.last
+        note.note.should include "Status changed to closed"
+      end
+    end
+  end
+end
@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe MergeRequests::CreateService do
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  describe :execute do
+    context "valid params" do
+      before do
+        project.team << [user, :master]
+        opts = {
+          title: 'Awesome merge_request',
+          description: 'please fix',
+          source_branch: 'stable',
+          target_branch: 'master'
+        }
+
+        @merge_request = MergeRequests::CreateService.new(project, user, opts).execute
+      end
+
+      it { @merge_request.should be_valid }
+      it { @merge_request.title.should == 'Awesome merge_request' }
+    end
+  end
+end
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe MergeRequests::UpdateService do
+  let(:user) { create(:user) }
+  let(:user2) { create(:user) }
+  let(:merge_request) { create(:merge_request, :simple) }
+  let(:project) { merge_request.project }
+
+  before do
+    project.team << [user, :master]
+    project.team << [user2, :developer]
+  end
+
+  describe :execute do
+    context "valid params" do
+      before do
+        opts = {
+          title: 'New title',
+          description: 'Also please fix',
+          assignee_id: user2.id,
+          state_event: 'close'
+        }
+
+        @merge_request = MergeRequests::UpdateService.new(project, user, opts).execute(merge_request)
+      end
+
+      it { @merge_request.should be_valid }
+      it { @merge_request.title.should == 'New title' }
+      it { @merge_request.assignee.should == user2 }
+      it { @merge_request.should be_closed }
+
+      it 'should send email to user2 about assign of new merge_request' do
+        email = ActionMailer::Base.deliveries.last
+        email.to.first.should == user2.email
+        email.subject.should include(merge_request.title)
+      end
+
+      it 'should create system note about merge_request reassign' do
+        note = @merge_request.notes.last
+        note.note.should include "Reassigned to \@#{user2.username}"
+      end
+    end
+  end
+end
...	...	@@ -3,6 +3,10 @@ module MergeRequests
3	3
4	4	private
5	5
	6	+ def create_assignee_note(merge_request)
	7	+ Note.create_assignee_change_note(merge_request, merge_request.project, current_user, merge_request.assignee)
	8	+ end
	9	+
6	10	def create_note(merge_request)
7	11	Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
8	12	end
...	...
...	...	@@ -0,0 +1,35 @@
	1	+require 'spec_helper'
	2	+
	3	+describe MergeRequests::CloseService do
	4	+ let(:user) { create(:user) }
	5	+ let(:user2) { create(:user) }
	6	+ let(:merge_request) { create(:merge_request, assignee: user2) }
	7	+ let(:project) { merge_request.project }
	8	+
	9	+ before do
	10	+ project.team << [user, :master]
	11	+ project.team << [user2, :developer]
	12	+ end
	13	+
	14	+ describe :execute do
	15	+ context "valid params" do
	16	+ before do
	17	+ @merge_request = MergeRequests::CloseService.new(project, user, {}).execute(merge_request)
	18	+ end
	19	+
	20	+ it { @merge_request.should be_valid }
	21	+ it { @merge_request.should be_closed }
	22	+
	23	+ it 'should send email to user2 about assign of new merge_request' do
	24	+ email = ActionMailer::Base.deliveries.last
	25	+ email.to.first.should == user2.email
	26	+ email.subject.should include(merge_request.title)
	27	+ end
	28	+
	29	+ it 'should create system note about merge_request reassign' do
	30	+ note = @merge_request.notes.last
	31	+ note.note.should include "Status changed to closed"
	32	+ end
	33	+ end
	34	+ end
	35	+end
...	...
...	...	@@ -0,0 +1,25 @@
	1	+require 'spec_helper'
	2	+
	3	+describe MergeRequests::CreateService do
	4	+ let(:project) { create(:project) }
	5	+ let(:user) { create(:user) }
	6	+
	7	+ describe :execute do
	8	+ context "valid params" do
	9	+ before do
	10	+ project.team << [user, :master]
	11	+ opts = {
	12	+ title: 'Awesome merge_request',
	13	+ description: 'please fix',
	14	+ source_branch: 'stable',
	15	+ target_branch: 'master'
	16	+ }
	17	+
	18	+ @merge_request = MergeRequests::CreateService.new(project, user, opts).execute
	19	+ end
	20	+
	21	+ it { @merge_request.should be_valid }
	22	+ it { @merge_request.title.should == 'Awesome merge_request' }
	23	+ end
	24	+ end
	25	+end
...	...
...	...	@@ -0,0 +1,44 @@
	1	+require 'spec_helper'
	2	+
	3	+describe MergeRequests::UpdateService do
	4	+ let(:user) { create(:user) }
	5	+ let(:user2) { create(:user) }
	6	+ let(:merge_request) { create(:merge_request, :simple) }
	7	+ let(:project) { merge_request.project }
	8	+
	9	+ before do
	10	+ project.team << [user, :master]
	11	+ project.team << [user2, :developer]
	12	+ end
	13	+
	14	+ describe :execute do
	15	+ context "valid params" do
	16	+ before do
	17	+ opts = {
	18	+ title: 'New title',
	19	+ description: 'Also please fix',
	20	+ assignee_id: user2.id,
	21	+ state_event: 'close'
	22	+ }
	23	+
	24	+ @merge_request = MergeRequests::UpdateService.new(project, user, opts).execute(merge_request)
	25	+ end
	26	+
	27	+ it { @merge_request.should be_valid }
	28	+ it { @merge_request.title.should == 'New title' }
	29	+ it { @merge_request.assignee.should == user2 }
	30	+ it { @merge_request.should be_closed }
	31	+
	32	+ it 'should send email to user2 about assign of new merge_request' do
	33	+ email = ActionMailer::Base.deliveries.last
	34	+ email.to.first.should == user2.email
	35	+ email.subject.should include(merge_request.title)
	36	+ end
	37	+
	38	+ it 'should create system note about merge_request reassign' do
	39	+ note = @merge_request.notes.last
	40	+ note.note.should include "Reassigned to \@#{user2.username}"
	41	+ end
	42	+ end
	43	+ end
	44	+end
...	...