update ember to 2.8 and ember-cli to 2.9.0-beta.1

jelhan · jelhan · commit fd0d7ffd39e9 · 2016-09-20T02:01:26.000+02: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/.gitignore b/.gitignore
@@ -17,5 +17,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log
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/app/index.html b/app/index.html
@@ -17,8 +17,8 @@
   <body>
     {{content-for 'body'}}
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/croodle.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/croodle.js"></script>
 
     {{content-for 'body-footer'}}
 
diff --git a/app/router.js b/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/bower.json b/bower.json
@@ -1,10 +1,8 @@
 {
   "name": "croodle",
   "dependencies": {
-    "ember": "~2.4.1",
-    "ember-cli-shims": "0.1.0",
-    "ember-cli-test-loader": "0.2.2",
-    "ember-qunit-notifications": "0.1.0",
+    "ember": "~2.8.0",
+    "ember-cli-shims": "0.1.3",
     "sjcl": "~1.0.0",
     "bootstrap": "~3.3.5",
     "bootstrap-datepicker": "~1.4.0",
diff --git a/config/environment.js b/config/environment.js
@@ -6,6 +6,7 @@ module.exports = function(environment) {
     modulePrefix: 'croodle',
     environment: environment,
     locationType: 'hash',
+    rootURL: '/',
 
     APP: {
       // Here you can pass flags/options to your application instance
@@ -44,7 +45,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'hash';
 
     // keep test console output quieter
diff --git a/package.json b/package.json
@@ -19,49 +19,51 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "^2.2.0",
+    "broccoli-asset-rev": "^2.4.5",
     "broccoli-funnel": "^1.0.6",
     "broccoli-unwatched-tree": "^0.1.1",
     "chart.js": "2.2.1",
     "connect-restreamer": "^1.0.1",
     "cors": "^2.5.3",
+    "ember-ajax": "^2.4.1",
     "ember-array-computed-macros": "martndemus/ember-array-computed-macros#3fde9023336d227aa6009060b40b4de77d8b1a9b",
     "ember-array-helper": "0.0.1",
     "ember-bootstrap": "^0.9.1",
     "ember-bootstrap-cp-validations": "^0.2.0",
     "ember-browserify": "1.1.11",
-    "ember-cli": "2.4.2",
+    "ember-cli": "2.9.0-beta.1",
     "ember-cli-acceptance-test-helpers": "0.4.0",
     "ember-cli-app-version": "^2.0.0",
-    "ember-cli-babel": "^5.1.5",
+    "ember-cli-babel": "^5.1.7",
     "ember-cli-bootstrap-datepicker": "^0.5.5",
     "ember-cli-browser-navigation-button-test-helper": "0.0.1",
     "ember-cli-build-info": "^0.2.0",
     "ember-cli-chart": "git://github.com/jelhan/ember-cli-chart.git#52ae694db579df94e0ef057d2cf7d6d96c61f78f",
     "ember-cli-clipboard": "0.4.1",
     "ember-cli-content-security-policy": "0.5.0",
-    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-flash": "1.3.16",
-    "ember-cli-htmlbars": "^1.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.3.1",
+    "ember-cli-htmlbars": "^1.0.10",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-jshint": "^1.0.4",
     "ember-cli-less": "^1.5.3",
     "ember-cli-moment-shim": "0.7.1",
     "ember-cli-page-object": "1.5.0",
     "ember-cli-pretender": "^0.6.0",
-    "ember-cli-qunit": "^1.2.1",
-    "ember-cli-release": "0.2.8",
+    "ember-cli-qunit": "^2.1.0",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sauce": "^1.6.0",
     "ember-cli-sri": "^2.1.0",
+    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-cp-validations": "^2.9.3",
-    "ember-data": "^2.4.0",
+    "ember-data": "^2.8.0",
     "ember-data-model-fragments": "2.3.2",
-    "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-export-application-global": "^1.0.4",
+    "ember-export-application-global": "^1.0.5",
     "ember-i18n": "^4.2.2",
     "ember-i18n-cp-validations": "^2.5.0",
-    "ember-load-initializers": "^0.5.0",
+    "ember-load-initializers": "^0.5.1",
     "ember-math-helpers": "^1.2.1",
     "ember-moment": "^6.1.0",
     "ember-object-at-helper": "0.1.0",
@@ -74,7 +76,7 @@
     "ember-truth-helpers": "^1.2.0",
     "express": "^4.8.5",
     "glob": "^7.0.5",
-    "loader.js": "^4.0.0",
+    "loader.js": "^4.0.10",
     "node-phpcgi": "^0.3.5"
   }
 }
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -59,6 +59,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() {
-      if (options.afterEach) {
-        options.afterEach.apply(this, arguments);
-      }
-
-      destroyApp(this.application);
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -13,8 +13,8 @@ registerAcceptanceTestHelpers();
 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
@@ -10,24 +10,22 @@
     {{content-for 'head'}}
     {{content-for 'test-head'}}
 
-    <link rel="stylesheet" href="/assets/vendor.css">
-    <link rel="stylesheet" href="/assets/croodle.css">
-    <link rel="stylesheet" href="/assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/croodle.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'}}
 
-    <script src="/assets/vendor.js"></script>
-    <script src="/assets/test-support.js"></script>
-    <script src="/assets/croodle.js"></script>
     <script src="/testem.js" integrity=""></script>
-    <script src="/assets/tests.js"></script>
-    <script src="/assets/test-loader.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/croodle.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
`@@ -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
`@@ -59,6 +59,6 @@`
`59`	`59`	`"strict": false,`
`60`	`60`	`"white": false,`
`61`	`61`	`"eqnull": true,`
`62`		`- "esnext": true,`
	`62`	`+ "esversion": 6,`
`63`	`63`	`"unused": true`
`64`	`64`	`}`