aboutsummaryrefslogtreecommitdiffstats
path: root/mascara/test
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-04-27 23:21:10 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-04-28 20:11:46 +0800
commit53537824f179038d227c9a340302d039ab151ede (patch)
treec25aed7d2fad00204f869be933941d5f5dfe9602 /mascara/test
parente7e0919d7c76c818590df4435db0152298298bd9 (diff)
downloadtangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.tar
tangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.tar.gz
tangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.tar.bz2
tangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.tar.lz
tangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.tar.xz
tangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.tar.zst
tangerine-wallet-browser-53537824f179038d227c9a340302d039ab151ede.zip
break out IndexDbController && Run the first time test on mascara
Diffstat (limited to 'mascara/test')
-rw-r--r--mascara/test/index.html3
-rw-r--r--mascara/test/lib/first-time.js4
-rw-r--r--mascara/test/util/mascara-test-helper.js2
-rw-r--r--mascara/test/window-load.js9
4 files changed, 10 insertions, 8 deletions
diff --git a/mascara/test/index.html b/mascara/test/index.html
index abd985121..6495c2cfc 100644
--- a/mascara/test/index.html
+++ b/mascara/test/index.html
@@ -14,7 +14,8 @@
<script src="./helpers.js"></script>
<script src="./test-bundle.js"></script>
<script src="/testem.js"></script>
- <script src="./bundle.js"></script>
+
<div id="app-content"></div>
+ <script src="./bundle.js"></script>
</body>
</html>
diff --git a/mascara/test/lib/first-time.js b/mascara/test/lib/first-time.js
index a3b2a41a5..8e33c8a06 100644
--- a/mascara/test/lib/first-time.js
+++ b/mascara/test/lib/first-time.js
@@ -6,8 +6,8 @@ QUnit.test('render init screen', function (assert) {
var done = assert.async()
let app
- wait().then(function() {
- app = $('#app-content')
+ wait(1000).then(function() {
+ app = $('#app-content').contents()
const recurseNotices = function () {
let button = app.find('button')
if (button.html() === 'Continue') {
diff --git a/mascara/test/util/mascara-test-helper.js b/mascara/test/util/mascara-test-helper.js
index 1ed576005..9cf4fa900 100644
--- a/mascara/test/util/mascara-test-helper.js
+++ b/mascara/test/util/mascara-test-helper.js
@@ -1,5 +1,5 @@
const EventEmitter = require('events')
-const IDB = require('../../../mascara/src/lib/index-db-controller')
+const IDB = require('idb-global')
const KEY = 'metamask-test-config'
module.exports = class Helper extends EventEmitter {
constructor () {
diff --git a/mascara/test/window-load.js b/mascara/test/window-load.js
index de79faaa1..41166c466 100644
--- a/mascara/test/window-load.js
+++ b/mascara/test/window-load.js
@@ -1,7 +1,8 @@
const Helper = require('./util/mascara-test-helper.js')
-debugger
+
window.addEventListener('load', () => {
- const helper = new Helper()
- helper.on('complete', () => require('../src/ui.js'))
- helper.tryToCleanContext()
+ // const helper = new Helper()
+ // helper.on('complete', () => require('../src/ui.js'))
+ // helper.tryToCleanContext()
+ require('../src/ui.js')
})