Skip to content

Commit 01a0615

Browse files
author
DSivachinskiy
committed
fix tests
1 parent 7da5931 commit 01a0615

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"ember-resolver": "~0.1.12",
99
"loader.js": "ember-cli/loader.js#3.2.1",
1010
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
11-
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.1.3",
11+
"ember-cli-test-loader": "0.2.2",
1212
"ember-load-initializers": "0.1.7",
1313
"ember-qunit": "0.4.7",
1414
"ember-qunit-notifications": "0.0.7",

testem.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{
22
"framework": "qunit",
3-
"test_page": "tests/index.html",
3+
"test_page": "tests/index.html?hidepassed",
4+
"parallel": 2,
5+
"phantomjs_debug_port": 9000,
6+
"disable_watching": true,
47
"launch_in_ci": [
58
"PhantomJS"
69
],
710
"launch_in_dev": [
811
"PhantomJS",
912
"Chrome"
1013
]
11-
}
14+
}

tests/helpers/start-app.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Ember from 'ember';
22
import Application from '../../app';
33
import Router from '../../router';
44
import config from '../../config/environment';
5-
import 'simple-auth-testing/test-helpers';
65

76
export default function startApp(attrs) {
87
var App;

tests/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<script src="assets/vendor.js"></script>
4040
<script src="assets/test-support.js"></script>
4141
<script src="assets/dummy.js"></script>
42-
<script src="testem.js"></script>
42+
<script src="assets/tests.js"></script>
4343
<script src="assets/test-loader.js"></script>
4444
<script src="http://api-maps.yandex.ru/2.0/?load=package.standard&lang=ru-Ru"></script>
4545
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&key=AIzaSyCqyf1CwoH9VU6XNYBmIXZSRsMQ0BJUOrw&libraries=places"></script>

0 commit comments

Comments
 (0)