diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
commit | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (patch) | |
tree | 851d65a09efbffa114c9a273e590d55cfb1436ab /spec/support | |
parent | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/controllers/project_import_rate_limiter_shared_examples.rb | 2 | ||||
-rw-r--r-- | spec/support/helpers/api_helpers.rb | 2 | ||||
-rw-r--r-- | spec/support/helpers/rack_attack_spec_helpers.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/controllers/project_import_rate_limiter_shared_examples.rb b/spec/support/controllers/project_import_rate_limiter_shared_examples.rb index 336f801f923..9a543dd00d4 100644 --- a/spec/support/controllers/project_import_rate_limiter_shared_examples.rb +++ b/spec/support/controllers/project_import_rate_limiter_shared_examples.rb @@ -16,7 +16,7 @@ shared_examples 'project import rate limiter' do post :create, params: {} expect(flash[:alert]).to eq('This endpoint has been requested too many times. Try again later.') - expect(response).to have_gitlab_http_status(302) + expect(response).to have_gitlab_http_status(:found) end end end diff --git a/spec/support/helpers/api_helpers.rb b/spec/support/helpers/api_helpers.rb index aff0f87b6e4..f22ef340a5f 100644 --- a/spec/support/helpers/api_helpers.rb +++ b/spec/support/helpers/api_helpers.rb @@ -41,7 +41,7 @@ module ApiHelpers end def expect_paginated_array_response(items) - expect(response).to have_gitlab_http_status(200) + expect(response).to have_gitlab_http_status(:ok) expect(response).to include_pagination_headers expect(json_response).to be_an Array expect(json_response.map { |item| item['id'] }).to eq(Array(items)) diff --git a/spec/support/helpers/rack_attack_spec_helpers.rb b/spec/support/helpers/rack_attack_spec_helpers.rb index 234271ba1c0..e0cedb5a57b 100644 --- a/spec/support/helpers/rack_attack_spec_helpers.rb +++ b/spec/support/helpers/rack_attack_spec_helpers.rb @@ -28,6 +28,6 @@ module RackAttackSpecHelpers def expect_rejection(&block) yield - expect(response).to have_http_status(429) + expect(response).to have_gitlab_http_status(:too_many_requests) end end |