diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 18:06:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 18:06:20 +0000 |
commit | de2ae3154f4ba1c23eeaa4ace41177ecd9b6005a (patch) | |
tree | e4b82deecd51d637533b507dc8a21b410069c093 /spec | |
parent | 4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3 (diff) | |
download | gitlab-ce-de2ae3154f4ba1c23eeaa4ace41177ecd9b6005a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/banzai/filter/table_of_contents_filter_spec.rb | 4 | ||||
-rw-r--r-- | spec/models/pages_domain_spec.rb | 2 | ||||
-rw-r--r-- | spec/validators/named_ecdsa_key_validator_spec.rb | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb index 5ca3c722e3e..05ef77c811a 100644 --- a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb +++ b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb @@ -82,7 +82,9 @@ describe Banzai::Filter::TableOfContentsFilter do it 'supports Unicode' do doc = filter(header(1, '한글')) expect(doc.css('h1 a').first.attr('id')).to eq 'user-content-한글' - expect(doc.css('h1 a').first.attr('href')).to eq '#한글' + # check that we encode the href to avoid issues with the + # ExternalLinkFilter (see https://gitlab.com/gitlab-org/gitlab/issues/26210) + expect(doc.css('h1 a').first.attr('href')).to eq "##{CGI.escape('한글')}" end end end diff --git a/spec/models/pages_domain_spec.rb b/spec/models/pages_domain_spec.rb index 2e7b2b88432..95abe8fe060 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 |