From 8da1b2ebcf771ff5e2955675ff085a31e81c5b4c Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 28 Oct 2014 15:57:49 -0300 Subject: [PATCH] fixing karma tests --- js/util/crypto.js | 2 +- karma.conf.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/util/crypto.js b/js/util/crypto.js index 1ae871cbf..e5476082a 100644 --- a/js/util/crypto.js +++ b/js/util/crypto.js @@ -1,7 +1,7 @@ /** * Small module for some helpers that wrap sjcl with some good practices. */ -var sjcl = require('../../lib/sjcl'); +var sjcl = require('sjcl'); var log = require('../log.js'); var _ = require('lodash'); diff --git a/karma.conf.js b/karma.conf.js index a19821c59..c8df66d07 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -46,6 +46,7 @@ module.exports = function(config) { 'js/log.js', 'js/routes.js', 'js/services/*.js', + 'js/util/*.js', 'js/directives.js', 'js/filters.js', 'js/controllers/*.js', @@ -55,7 +56,6 @@ module.exports = function(config) { 'test/mocks/FakeWallet.js', 'test/mocks/FakeBlockchainSocket.js', 'test/mocks/FakePayProServer.js', - 'test/mocks/FakeLocalStorage.js', 'test/mocha.conf.js', diff --git a/package.json b/package.json index 99468af45..f9909706b 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "mocha": "^1.18.2", "mocha-lcov-reporter": "^0.0.1", "mock-fs": "^2.3.1", - "node-cryptojs-aes": "^0.4.0", + "sjcl": "*", "request": "^2.40.0", "shelljs": "^0.3.0", "sinon": "^1.9.1",