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

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')

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) } }