Commit df6f9fdd authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch...

Merge branch 'ce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requests' into 'master'

[CE-port] Extract EE specific files/lines for spec/services/merge_requests

See merge request gitlab-org/gitlab-ce!26977
parents dd019c2e 48bc3be6
...@@ -269,13 +269,11 @@ describe MergeRequests::RefreshService do ...@@ -269,13 +269,11 @@ describe MergeRequests::RefreshService do
end end
end end
context 'push to origin repo source branch when an MR was reopened' do context 'push to origin repo source branch' do
let(:refresh_service) { service.new(@project, @user) } let(:refresh_service) { service.new(@project, @user) }
let(:notification_service) { spy('notification_service') } let(:notification_service) { spy('notification_service') }
before do before do
@merge_request.update(state: :reopened)
allow(refresh_service).to receive(:execute_hooks) allow(refresh_service).to receive(:execute_hooks)
allow(NotificationService).to receive(:new) { notification_service } allow(NotificationService).to receive(:new) { notification_service }
refresh_service.execute(@oldrev, @newrev, 'refs/heads/master') refresh_service.execute(@oldrev, @newrev, 'refs/heads/master')
......
...@@ -405,7 +405,7 @@ describe MergeRequests::UpdateService, :mailer do ...@@ -405,7 +405,7 @@ describe MergeRequests::UpdateService, :mailer do
end end
end end
context 'when the issue is relabeled' do context 'when the merge request is relabeled' do
let!(:non_subscriber) { create(:user) } let!(:non_subscriber) { create(:user) }
let!(:subscriber) { create(:user) { |u| label.toggle_subscription(u, project) } } let!(:subscriber) { create(:user) { |u| label.toggle_subscription(u, project) } }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment