From ecf262ceeaec5e28782e770323558b3638e61155 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Mon, 18 Aug 2014 10:08:10 -0700 Subject: [PATCH 1/4] add skipped tests to mocha index page --- test/index.html | 2 ++ test/test.storage.File.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/index.html b/test/index.html index a22e65d6c..46e3a63ce 100644 --- a/test/index.html +++ b/test/index.html @@ -25,6 +25,8 @@ + diff --git a/test/test.storage.File.js b/test/test.storage.File.js index 38e5789f1..c6bf0f558 100644 --- a/test/test.storage.File.js +++ b/test/test.storage.File.js @@ -3,6 +3,7 @@ var chai = require('chai'); var should = chai.should(); var Storage = require('../js/models/storage/File.js'); + var sinon = require('sinon'); var crypto = require('crypto'); var CryptoJS = require('node-cryptojs-aes').CryptoJS; @@ -202,3 +203,4 @@ describe('Storage/File', function() { }); }); + From 4e8fa24fc0e49f65e4a0d5d890f4ac1d8b69ccf7 Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Mon, 18 Aug 2014 11:36:25 -0700 Subject: [PATCH 2/4] fix miscellaneous karma console errors point to new bitcore bundle remove online.wav file usage, clean up console error remove unused crypto var from storage.File test, clean up console error --- js/services/video.js | 4 ---- karma.conf.js | 2 +- test/test.storage.File.js | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/js/services/video.js b/js/services/video.js index fce1ee2b6..cf7caeaa6 100644 --- a/js/services/video.js +++ b/js/services/video.js @@ -7,9 +7,6 @@ var Video = function() { this.mediaConnections = {}; this.localStream = null; - if (typeof Audio !== 'undefined') { - this.onlineSound = new Audio('sound/online.wav'); - } }; Video.prototype.setOwnPeer = function(peer, wallet, cb) { @@ -66,7 +63,6 @@ Video.prototype._addCall = function(mediaConnection, cb) { // Wait for stream on the call, then set peer video display mediaConnection.on('stream', function(stream) { - if (self.onlineSound) self.onlineSound.play(); cb(null, peerID, URL.createObjectURL(stream)); }); diff --git a/karma.conf.js b/karma.conf.js index 5b9d32890..48a1e18f3 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -29,7 +29,7 @@ module.exports = function(config) { 'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/peerjs/peer.js', - 'lib/bitcore/browser/bundle.js', + 'lib/bitcore-0.1.35-paypro.js', 'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/aes.js', diff --git a/test/test.storage.File.js b/test/test.storage.File.js index c6bf0f558..506e27993 100644 --- a/test/test.storage.File.js +++ b/test/test.storage.File.js @@ -5,7 +5,6 @@ var should = chai.should(); var Storage = require('../js/models/storage/File.js'); var sinon = require('sinon'); -var crypto = require('crypto'); var CryptoJS = require('node-cryptojs-aes').CryptoJS; var mock = require('mock-fs'); From 825f10c42f52d5a3a81250f4702ac214bbc3b5cc Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Mon, 18 Aug 2014 13:57:02 -0700 Subject: [PATCH 3/4] test to see if travis failure is related to new bundle --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 48a1e18f3..5b9d32890 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -29,7 +29,7 @@ module.exports = function(config) { 'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/peerjs/peer.js', - 'lib/bitcore-0.1.35-paypro.js', + 'lib/bitcore/browser/bundle.js', 'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/aes.js', From 139ca5ed8c6af5d356a2ce58e03265d2d2d9aa4e Mon Sep 17 00:00:00 2001 From: Gregg Zigler Date: Mon, 18 Aug 2014 14:08:49 -0700 Subject: [PATCH 4/4] karma should use new bitcore bundle --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 5b9d32890..48a1e18f3 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -29,7 +29,7 @@ module.exports = function(config) { 'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/peerjs/peer.js', - 'lib/bitcore/browser/bundle.js', + 'lib/bitcore-0.1.35-paypro.js', 'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/aes.js',