aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mascara/test/index.html21
-rw-r--r--mascara/test/testem.yml13
-rw-r--r--test/integration/lib/first-time.js2
3 files changed, 1 insertions, 35 deletions
diff --git a/mascara/test/index.html b/mascara/test/index.html
deleted file mode 100644
index 6495c2cfc..000000000
--- a/mascara/test/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width">
- <title>QUnit Example</title>
- <link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.0.0.css">
-</head>
-<body>
- <div id="qunit"></div>
- <div id="qunit-fixture"></div>
- <script src="https://code.jquery.com/qunit/qunit-2.0.0.js"></script>
- <script src="./jquery-3.1.0.min.js"></script>
- <script src="./helpers.js"></script>
- <script src="./test-bundle.js"></script>
- <script src="/testem.js"></script>
-
- <div id="app-content"></div>
- <script src="./bundle.js"></script>
-</body>
-</html>
diff --git a/mascara/test/testem.yml b/mascara/test/testem.yml
deleted file mode 100644
index f1f5844bd..000000000
--- a/mascara/test/testem.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-launch_in_dev:
- - Chrome
- - Firefox
- - Opera
-launch_in_ci:
- - Chrome
- - Firefox
- - Opera
-framework:
- - qunit
-before_tests: "npm run mascaraCi"
-after_tests: "rm ./background.js ./test-bundle.js ./bundle.js"
-test_page: "./index.html"
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 4140dfd78..3f0fe165b 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -12,7 +12,7 @@ QUnit.test('render init screen', (assert) => {
async function runFirstTimeUsageTest(assert, done) {
- await timeout(10000)
+ await timeout()
const app = $('#app-content')