From 4c5468b40825debc2b7bbe08b975dedd2f7f1523 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 24 Jun 2020 15:08:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/validators/addressable_url_validator_spec.rb | 2 +- spec/validators/branch_filter_validator_spec.rb | 2 +- spec/validators/color_validator_spec.rb | 2 +- spec/validators/cron_freeze_period_timezone_validator_spec.rb | 2 +- spec/validators/cron_validator_spec.rb | 2 +- spec/validators/devise_email_validator_spec.rb | 2 +- spec/validators/js_regex_validator_spec.rb | 2 +- spec/validators/json_schema_validator_spec.rb | 2 +- spec/validators/named_ecdsa_key_validator_spec.rb | 2 +- spec/validators/namespace_path_validator_spec.rb | 2 +- spec/validators/project_path_validator_spec.rb | 2 +- spec/validators/public_url_validator_spec.rb | 2 +- spec/validators/qualified_domain_array_validator_spec.rb | 2 +- spec/validators/sha_validator_spec.rb | 2 +- spec/validators/system_hook_url_validator_spec.rb | 2 +- spec/validators/variable_duplicates_validator_spec.rb | 2 +- spec/validators/x509_certificate_credentials_validator_spec.rb | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'spec/validators') diff --git a/spec/validators/addressable_url_validator_spec.rb b/spec/validators/addressable_url_validator_spec.rb index 46b1bebb074..394ffc7bbea 100644 --- a/spec/validators/addressable_url_validator_spec.rb +++ b/spec/validators/addressable_url_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe AddressableUrlValidator do +RSpec.describe AddressableUrlValidator do let!(:badge) { build(:badge, link_url: 'http://www.example.com') } let(:validator) { described_class.new(validator_options.reverse_merge(attributes: [:link_url])) } diff --git a/spec/validators/branch_filter_validator_spec.rb b/spec/validators/branch_filter_validator_spec.rb index 957d1dd99bb..2d869fa674d 100644 --- a/spec/validators/branch_filter_validator_spec.rb +++ b/spec/validators/branch_filter_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe BranchFilterValidator do +RSpec.describe BranchFilterValidator do let(:validator) { described_class.new(attributes: [:push_events_branch_filter]) } let(:hook) { build(:project_hook) } diff --git a/spec/validators/color_validator_spec.rb b/spec/validators/color_validator_spec.rb index e5a38ac9372..bd77b3df182 100644 --- a/spec/validators/color_validator_spec.rb +++ b/spec/validators/color_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ColorValidator do +RSpec.describe ColorValidator do using RSpec::Parameterized::TableSyntax subject do diff --git a/spec/validators/cron_freeze_period_timezone_validator_spec.rb b/spec/validators/cron_freeze_period_timezone_validator_spec.rb index d283b89fa54..ee2541eb858 100644 --- a/spec/validators/cron_freeze_period_timezone_validator_spec.rb +++ b/spec/validators/cron_freeze_period_timezone_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CronFreezePeriodTimezoneValidator do +RSpec.describe CronFreezePeriodTimezoneValidator do using RSpec::Parameterized::TableSyntax subject { create :ci_freeze_period } diff --git a/spec/validators/cron_validator_spec.rb b/spec/validators/cron_validator_spec.rb index d6605610402..dff3b506b89 100644 --- a/spec/validators/cron_validator_spec.rb +++ b/spec/validators/cron_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe CronValidator do +RSpec.describe CronValidator do subject do Class.new do include ActiveModel::Model diff --git a/spec/validators/devise_email_validator_spec.rb b/spec/validators/devise_email_validator_spec.rb index 1dbf3f66cfd..29a008f858a 100644 --- a/spec/validators/devise_email_validator_spec.rb +++ b/spec/validators/devise_email_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe DeviseEmailValidator do +RSpec.describe DeviseEmailValidator do let!(:user) { build(:user, public_email: 'test@example.com') } subject { validator.validate(user) } diff --git a/spec/validators/js_regex_validator_spec.rb b/spec/validators/js_regex_validator_spec.rb index dcc5e7ed4e8..d34ab78b44f 100644 --- a/spec/validators/js_regex_validator_spec.rb +++ b/spec/validators/js_regex_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JsRegexValidator do +RSpec.describe JsRegexValidator do describe '#validates_each' do using RSpec::Parameterized::TableSyntax diff --git a/spec/validators/json_schema_validator_spec.rb b/spec/validators/json_schema_validator_spec.rb index 3e3a9c0e6a8..83eb0e2f3dd 100644 --- a/spec/validators/json_schema_validator_spec.rb +++ b/spec/validators/json_schema_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe JsonSchemaValidator do +RSpec.describe JsonSchemaValidator do describe '#validates_each' do let(:build_report_result) { build(:ci_build_report_result, :with_junit_success) } diff --git a/spec/validators/named_ecdsa_key_validator_spec.rb b/spec/validators/named_ecdsa_key_validator_spec.rb index 044c5b84a56..07326b7c55a 100644 --- a/spec/validators/named_ecdsa_key_validator_spec.rb +++ b/spec/validators/named_ecdsa_key_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamedEcdsaKeyValidator do +RSpec.describe NamedEcdsaKeyValidator do let(:validator) { described_class.new(attributes: [:key]) } let!(:domain) { build(:pages_domain) } diff --git a/spec/validators/namespace_path_validator_spec.rb b/spec/validators/namespace_path_validator_spec.rb index bc9834dbd2a..25940bba49a 100644 --- a/spec/validators/namespace_path_validator_spec.rb +++ b/spec/validators/namespace_path_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe NamespacePathValidator do +RSpec.describe NamespacePathValidator do let(:validator) { described_class.new(attributes: [:path]) } describe '.valid_path?' do diff --git a/spec/validators/project_path_validator_spec.rb b/spec/validators/project_path_validator_spec.rb index d6046f7214b..b92eb9106f6 100644 --- a/spec/validators/project_path_validator_spec.rb +++ b/spec/validators/project_path_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ProjectPathValidator do +RSpec.describe ProjectPathValidator do let(:validator) { described_class.new(attributes: [:path]) } describe '.valid_path?' do diff --git a/spec/validators/public_url_validator_spec.rb b/spec/validators/public_url_validator_spec.rb index c81232d9b78..4fa6ad0cd6f 100644 --- a/spec/validators/public_url_validator_spec.rb +++ b/spec/validators/public_url_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe PublicUrlValidator do +RSpec.describe PublicUrlValidator do include_examples 'url validator examples', AddressableUrlValidator::DEFAULT_OPTIONS[:schemes] include_examples 'public url validator examples', allow_local_requests_from_web_hooks_and_services: true end diff --git a/spec/validators/qualified_domain_array_validator_spec.rb b/spec/validators/qualified_domain_array_validator_spec.rb index 664048c7544..788e007970a 100644 --- a/spec/validators/qualified_domain_array_validator_spec.rb +++ b/spec/validators/qualified_domain_array_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe QualifiedDomainArrayValidator do +RSpec.describe QualifiedDomainArrayValidator do let(:qualified_domain_array_validator_test_class) do Class.new do include ActiveModel::Validations diff --git a/spec/validators/sha_validator_spec.rb b/spec/validators/sha_validator_spec.rb index 0a76570f65e..cf2c7a72883 100644 --- a/spec/validators/sha_validator_spec.rb +++ b/spec/validators/sha_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ShaValidator do +RSpec.describe ShaValidator do let(:validator) { described_class.new(attributes: [:base_commit_sha]) } let!(:merge_diff) { build(:merge_request_diff) } diff --git a/spec/validators/system_hook_url_validator_spec.rb b/spec/validators/system_hook_url_validator_spec.rb index 02384bbd1ce..445c0c7f67a 100644 --- a/spec/validators/system_hook_url_validator_spec.rb +++ b/spec/validators/system_hook_url_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SystemHookUrlValidator do +RSpec.describe SystemHookUrlValidator do include_examples 'url validator examples', AddressableUrlValidator::DEFAULT_OPTIONS[:schemes] include_examples 'public url validator examples', allow_local_requests_from_system_hooks: true end diff --git a/spec/validators/variable_duplicates_validator_spec.rb b/spec/validators/variable_duplicates_validator_spec.rb index f48ebee7e0e..acc47ff225f 100644 --- a/spec/validators/variable_duplicates_validator_spec.rb +++ b/spec/validators/variable_duplicates_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe VariableDuplicatesValidator do +RSpec.describe VariableDuplicatesValidator do let(:validator) { described_class.new(attributes: [:variables], **options) } describe '#validate_each' do diff --git a/spec/validators/x509_certificate_credentials_validator_spec.rb b/spec/validators/x509_certificate_credentials_validator_spec.rb index 2a5a322622f..9baa31c7257 100644 --- a/spec/validators/x509_certificate_credentials_validator_spec.rb +++ b/spec/validators/x509_certificate_credentials_validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe X509CertificateCredentialsValidator do +RSpec.describe X509CertificateCredentialsValidator do let(:certificate_data) { File.read('spec/fixtures/x509_certificate.crt') } let(:pkey_data) { File.read('spec/fixtures/x509_certificate_pk.key') } -- cgit v1.2.3