diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-17 15:11:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-17 15:11:55 +0300 |
commit | c609c898ff7f42c3d72a1c6d619e1ff786f5e18a (patch) | |
tree | 8886ffa1ab9e2eb176f66209dd1c34ee1ecba3ea /spec/support | |
parent | b1a7b1b7e33ae747119d89e5a6697b361df4d947 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/database/cross-database-modification-allowlist.yml | 2 | ||||
-rw-r--r-- | spec/support/flaky_tests.rb | 2 | ||||
-rw-r--r-- | spec/support/shared_examples/requests/api/status_shared_examples.rb | 18 |
3 files changed, 19 insertions, 3 deletions
diff --git a/spec/support/database/cross-database-modification-allowlist.yml b/spec/support/database/cross-database-modification-allowlist.yml index e4dc958830f..d05812a64eb 100644 --- a/spec/support/database/cross-database-modification-allowlist.yml +++ b/spec/support/database/cross-database-modification-allowlist.yml @@ -13,7 +13,6 @@ - "./ee/spec/services/ci/subscribe_bridge_service_spec.rb" - "./ee/spec/services/deployments/auto_rollback_service_spec.rb" - "./ee/spec/services/ee/ci/job_artifacts/destroy_all_expired_service_spec.rb" -- "./ee/spec/services/ee/ci/job_artifacts/destroy_batch_service_spec.rb" - "./ee/spec/services/ee/users/destroy_service_spec.rb" - "./ee/spec/services/projects/transfer_service_spec.rb" - "./ee/spec/services/security/security_orchestration_policies/rule_schedule_service_spec.rb" @@ -76,7 +75,6 @@ - "./spec/services/ci/expire_pipeline_cache_service_spec.rb" - "./spec/services/ci/job_artifacts/destroy_all_expired_service_spec.rb" - "./spec/services/ci/job_artifacts/destroy_associations_service_spec.rb" -- "./spec/services/ci/job_artifacts/destroy_batch_service_spec.rb" - "./spec/services/ci/pipeline_bridge_status_service_spec.rb" - "./spec/services/ci/pipelines/add_job_service_spec.rb" - "./spec/services/ci/retry_build_service_spec.rb" diff --git a/spec/support/flaky_tests.rb b/spec/support/flaky_tests.rb index 535df64f890..30a064d8705 100644 --- a/spec/support/flaky_tests.rb +++ b/spec/support/flaky_tests.rb @@ -4,7 +4,7 @@ return unless ENV['CI'] return unless ENV['SKIP_FLAKY_TESTS_AUTOMATICALLY'] == "true" return if ENV['CI_MERGE_REQUEST_LABELS'].to_s.include?('pipeline:run-flaky-tests') -require_relative '../tooling/rspec_flaky/report' +require_relative '../../tooling/rspec_flaky/report' RSpec.configure do |config| $flaky_test_example_ids = begin # rubocop:disable Style/GlobalVars diff --git a/spec/support/shared_examples/requests/api/status_shared_examples.rb b/spec/support/shared_examples/requests/api/status_shared_examples.rb index b2d50599264..40843ccbd15 100644 --- a/spec/support/shared_examples/requests/api/status_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/status_shared_examples.rb @@ -77,6 +77,24 @@ RSpec.shared_examples '412 response' do end end +RSpec.shared_examples '422 response' do + let(:message) { nil } + + before do + # Fires the request + request + end + + it 'returns 422' do + expect(response).to have_gitlab_http_status(:unprocessable_entity) + expect(json_response).to be_an Object + + if message.present? + expect(json_response['message']).to eq(message) + end + end +end + RSpec.shared_examples '503 response' do before do # Fires the request |