diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-01-05 23:26:21 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-01-05 23:26:21 +0000 |
| commit | 81dfb1aa0259b3d13a8e4bea3ac6fae01e463a9f (patch) | |
| tree | caaa4769c1d50ffc8623a90fa4d0a9fe6d28001a /spec/support | |
| parent | 76bb8ed48ac88210e426e751ff4c3186e3b0d214 (diff) | |
| parent | df5223de61253ba1511ae3ecbb7c447819177ecb (diff) | |
| download | gitlab-ce-81dfb1aa0259b3d13a8e4bea3ac6fae01e463a9f.tar.gz | |
Merge branch 'fix-u2f-fixtures' into 'master'
Replace static JavaScript fixtures for u2f
See merge request !8426
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/javascript_fixtures_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/javascript_fixtures_helpers.rb b/spec/support/javascript_fixtures_helpers.rb index 99e98eebdb4..d15aac61b18 100644 --- a/spec/support/javascript_fixtures_helpers.rb +++ b/spec/support/javascript_fixtures_helpers.rb @@ -26,6 +26,7 @@ module JavaScriptFixturesHelpers def store_frontend_fixture(response, fixture_file_name) fixture_file_name = File.expand_path(fixture_file_name, FIXTURE_PATH) fixture = response.body + fixture.force_encoding("utf-8") response_mime_type = Mime::Type.lookup(response.content_type) if response_mime_type.html? @@ -34,7 +35,7 @@ module JavaScriptFixturesHelpers link_tags = doc.css('link') link_tags.remove - scripts = doc.css('script') + scripts = doc.css("script:not([type='text/template'])") scripts.remove fixture = doc.to_html |