aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-07-23 07:52:01 +0800
committerDan Finlay <dan@danfinlay.com>2016-07-23 07:52:01 +0800
commitb939da850882a0222e30a2000eb1692aac8ee617 (patch)
tree5da91c6614240b9df09703a3ee7a9c57c8b2ec3f
parent11ef342c61761b80acc07c481a06bd39d46b2325 (diff)
downloadtangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.tar
tangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.tar.gz
tangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.tar.bz2
tangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.tar.lz
tangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.tar.xz
tangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.tar.zst
tangerine-wallet-browser-b939da850882a0222e30a2000eb1692aac8ee617.zip
Fix testem runner page
-rw-r--r--test/integration/index.html1
-rw-r--r--test/integration/tests.js3
-rw-r--r--testem.yml5
3 files changed, 2 insertions, 7 deletions
diff --git a/test/integration/index.html b/test/integration/index.html
index 1a2cbd553..6de40b046 100644
--- a/test/integration/index.html
+++ b/test/integration/index.html
@@ -13,6 +13,7 @@
<script src="./jquery-3.1.0.min.js"></script>
<script src="helpers.js"></script>
<script src="tests.js"></script>
+ <script src="/testem.js"></script>
<iframe src="/development/index.html" height="500px" width="360px">
<p>Your browser does not support iframes</p>
diff --git a/test/integration/tests.js b/test/integration/tests.js
index d11574a8a..a3f3cd294 100644
--- a/test/integration/tests.js
+++ b/test/integration/tests.js
@@ -1,6 +1,4 @@
QUnit.test('agree to terms', function (assert) {
- assert.equal(1, 1)
- /*
var done = assert.async()
// Select the mock app root
@@ -20,5 +18,4 @@ QUnit.test('agree to terms', function (assert) {
done()
})
- */
})
diff --git a/testem.yml b/testem.yml
index 1d4ffd983..a02868697 100644
--- a/testem.yml
+++ b/testem.yml
@@ -1,9 +1,6 @@
launch_in_dev:
- Chrome
- Firefox
- - PhantomJS
framework:
- - QUnit
+ - qunit
test_page: "test/integration/index.html"
-src_files: "./mock-dev.js"
-