aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-09-15 06:56:16 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-15 09:23:12 +0800
commit0626adc0b4e1cf46b3194c048ce0a5cd5a602e49 (patch)
tree02810afa88dac0866d656cf49437874aa050ea3c /test
parentd3bd6236a872aa2cebe310a862631be48ca3c82c (diff)
parent8df005153befe65cb605175254f37d7207acc9c5 (diff)
downloadtangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.tar
tangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.tar.gz
tangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.tar.bz2
tangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.tar.lz
tangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.tar.xz
tangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.tar.zst
tangerine-wallet-browser-0626adc0b4e1cf46b3194c048ce0a5cd5a602e49.zip
Merge pull request #669 from MetaMask/Version-2.12.1
Version 2.12.1
Diffstat (limited to 'test')
-rw-r--r--test/unit/extension-test.js18
1 files changed, 10 insertions, 8 deletions
diff --git a/test/unit/extension-test.js b/test/unit/extension-test.js
index 86e1d887a..b0b72509b 100644
--- a/test/unit/extension-test.js
+++ b/test/unit/extension-test.js
@@ -1,8 +1,8 @@
var assert = require('assert')
var sinon = require('sinon')
const ethUtil = require('ethereumjs-util')
-GLOBAL.chrome = {}
-GLOBAL.browser = {}
+global.chrome = {}
+global.browser = {}
var path = require('path')
var Extension = require(path.join(__dirname, '..', '..', 'app', 'scripts', 'lib', 'extension-instance.js'))
@@ -13,19 +13,21 @@ describe('extension', function() {
const desiredResult = 'http://the-desired-result.io'
describe('in Chrome or Firefox', function() {
- GLOBAL.chrome.extension = {
+ global.chrome.extension = {
getURL: () => desiredResult
}
it('returns the desired result', function() {
+ console.dir(Extension)
const extension = new Extension()
+ console.dir(extension)
const result = extension.extension.getURL()
assert.equal(result, desiredResult)
})
})
describe('in Microsoft Edge', function() {
- GLOBAL.browser.extension = {
+ global.browser.extension = {
getURL: () => desiredResult
}
@@ -41,7 +43,7 @@ describe('extension', function() {
let extension
beforeEach(function() {
- GLOBAL.chrome = {
+ global.chrome = {
alarms: 'foo'
}
extension = new Extension()
@@ -58,9 +60,9 @@ describe('extension', function() {
beforeEach(function() {
realWindow = window
- window = GLOBAL
- GLOBAL.chrome = undefined
- GLOBAL.alarms = 'foo'
+ window = global
+ global.chrome = undefined
+ global.alarms = 'foo'
extension = new Extension()
})