From 1c264deb2c053a71423914232b3149d0025974df Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 14 Aug 2014 12:29:11 -0400 Subject: [PATCH] test: use is_browser instead of try/catch to detect browser. --- test/mocks/FakePayProServer.js | 4 ++-- test/mocks/FakeWallet.js | 6 ++++-- test/test.TxProposal.js | 6 ++++-- test/test.storage.LocalEncrypted.js | 6 ++++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/test/mocks/FakePayProServer.js b/test/mocks/FakePayProServer.js index 3fbc05365..16f6dbafb 100644 --- a/test/mocks/FakePayProServer.js +++ b/test/mocks/FakePayProServer.js @@ -5,9 +5,9 @@ var is_browser = typeof process == 'undefined' var bitcore = bitcore || require('bitcore'); var Buffer = bitcore.Buffer; var PayPro = bitcore.PayPro; -try { +if (is_browser) { var copay = require('copay'); //browser -} catch (e) { +} else { var copay = require('../../copay'); //node } var Wallet = copay.Wallet; diff --git a/test/mocks/FakeWallet.js b/test/mocks/FakeWallet.js index d83829e5a..58d58a458 100644 --- a/test/mocks/FakeWallet.js +++ b/test/mocks/FakeWallet.js @@ -1,7 +1,9 @@ -try { +var is_browser = typeof process == 'undefined' + || typeof process.versions === 'undefined'; +if (is_browser) { var copay = require('copay'); //browser -} catch (e) { +} else { var copay = require('../copay'); //node } var Wallet = copay.Wallet; diff --git a/test/test.TxProposal.js b/test/test.TxProposal.js index 3ac2f310d..1ac3a1981 100644 --- a/test/test.TxProposal.js +++ b/test/test.TxProposal.js @@ -13,9 +13,11 @@ var TransactionBuilder = bitcore.TransactionBuilder; var util = bitcore.util; var networks = bitcore.networks; var sinon = require('sinon'); -try { +var is_browser = typeof process == 'undefined' + || typeof process.versions === 'undefined'; +if (is_browser) { var copay = require('copay'); //browser -} catch (e) { +} else { var copay = require('../copay'); //node } diff --git a/test/test.storage.LocalEncrypted.js b/test/test.storage.LocalEncrypted.js index 45aad70bd..a25f6cc92 100644 --- a/test/test.storage.LocalEncrypted.js +++ b/test/test.storage.LocalEncrypted.js @@ -19,9 +19,11 @@ CryptoJS.AES.decrypt = function(a) { 'use strict'; var chai = chai || require('chai'); var should = chai.should(); -try { +var is_browser = typeof process == 'undefined' + || typeof process.versions === 'undefined'; +if (is_browser) { var copay = require('copay'); //browser -} catch (e) { +} else { var copay = require('../copay'); //node } var LocalEncrypted = copay.StorageLocalEncrypted;