Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-21 12:09:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-21 12:09:34 +0300
commit5bd4297fd759a14ad9ab9232cb985d28bf44ac49 (patch)
tree6c970916f6e8ec494a5631f6defe41a5cd206f93 /spec/requests/api/suggestions_spec.rb
parent51da0a2d3976111b19d2996591e08bea5111beb3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/suggestions_spec.rb')
-rw-r--r--spec/requests/api/suggestions_spec.rb4
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