diff options
Diffstat (limited to 'spec/services/merge_requests/rebase_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/rebase_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb index e671bbf2cd6..a47e626666b 100644 --- a/spec/services/merge_requests/rebase_service_spec.rb +++ b/spec/services/merge_requests/rebase_service_spec.rb @@ -82,7 +82,7 @@ RSpec.describe MergeRequests::RebaseService do context 'with a pre-receive failure' do let(:pre_receive_error) { "Commit message does not follow the pattern 'ACME'" } - let(:merge_error) { "Something went wrong during the rebase pre-receive hook: #{pre_receive_error}." } + let(:merge_error) { "The rebase pre-receive hook failed: #{pre_receive_error}." } before do allow(repository).to receive(:gitaly_operation_client).and_raise(Gitlab::Git::PreReceiveError, "GitLab: #{pre_receive_error}") |