diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-04-11 11:26:44 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-04-11 11:26:44 +0300 |
commit | df6f9fdde92916b59a077ff76f163ecbb4b2c211 (patch) | |
tree | 0aa56ed907ea7c66e9b6a0349b717248ec6bf0f4 | |
parent | dd019c2e0b6e292fb55ed264c430eec4a13c0c6b (diff) | |
parent | 48bc3be69483c88f9720e4b1e8e23f92410415b2 (diff) |
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
-rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/merge_requests/update_service_spec.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 5ed06df7072..7063ca9ac14 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -269,13 +269,11 @@ describe MergeRequests::RefreshService do 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(:notification_service) { spy('notification_service') } before do - @merge_request.update(state: :reopened) - allow(refresh_service).to receive(:execute_hooks) allow(NotificationService).to receive(:new) { notification_service } refresh_service.execute(@oldrev, @newrev, 'refs/heads/master') diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index 0525899ebfa..15aea97ff29 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -405,7 +405,7 @@ describe MergeRequests::UpdateService, :mailer do end end - context 'when the issue is relabeled' do + context 'when the merge request is relabeled' do let!(:non_subscriber) { create(:user) } let!(:subscriber) { create(:user) { |u| label.toggle_subscription(u, project) } } |