Upgrade to ember-cli v2.7.0

pixelhandler · pixelhandler · commit 2954f5717533 · 2016-07-26T21:15:40.000-07:00
diff --git a/.editorconfig b/.editorconfig
@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false
diff --git a/.jshintrc b/.jshintrc
@@ -27,6 +27,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,9 @@ matrix:
 before_install:
   - npm config set spin false
   - npm install -g bower
+  - bower --version
   - npm install phantomjs-prebuilt
+  - phantomjs --version
 
 install:
   - npm install
@@ -41,7 +43,7 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try $EMBER_TRY_SCENARIO test --skip-cleanup
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
 
 addons:
   code_climate:
diff --git a/bower.json b/bower.json
@@ -3,15 +3,14 @@
   "dependencies": {
     "ember": "~2.7.0",
     "ember-cli-shims": "0.1.1",
-    "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
     "fetch": "~0.10.1",
     "es6-promise": "~3.0.2",
     "blanket": "~1.1.5"
   },
   "devDependencies": {
     "sinon": "http://sinonjs.org/releases/sinon-1.15.0.js",
-    "es5-shim": "^4.0.5",
+    "es5-shim": "^4.5.9",
     "blanket": "~1.1.7"
   }
 }
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "broccoli-static-compiler": "^0.2.1",
     "ember-ajax": "^2.0.1",
     "ember-buffered-proxy": "^0.5.1",
-    "ember-cli": "2.6.0",
+    "ember-cli": "2.7.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-blanket": "^0.9.2",
     "ember-cli-content-security-policy": "0.4.0",
@@ -35,11 +35,12 @@
     "ember-cli-inject-live-reload": "^1.4.0",
     "ember-cli-jshint": "^1.0.0",
     "ember-cli-path-utils": "^1.0.0",
-    "ember-cli-qunit": "^1.4.0",
-    "ember-cli-release": "0.2.8",
+    "ember-cli-qunit": "^2.0.0",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-string-utils": "^1.0.0",
     "ember-cli-test-info": "^1.0.0",
+    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -47,6 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -9,16 +9,16 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/dummy.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>
   <body>
     {{content-for "body"}}
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/dummy.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/dummy.js"></script>
 
     {{content-for "body-footer"}}
   </body>
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
@@ -2,7 +2,8 @@ import Ember from 'ember';
 import config from './config/environment';
 
 const Router = Ember.Router.extend({
-  location: config.locationType
+  location: config.locationType,
+  rootURL: config.rootURL
 });
 
 Router.map(function() {
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -4,7 +4,7 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'dummy',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
@@ -37,7 +37,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter
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/dummy.css">
-    <link rel="stylesheet" href="assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
     <style>#blanket-main { position: relative; z-index: 99999; }</style>
 
     {{content-for "head-footer"}}
@@ -22,16 +22,16 @@
 
     {{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/dummy.js"></script>
-    <script src="assets/blanket-options.js"></script>
-    <script src="assets/blanket-loader.js"></script>
-    <script src="assets/fixtures.js"></script>
-    <script src="assets/sinon/index.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/dummy.js"></script>
+    <script src="{{rootURL}}assets/blanket-options.js"></script>
+    <script src="{{rootURL}}assets/blanket-loader.js"></script>
+    <script src="{{rootURL}}assets/fixtures.js"></script>
+    <script src="{{rootURL}}assets/sinon/index.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
+    <script src="{{rootURL}}assets/test-loader.js"></script>
 
     {{content-for "body-footer"}}
     {{content-for "test-body-footer"}}

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`"strict": false,`
`28`	`28`	`"white": false,`
`29`	`29`	`"eqnull": true,`
`30`		`- "esnext": true,`
	`30`	`+ "esversion": 6,`
`31`	`31`	`"unused": true`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@`
`47`	`47`	`"strict": false,`
`48`	`48`	`"white": false,`
`49`	`49`	`"eqnull": true,`
`50`		`- "esnext": true,`
	`50`	`+ "esversion": 6,`
`51`	`51`	`"unused": true`
`52`	`52`	`}`