diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2019-03-26 16:03:28 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-03-26 16:03:28 +0000 |
commit | ad985a7a28c19a085011afc7531f4f2c13783cb2 (patch) | |
tree | 56546845700e6551628d6ad79d46b74901a25460 /spec/javascripts/u2f | |
parent | 02b29ce8846760ac91ec560d737a38497a5b9155 (diff) | |
download | gitlab-ce-ad985a7a28c19a085011afc7531f4f2c13783cb2.tar.gz |
Merge branch 'winh-remove-sushi' into 'master'
Remove .raw from JavaScript fixture file names
Closes #59201
See merge request gitlab-org/gitlab-ce!26430
(cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918)
Diffstat (limited to 'spec/javascripts/u2f')
-rw-r--r-- | spec/javascripts/u2f/authenticate_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/u2f/register_spec.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/u2f/authenticate_spec.js b/spec/javascripts/u2f/authenticate_spec.js index ddb09811dda..8f9cb270729 100644 --- a/spec/javascripts/u2f/authenticate_spec.js +++ b/spec/javascripts/u2f/authenticate_spec.js @@ -4,10 +4,10 @@ import 'vendor/u2f'; import MockU2FDevice from './mock_u2f_device'; describe('U2FAuthenticate', function() { - preloadFixtures('u2f/authenticate.html.raw'); + preloadFixtures('u2f/authenticate.html'); beforeEach(() => { - loadFixtures('u2f/authenticate.html.raw'); + loadFixtures('u2f/authenticate.html'); this.u2fDevice = new MockU2FDevice(); this.container = $('#js-authenticate-u2f'); this.component = new U2FAuthenticate( diff --git a/spec/javascripts/u2f/register_spec.js b/spec/javascripts/u2f/register_spec.js index 261db3d66d7..a75ceca9f4c 100644 --- a/spec/javascripts/u2f/register_spec.js +++ b/spec/javascripts/u2f/register_spec.js @@ -4,10 +4,10 @@ import 'vendor/u2f'; import MockU2FDevice from './mock_u2f_device'; describe('U2FRegister', function() { - preloadFixtures('u2f/register.html.raw'); + preloadFixtures('u2f/register.html'); beforeEach(done => { - loadFixtures('u2f/register.html.raw'); + loadFixtures('u2f/register.html'); this.u2fDevice = new MockU2FDevice(); this.container = $('#js-register-u2f'); this.component = new U2FRegister(this.container, $('#js-register-u2f-templates'), {}, 'token'); |