Upgrade Ember CLI to 1.13.13

Now I'm not harassed about having an incompatible version of Watchman :)

.jshintrc

@@ -3,7 +3,6 @@
     "document",
     "window",
     "-Promise",
-    "_",
     "faker"
   ],
   "browser": true,

.npmignore

@@ -1,5 +1,3 @@
-.sass-cache/
-_site/
 bower_components/
 tests/
 tmp/
@@ -13,6 +11,5 @@ jekyll-tmp/
 .npmignore
 **/.gitkeep
 bower.json
-ember-cli-build.js
 Brocfile.js
 testem.json

.travis.yml

@@ -11,7 +11,6 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.13.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

.watchmanconfig

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

bower.json

@@ -2,18 +2,18 @@
   "name": "ember-cli-mirage",
   "dependencies": {
     "jquery": "2.1.4",
-    "ember": "1.13.8",
-    "ember-data": "1.13.9",
-    "ember-resolver": "~0.1.18",
-    "loader.js": "ember-cli/loader.js#3.2.1",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.7",
-    "qunit": "~1.18.0",
+    "ember": "1.13.11",
+    "ember-cli-shims": "0.0.6",
+    "ember-cli-test-loader": "0.2.1",
+    "ember-data": "1.13.15",
+    "ember-load-initializers": "0.1.7",
+    "ember-qunit": "0.4.16",
+    "ember-qunit-notifications": "0.1.0",
+    "ember-resolver": "~0.1.20",
+    "loader.js": "ember-cli/loader.js#3.4.0",
+    "qunit": "~1.20.0",
     "pretender": "~0.9.0",
     "Faker": "~3.0.0",
     "sinonjs": "~1.17.1"
   }
-}
+}

config/ember-try.js

