anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1121 from greggzigler/fix_karma

Browse source 
Clean up karma console errors.
Chrome 36.0.1985 (Mac OS X 10.9.4): Executed 82 of 82 SUCCESS (0.47 secs / 0.141 secs)
This commit is contained in:
Matias Alejo Garcia 2014-08-19 10:49:26 -04:00
commit 2ea8ae38f0
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/services/video.js
View file

@ -7,9 +7,6 @@ var Video = function() {
this.mediaConnections = {}; this.mediaConnections = {};
this.localStream = null; this.localStream = null;
if (typeof Audio !== 'undefined') {
this.onlineSound = new Audio('sound/online.wav');
}
}; };
Video.prototype.setOwnPeer = function(peer, wallet, cb) { 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 // Wait for stream on the call, then set peer video display
mediaConnection.on('stream', function(stream) { mediaConnection.on('stream', function(stream) {
if (self.onlineSound) self.onlineSound.play();
cb(null, peerID, URL.createObjectURL(stream)); cb(null, peerID, URL.createObjectURL(stream));
}); });

2
karma.conf.js
View file

@ -29,7 +29,7 @@ module.exports = function(config) {
'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation.min.js',
'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js',
'lib/peerjs/peer.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/sha256.js',
'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/pbkdf2.js',
'lib/crypto-js/rollups/aes.js', 'lib/crypto-js/rollups/aes.js',

2
test/index.html
View file

@ -25,6 +25,8 @@
<script src="test.Wallet.js"></script> <script src="test.Wallet.js"></script>
<script src="test.WalletFactory.js"></script> <script src="test.WalletFactory.js"></script>
<script src="test.performance.js"></script> <script src="test.performance.js"></script>
<!--
-->
<script> <script>
mocha.run(); mocha.run();
</script> </script>

3
test/test.storage.File.js
View file

@ -3,8 +3,8 @@
var chai = require('chai'); var chai = require('chai');
var should = chai.should(); var should = chai.should();
var Storage = require('../js/models/storage/File.js'); var Storage = require('../js/models/storage/File.js');
var sinon = require('sinon'); var sinon = require('sinon');
var crypto = require('crypto');
var CryptoJS = require('node-cryptojs-aes').CryptoJS; var CryptoJS = require('node-cryptojs-aes').CryptoJS;
var mock = require('mock-fs'); var mock = require('mock-fs');
@ -202,3 +202,4 @@ describe('Storage/File', function() {
}); });
}); });