diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-10-02 19:10:31 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-10-02 21:19:57 +0300 |
| commit | 7a89e5dffc3d0c8f9b50f5a289bcdc37ab0df8e9 (patch) | |
| tree | 60e912a38e1673f41c5a8de5460d7f4322e60180 | |
| parent | f33961a33950f2feed8c72e68deaff57c022b3cc (diff) | |
Merge branch '33216-quarantine-ECDSA' into 'master'
Quarantine some ECDSA related tests due to bumping openssl
See merge request gitlab-org/gitlab!18016
| -rw-r--r-- | spec/models/pages_domain_spec.rb | 2 | ||||
| -rw-r--r-- | spec/validators/named_ecdsa_key_validator_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb index f745820a404..89a837dc812 100644 --- a/spec/models/pages_domain_spec.rb +++ b/spec/models/pages_domain_spec.rb @@ -160,7 +160,7 @@ describe PagesDomain do end context 'when curve is set explicitly by parameters' do - it 'adds errors to private key' do + it 'adds errors to private key', :quarantine do domain = build(:pages_domain, :explicit_ecdsa) expect(domain).to be_invalid diff --git a/spec/validators/named_ecdsa_key_validator_spec.rb b/spec/validators/named_ecdsa_key_validator_spec.rb index 044c5b84a56..7e3ceb1cbad 100644 --- a/spec/validators/named_ecdsa_key_validator_spec.rb +++ b/spec/validators/named_ecdsa_key_validator_spec.rb @@ -43,7 +43,7 @@ describe NamedEcdsaKeyValidator do context 'with ECDSA certificate with explicit curve params' do let(:value) { attributes_for(:pages_domain, :explicit_ecdsa)[:key] } - it 'adds errors' do + it 'adds errors', :quarantine do expect(value).to be_present subject |