From 48bc3be69483c88f9720e4b1e8e23f92410415b2 Mon Sep 17 00:00:00 2001 From: Heinrich Lee Yu Date: Thu, 4 Apr 2019 15:20:43 +0800 Subject: Fix naming of test ALso makes it consistent with EE --- spec/services/merge_requests/refresh_service_spec.rb | 4 +--- spec/services/merge_requests/update_service_spec.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'spec/services/merge_requests') 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) } } -- cgit v1.2.3