update ember-cli

Author: mike-north

.npmignore

@@ -10,6 +10,5 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
-ember-cli-build.js
 Brocfile.js
 testem.json

.travis.yml

@@ -11,7 +11,6 @@ cache:
     - node_modules
 
 env:
-  - EMBER_TRY_SCENARIO=ember-1.11
   - EMBER_TRY_SCENARIO=ember-1.12
   - EMBER_TRY_SCENARIO=ember-1.13
   - EMBER_TRY_SCENARIO=ember-2.0

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }

README.md

@@ -23,7 +23,8 @@ Ember.js version | ember-cli-materialize version
 -----------------|--------------
 `< 1.10.0`       | Not supported
 `1.10.0 <= x <  1.11.0`| [`v0.16.4`](https://github.com/mike-north/ember-cli-materialize/tree/v0.16.4)
-`x >= 1.11.0` | [![npm version](https://badge.fury.io/js/ember-cli-materialize.svg)](http://badge.fury.io/js/ember-cli-materialize)
+`1.11.0 <= x <  1.12.0`| [`v0.18.6`](https://github.com/mike-north/ember-cli-materialize/tree/v0.18.6)
+`x >= 1.12.0` | [![npm version](https://badge.fury.io/js/ember-cli-materialize.svg)](http://badge.fury.io/js/ember-cli-materialize)
 
 
 ## Main features

bower.json

@@ -9,12 +9,12 @@
     "ember-qunit": "0.4.9",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.20",
-    "jquery": "^1.11.3",
+    "jquery": "1.11.3",
     "loader.js": "ember-cli/loader.js#3.2.1",
     "materialize": "~0.97.0",
     "qunit": "~1.18.0"
   },
   "resolutions": {
-    "jquery": "^1.11.3"
+    "jquery": "1.11.3"
   }
 }

package.json

@@ -32,7 +32,7 @@
     "broccoli-asset-rev": "^2.1.2",
     "coveralls": "^2.11.4",
     "ember-anchor": "~0.0.2",
-    "ember-cli": "1.13.8",
+    "ember-cli": "1.13.15",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-blanket": "0.5.4",
     "ember-cli-content-security-policy": "0.4.0",

tests/helpers/destroy-app.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}

tests/helpers/module-for-acceptance.js

@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      destroyApp(this.application);
+
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+    }
+  });
+}

tests/helpers/start-app.js

@@ -8,7 +8,7 @@ export default function startApp(attrs) {
   let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();

tests/index.html

@@ -27,7 +27,8 @@
     <script src="assets/dummy.js"></script>
     <script src="assets/blanket-options.js"></script>
     <script src="assets/blanket-loader.js"></script>
-    <script src="testem.js"></script>
+    <script src="testem.js" integrity=""></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
     {{content-for 'body-footer'}}