Upgrade Ember and other dependencies where possible

bjornharrtell · bjornharrtell · commit 675a182ca86a · 2017-01-06T22:30:57.000+01:00
diff --git a/.jshintrc b/.jshintrc
@@ -1,6 +1,5 @@
 {
   "predef": [
-    "server",
     "document",
     "window",
     "-Promise"
@@ -28,6 +27,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/app/index.html b/app/index.html
@@ -17,8 +17,8 @@
       ga('send', 'pageview');
     </script>
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/cargo.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/cargo.css">
 
     {{content-for 'head-footer'}}
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
@@ -35,8 +35,8 @@
         </div>
     </noscript>
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/cargo.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/cargo.js"></script>
 
     {{content-for 'body-footer'}}
   </body>
diff --git a/bower.json b/bower.json
@@ -1,22 +1,19 @@
 {
   "name": "cargo",
   "dependencies": {
-    "Faker": "~3.0.0",
-    "ember": "~2.6.0",
-    "ember-cli-moment-shim": "~0.1.0",
-    "ember-cli-shims": "0.1.1",
-    "ember-cli-test-loader": "0.2.2",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit": "0.4.16",
+    "Faker": "3.1.0",
+    "ember": "2.10.2",
+    "ember-cli-shims": "0.1.3",
+    "ember-load-initializers": "0.6.3",
+    "ember-qunit": "1.0.0",
     "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "~0.1.20",
-    "jquery": "1.11.3",
-    "loader.js": "ember-cli/loader.js#3.4.0",
-    "lodash": "~3.7.0",
-    "moment": ">= 2.8.0",
-    "moment-timezone": ">= 0.1.0",
-    "normalize-css": "~3.0.3",
-    "pretender": "~1.1.0",
-    "qunit": "~1.20.0"
+    "jquery": "3.1.1",
+    "loader.js": "4.1.0",
+    "lodash": "4.17.4",
+    "moment": "2.17.1",
+    "moment-timezone": "0.5.11",
+    "normalize-css": "5.0.0",
+    "pretender": "1.4.2",
+    "qunit": "2.1.1"
   }
 }
diff --git a/config/environment.js b/config/environment.js
@@ -4,12 +4,16 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'cargo',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 
@@ -29,7 +33,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
@@ -22,37 +22,38 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "bower": "^1.7.9",
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.8.0",
-    "ember-cli-app-version": "^2.0.0",
-    "ember-cli-babel": "^5.1.6",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "bower": "1.8.0",
+    "broccoli-asset-rev": "2.5.0",
+    "ember-ajax": "2.5.3",
+    "ember-cli": "2.10.0",
+    "ember-cli-app-version": "2.0.1",
+    "ember-cli-babel": "5.2.1",
+    "ember-cli-dependency-checker": "1.3.0",
+    "ember-cli-htmlbars": "1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "0.3.6",
     "ember-cli-ic-ajax": "1.0.0",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^2.0.1",
-    "ember-cli-meta-tags": "^2.0.2",
-    "ember-cli-mirage": "0.1.13",
-    "ember-cli-moment-shim": "2.0.0",
-    "ember-cli-qunit": "3.0.1",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-sass": "5.5.1",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.6.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
-    "ember-moment": "6.1.0",
-    "ember-page-title": "3.0.7",
-    "ember-resolver": "^2.0.3",
-    "ember-rl-dropdown": "0.7.1",
-    "ember-route-alias": "^0.1.3",
-    "ember-suave": "4.0.0",
-    "ember-welcome-page": "^1.0.1",
-    "emberx-select": "2.2.2",
-    "loader.js": "4.0.11"
+    "ember-cli-inject-live-reload": "1.4.1",
+    "ember-cli-jshint": "2.0.1",
+    "ember-cli-meta-tags": "3.0.4",
+    "ember-cli-mirage": "0.2.4",
+    "ember-cli-moment-shim": "3.0.1",
+    "ember-cli-qunit": "3.0.4",
+    "ember-cli-release": "0.2.9",
+    "ember-cli-sass": "6.0.0",
+    "ember-cli-sri": "2.1.1",
+    "ember-cli-test-loader": "1.1.1",
+    "ember-cli-uglify": "1.2.0",
+    "ember-data": "2.10.0",
+    "ember-export-application-global": "1.1.1",
+    "ember-load-initializers": "0.6.3",
+    "ember-moment": "7.2.0",
+    "ember-page-title": "3.1.2",
+    "ember-resolver": "2.1.1",
+    "ember-rl-dropdown": "0.10.0",
+    "ember-route-alias": "0.1.5",
+    "ember-suave": "4.0.1",
+    "ember-welcome-page": "2.0.3",
+    "emberx-select": "2.2.3",
+    "loader.js": "4.1.0"
   }
 }
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -1,6 +1,5 @@
 {
   "predef": [
-    "server",
     "document",
     "window",
     "location",
@@ -13,7 +12,6 @@
     "exists",
     "fillIn",
     "click",
-    "select",
     "keyEvent",
     "triggerEvent",
     "find",
@@ -50,6 +48,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,23 +1,23 @@
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: { Promise } } = Ember;
+
 export default function(name, options = {}) {
     module(name, {
         beforeEach() {
             this.application = startApp();
 
             if (options.beforeEach) {
-                options.beforeEach.apply(this, arguments);
+                return options.beforeEach.apply(this, arguments);
             }
         },
 
         afterEach() {
-            destroyApp(this.application);
-
-            if (options.afterEach) {
-                options.afterEach.apply(this, arguments);
-            }
+            let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+            return Promise.resolve(afterEach).then(() => destroyApp(this.application));
         }
     });
 }
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
@@ -1,4 +1,4 @@
-import Resolver from 'ember/resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
 const resolver = Resolver.create();
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -6,8 +6,8 @@ import './has-text';
 export default function startApp(attrs) {
     let application;
 
-    let attributes = Ember.merge({}, config.APP);
-    attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+    // use defaults, but you can override
+    let attributes = Ember.assign({}, config.APP, attrs);
 
     Ember.run(() => {
         application = Application.create(attributes);
diff --git a/tests/index.html b/tests/index.html
@@ -6,28 +6,27 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/cargo.css">
-    <link rel="stylesheet" href="assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/cargo.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
-    <script src="assets/cargo.js"></script>
-    <script src="testem.js" integrity=""></script>
-    <script src="assets/tests.js"></script>
-    <script src="assets/test-loader.js"></script>
+    <script src="/testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/cargo.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"predef": [`
`3`		`- "server",`
`4`	`3`	`"document",`
`5`	`4`	`"window",`
`6`	`5`	`"-Promise"`
`@@ -28,6 +27,6 @@`
`28`	`27`	`"strict": false,`
`29`	`28`	`"white": false,`
`30`	`29`	`"eqnull": true,`
`31`		`- "esnext": true,`
	`30`	`+ "esversion": 6,`
`32`	`31`	`"unused": true`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Resolver from 'ember/resolver';`
	`1`	`+import Resolver from '../../resolver';`
`2`	`2`	`import config from '../../config/environment';`
`3`	`3`
`4`	`4`	`const resolver = Resolver.create();`