diff options
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index 127c94763d9..ecb856bd1a4 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -388,7 +388,7 @@ RSpec.describe MergeRequests::MergeService do end it 'logs and saves error if there is an error when squashing' do - error_message = 'Failed to squash. Should be done manually' + error_message = 'Squashing failed: Squash the commits locally, resolve any conflicts, then push the branch.' allow_any_instance_of(MergeRequests::SquashService).to receive(:squash!).and_return(nil) merge_request.update!(squash: true) |