@@ -1,21 +1,14 @@
+/*jshint node:true*/
 module.exports = {
   scenarios: [
     {
       name: 'default',
       dependencies: { }
     },
-    {
-      name: 'ember-1.13.8',
-      dependencies: {
-        'ember': '1.13.8',
-        'ember-data': '1.13.9'
-      }
-    },
     {
       name: 'ember-release',
       dependencies: {
-        'ember': 'components/ember#release',
-        'ember-data': 'v2.0.0-beta.2'
+        'ember': 'components/ember#release'
       },
       resolutions: {
         'ember': 'release'
@@ -24,8 +17,7 @@ module.exports = {
     {
       name: 'ember-beta',
       dependencies: {
-        'ember': 'components/ember#beta',
-        'ember-data': 'v2.0.0-beta.2'
+        'ember': 'components/ember#beta'
       },
       resolutions: {
         'ember': 'beta'
@@ -34,8 +26,7 @@ module.exports = {
     {
       name: 'ember-canary',
       dependencies: {
-        'ember': 'components/ember#canary',
-        'ember-data': 'v2.0.0-beta.2'
+        'ember': 'components/ember#canary'
       },
       resolutions: {
         'ember': 'canary'

ember-cli-build.js

@@ -14,7 +14,7 @@ var path = require('path');
 */
 
 module.exports = function(defaults) {
-  var app = new EmberAddon({
+  var app = new EmberAddon(defaults, {
     'ember-cli-mirage': {
       directory: path.resolve(__dirname, path.join('tests', 'dummy', 'mirage'))
     }

package.json

@@ -2,14 +2,13 @@
   "name": "ember-cli-mirage",
   "version": "0.2.0-beta.1",
   "description": "A client-side mock HTTP server to develop, test and demo your Ember app",
-  "license": "MIT",
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
+    "start": "ember server",
     "test": "ember try:testall && mocha tests/**/*-test-node.js"
   },
   "repository": {
@@ -24,27 +23,29 @@
     "node": ">= 0.10.0"
   },
   "author": "Sam Selikoff",
+  "license": "MIT",
   "devDependencies": {
-    "active-model-adapter": "1.13.6",
-    "broccoli-asset-rev": "^2.1.2",
+    "active-model-adapter": "^2.0.3",
+    "broccoli-asset-rev": "^2.2.0",
     "chai": "2.0.0",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "1.0.0",
+    "ember-cli": "1.13.13",
+    "ember-cli-app-version": "^1.0.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
-    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-htmlbars": "^1.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-qunit": "^1.0.0",
+    "ember-cli-qunit": "^1.0.4",
     "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^1.2.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "1.13.9",
+    "ember-data": "1.13.15",
     "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
-    "ember-try": "0.0.8",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.4",
     "ember-sinon": "0.3.0",
+    "ember-try": "~0.0.8",
     "mocha": "^2.1.0"
   },
   "keywords": [
@@ -61,7 +62,7 @@
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.1.0",
     "broccoli-unwatched-tree": "^0.1.1",
-    "ember-cli-babel": "^5.1.3",
+    "ember-cli-babel": "^5.1.5",
     "ember-lodash": "0.0.6",
     "ember-inflector": "^1.9.2",
     "chalk": "^1.1.1",

testem.json

@@ -6,6 +6,7 @@
     "PhantomJS"
   ],
   "launch_in_dev": [
-    "PhantomJS"
+    "PhantomJS",
+    "Chrome"
   ]
 }

tests/acceptance/contact-test.js

@@ -1,18 +1,11 @@
-import Ember from 'ember';
-import {module, test} from 'qunit';
-import startApp from '../helpers/start-app';
+import {test} from 'qunit';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
 
-var App;
-var contact;
+let contact;
 
-module('Acceptance: Contact', {
-  beforeEach: function() {
-    App = startApp();
+moduleForAcceptance('Acceptance | Contact', {
+  beforeEach() {
     contact = server.create('contact');
-  },
-  afterEach: function() {
-    server.shutdown();
-    Ember.run(App, 'destroy');
   }
 });
 

tests/acceptance/contacts-test.js

@@ -1,18 +1,11 @@
-import Ember from 'ember';
-import {module, test} from 'qunit';
-import startApp from '../helpers/start-app';
+import {test} from 'qunit';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
 
-var App;
-var contacts;
+let contacts;
 
-module('Acceptance: Contacts', {
-  beforeEach: function() {
-    App = startApp();
+moduleForAcceptance('Acceptance | Contacts', {
+  beforeEach() {
     contacts = server.createList('contact', 2);
-  },
-  afterEach: function() {
-    server.shutdown();
-    Ember.run(App, 'destroy');
   }
 });
 

tests/acceptance/custom-handlers-test.js

@@ -1,21 +1,16 @@
 import Ember from 'ember';
-import { module, test } from 'qunit';
-import startApp from '../helpers/start-app';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
+import { test } from 'qunit';
 
-var App, appStore, rex, toby, sam, andy;
+let appStore, rex, toby, sam, andy;
 
-module('Acceptance: Custom handlers', {
-  beforeEach: function() {
-    App = startApp();
-    appStore = App.__container__.lookup('service:store');
+moduleForAcceptance('Acceptance | Custom handlers', {
+  beforeEach() {
+    appStore = this.application.__container__.lookup('service:store');
     rex  = server.create('pet', { name: 'Rex',  alive: true  });
     toby = server.create('pet', { name: 'Toby', alive: false });
     sam  = server.create('pet', { name: 'Sam',  alive: false });
     andy = server.create('pet', { name: 'Andy', alive: true  });
-  },
-  afterEach: function() {
-    server.shutdown();
-    Ember.run(App, 'destroy');
   }
 });
 

tests/acceptance/edit-test.js

@@ -1,18 +1,7 @@
-import Ember from 'ember';
-import {module, test} from 'qunit';
-import startApp from '../helpers/start-app';
+import {test} from 'qunit';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
 
-var App;
-
-module('Acceptance: Edit', {
-  beforeEach: function() {
-    App = startApp();
-  },
-  afterEach: function() {
-    server.shutdown();
-    Ember.run(App, 'destroy');
-  }
-});
+moduleForAcceptance('Acceptance | Edit');
 
 test("I can edit a contact", function(assert) {
   server.create('contact');

tests/acceptance/friends-test.js

@@ -1,18 +1,7 @@
-import Ember from 'ember';
-import {module, test} from 'qunit';
-import startApp from '../helpers/start-app';
-
-var App;
-
-module('Acceptance: Friends', {
-  beforeEach: function() {
-    App = startApp();
-  },
-  afterEach: function() {
-    server.shutdown();
-    Ember.run(App, 'destroy');
-  }
-});
+import {test} from 'qunit';
+import moduleForAcceptance from '../helpers/module-for-acceptance';
+
+moduleForAcceptance('Acceptance | Friends');
 
 test("I can view the friends", function(assert) {
   var friend = server.create('friend');

tests/dummy/app/app.js

@@ -3,14 +3,14 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);

tests/dummy/app/router.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import config from './config/environment';
 
-var Router = Ember.Router.extend({
+const Router = Ember.Router.extend({
   location: config.locationType
 });
 

tests/dummy/app/templates/application.hbs

@@ -1,3 +1,3 @@
-<h2 id="title">Welcome to Ember.js</h2>
+<h2 id="title">Welcome to Ember</h2>
 
 {{outlet}}