summaryrefslogtreecommitdiff
path: root/spec/javascripts/u2f
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-12-29 15:42:48 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-10 12:30:40 -0600
commit7c47cc94c5d7425583db3610c85cb150df601a91 (patch)
tree2544c6ac133e4abba79dcacb2a10df24e79224d6 /spec/javascripts/u2f
parent3eb8569778ce2559eedab706f6f901238e39b355 (diff)
downloadgitlab-ce-7c47cc94c5d7425583db3610c85cb150df601a91.tar.gz
Swapped out teaspoon for karma
Diffstat (limited to 'spec/javascripts/u2f')
-rw-r--r--spec/javascripts/u2f/authenticate_spec.js11
-rw-r--r--spec/javascripts/u2f/register_spec.js11
2 files changed, 12 insertions, 10 deletions
diff --git a/spec/javascripts/u2f/authenticate_spec.js b/spec/javascripts/u2f/authenticate_spec.js
index dc2f4967985..9cd59fb019e 100644
--- a/spec/javascripts/u2f/authenticate_spec.js
+++ b/spec/javascripts/u2f/authenticate_spec.js
@@ -2,11 +2,12 @@
/* global MockU2FDevice */
/* global U2FAuthenticate */
-/*= require u2f/authenticate */
-/*= require u2f/util */
-/*= require u2f/error */
-/*= require u2f */
-/*= require ./mock_u2f_device */
+require('./spec_helper');
+require('u2f/authenticate');
+require('u2f/util');
+require('u2f/error');
+require('vendor/u2f');
+require('./mock_u2f_device');
(function() {
describe('U2FAuthenticate', function() {
diff --git a/spec/javascripts/u2f/register_spec.js b/spec/javascripts/u2f/register_spec.js
index ab4c5edd044..36989bee2d2 100644
--- a/spec/javascripts/u2f/register_spec.js
+++ b/spec/javascripts/u2f/register_spec.js
@@ -2,11 +2,12 @@
/* global MockU2FDevice */
/* global U2FRegister */
-/*= require u2f/register */
-/*= require u2f/util */
-/*= require u2f/error */
-/*= require u2f */
-/*= require ./mock_u2f_device */
+require('./spec_helper');
+require('u2f/register');
+require('u2f/util');
+require('u2f/error');
+require('vendor/u2f');
+require('./mock_u2f_device');
(function() {
describe('U2FRegister', function() {