update Ember CLI and libraries

.jscsrc

@@ -1,3 +1,4 @@
 {
+  "preset": "ember-suave",
   "requireCommentsToIncludeAccess": false
 }

.watchmanconfig

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

bower.json

@@ -2,20 +2,20 @@
   "name": "ember-simple-auth",
   "dependencies": {
     "bootstrap": "~3.3.5",
-    "ember": "2.1.0",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.5",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "2.1.0",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
-    "ember-mocha": "~0.8.2",
-    "ember-resolver": "~0.1.18",
+    "ember": "~2.2.0",
+    "ember-cli-shims": "0.0.6",
+    "ember-cli-test-loader": "0.2.1",
+    "ember-data": "~2.2.0",
+    "ember-load-initializers": "0.1.7",
+    "ember-mocha": "~0.8.7",
+    "ember-resolver": "~0.1.20",
     "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.2.1",
-    "sinonjs": "~1.14.1",
+    "loader.js": "ember-cli/loader.js#3.4.0",
+    "sinonjs": "~1.17.1",
     "base64": "~0.3.0",
-    "pretender": "^0.10.0"
+    "pretender": "^0.10.1"
   },
   "resolutions": {
-    "ember": "2.0.1"
+    "ember": "~2.2.0"
   }
-}
+}

ember-cli-build.js

@@ -1,5 +1,5 @@
 /* global require, module */
-const EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 const yuidoc = require('broccoli-yuidoc');
 const version = require('git-repo-version')();
 const Handlebars = require('handlebars');
@@ -9,7 +9,7 @@ const merge = require('lodash/object/merge');
 var sourceTrees = [];
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
+  var app = new EmberAddon(defaults, {
     jscsOptions: {
       enabled: true,
       testGenerator: function(relativePath, errors) {

package.json

@@ -8,7 +8,6 @@
   },
   "scripts": {
     "build": "ember build",
-    "docs": "ember build --docs",
     "start": "ember server",
     "test": "ember try:testall"
   },
@@ -20,48 +19,48 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "^2.1.2",
+    "broccoli-asset-rev": "^2.2.0",
     "broccoli-merge-trees": "^0.2.3",
-    "broccoli-yuidoc": "simplabs/broccoli-yuidoc#update-dependencies",
-    "ember-browserify": "1.0.5",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
-    "ember-cli-base64": "0.0.1",
+    "broccoli-yuidoc": "~2.1.0",
+    "ember-browserify": "~1.1.4",
+    "ember-cli": "1.13.13",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-base64": "~0.0.1",
     "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-mocha": "0.9.2",
-    "ember-cli-pretender": "0.5.0",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-sri": "^1.0.3",
+    "ember-cli-mocha": "~0.9.7",
+    "ember-cli-pretender": "~0.5.0",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^1.2.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "2.1.0",
+    "ember-data": "~2.2.0",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.4",
     "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
-    "ember-sinon": "0.2.1",
-    "ember-suave": "1.0.0",
-    "ember-try": "0.0.8",
-    "express": "^4.8.5",
+    "ember-sinon": "~0.3.0",
+    "ember-suave": "~1.2.2",
+    "ember-try": "~0.0.8",
+    "express": "^4.12.3",
     "git-repo-version": "^0.3.0",
     "glob": "^5.0.13",
-    "handlebars": "3.0.3",
+    "handlebars": "~3.0.3",
     "lodash": "^3.10.1",
     "marked": "^0.3.5",
     "morgan": "^1.5.2",
-    "sinon-chai": "2.8.0",
-    "torii": "Vestorly/torii#0.6.0-beta.7"
+    "sinon-chai": "~2.8.0",
+    "torii": "~0.6.1"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.3"
+    "ember-cli-babel": "^5.1.5"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}

tests/acceptance/authentication-test.js

@@ -5,6 +5,7 @@ import { expect } from 'chai';
 import startApp from '../helpers/start-app';
 import Pretender from 'pretender';
 import { invalidateSession, authenticateSession, currentSession } from '../helpers/ember-simple-auth';
+import destroyApp from '../helpers/destroy-app';
 
 describe('Acceptance: Authentication', function() {
   let application;
@@ -16,7 +17,7 @@ describe('Acceptance: Authentication', function() {
 
   afterEach(function() {
     Ember.tryInvoke(server, 'shutdown');
-    Ember.run(application, 'destroy');
+    destroyApp(application);
   });
 
   describe('the protected route', () => {

tests/dummy/app/router.js

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

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/resolver.js

@@ -1,7 +1,7 @@
 import Resolver from 'ember/resolver';
 import config from '../../config/environment';
 
-let resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,

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

@@ -18,13 +18,14 @@
     {{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/dummy.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'}}

tests/test-helper.js

@@ -1,8 +1,8 @@
 import sinonChai from 'npm:sinon-chai';
-import { use } from 'chai';
+import chai from 'chai';
 import resolver from './helpers/resolver';
 import { setResolver } from 'ember-mocha';
 
 setResolver(resolver);
 
-use(sinonChai);
+chai.use(sinonChai);