diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/requests/api/suggestions_spec.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/requests/api/suggestions_spec.rb')
-rw-r--r-- | spec/requests/api/suggestions_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/suggestions_spec.rb b/spec/requests/api/suggestions_spec.rb index 34d3c54d700..78a2688ac5e 100644 --- a/spec/requests/api/suggestions_spec.rb +++ b/spec/requests/api/suggestions_spec.rb @@ -74,7 +74,7 @@ RSpec.describe API::Suggestions do put api(url, user) expect(response).to have_gitlab_http_status(:bad_request) - expect(json_response).to eq({ 'message' => 'A suggestion is not applicable.' }) + expect(json_response).to eq({ 'message' => "Can't apply as this line was changed in a more recent version." }) end end @@ -133,7 +133,7 @@ RSpec.describe API::Suggestions do params: { ids: [suggestion.id, unappliable_suggestion.id] } expect(response).to have_gitlab_http_status(:bad_request) - expect(json_response).to eq({ 'message' => 'A suggestion is not applicable.' }) + expect(json_response).to eq({ 'message' => "Can't apply as this line was changed in a more recent version." }) end end |