diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/support/helpers/javascript_fixtures_helpers.rb | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/support/helpers/javascript_fixtures_helpers.rb')
| -rw-r--r-- | spec/support/helpers/javascript_fixtures_helpers.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/support/helpers/javascript_fixtures_helpers.rb b/spec/support/helpers/javascript_fixtures_helpers.rb index 28375c1d51e..8fd8a548011 100644 --- a/spec/support/helpers/javascript_fixtures_helpers.rb +++ b/spec/support/helpers/javascript_fixtures_helpers.rb @@ -66,6 +66,14 @@ module JavaScriptFixturesHelpers File.write(full_fixture_path, fixture) end + def parse_html(fixture) + if respond_to?(:use_full_html) && public_send(:use_full_html) + Nokogiri::HTML::Document.parse(fixture) + else + Nokogiri::HTML::DocumentFragment.parse(fixture) + end + end + # Private: Prepare a response object for use as a frontend fixture # # response - response object to prepare @@ -76,7 +84,7 @@ module JavaScriptFixturesHelpers response_mime_type = Mime::Type.lookup(response.media_type) if response_mime_type.html? - doc = Nokogiri::HTML::DocumentFragment.parse(fixture) + doc = parse_html(fixture) link_tags = doc.css('link') link_tags.remove |