Include test-loader from npm instead of bower

achan · achan · commit c74eaa0f2fd9 · 2016-08-05T23:08:18.000-04:00
diff --git a/.jshintrc b/.jshintrc
@@ -15,7 +15,7 @@
   "devel": true,
   "eqeqeq": true,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "evil": true,
   "forin": false,
   "immed": false,
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,13 @@ cache:
     - node_modules
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - phantomjs --version
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
diff --git a/app/index.html b/app/index.html
@@ -10,16 +10,16 @@
 
     {{content-for 'head'}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/mcac.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/mcac.css">
 
     {{content-for 'head-footer'}}
   </head>
   <body>
     {{content-for 'body'}}
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/mcac.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/mcac.js"></script>
     {{content-for 'body-footer'}}
   </body>
 </html>
diff --git a/app/router.js b/app/router.js
@@ -1,7 +1,8 @@
 import Ember from "ember";
 import config from "./config/environment";
 
-var Router = Ember.Router.extend({
+const Router = Ember.Router.extend({
+	rootURL: config.rootURL,
   location: config.locationType,
   metrics: Ember.inject.service(),
 
diff --git a/bower.json b/bower.json
@@ -6,7 +6,6 @@
     "bootstrap-markdown": "~2.8.0",
     "ember": "~2.7.0",
     "ember-cli-shims": "0.1.0",
-    "ember-cli-test-loader": "0.2.2",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
     "ember-qunit-notifications": "0.1.0",
     "ember-resolver": "~0.1.15",
diff --git a/config/environment.js b/config/environment.js
@@ -4,7 +4,7 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'mcac',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
@@ -53,7 +53,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter
diff --git a/package.json b/package.json
@@ -44,10 +44,11 @@
     "ember-cli-moment-shim": "1.0.0",
     "ember-cli-page-object": "^1.1.0",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-qunit": "^1.2.1",
+    "ember-cli-qunit": "^2.0.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-sass": "5.2.1",
     "ember-cli-sri": "^2.1.0",
+    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-concurrency": "0.5.17",
     "ember-data": "^2.7.0",
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -49,6 +49,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/tests/index.html b/tests/index.html
@@ -10,9 +10,9 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/mcac.css">
-    <link rel="stylesheet" href="assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/mcac.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
 
     {{content-for "head-footer"}}
     {{content-for "test-head-footer"}}
@@ -21,12 +21,11 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
-    <script src="testem.js" integrity=""></script>
-    <script src="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
-    <script src="assets/mcac.js"></script>
-    <script src="assets/tests.js"></script>
-    <script src="assets/test-loader.js"></script>
+    <script src="{{rootURL}}testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/mcac.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
 
     {{content-for "body-footer"}}
     {{content-for "test-body-footer"}}

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@`
`49`	`49`	`"strict": false,`
`50`	`50`	`"white": false,`
`51`	`51`	`"eqnull": true,`
`52`		`- "esnext": true,`
	`52`	`+ "esversion": 6,`
`53`	`53`	`"unused": true`
`54`	`54`	`}`