bump ember deps

.npmignore

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

.watchmanconfig

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

bower.json

@@ -2,15 +2,15 @@
   "name": "smoke-and-mirrors",
   "dependencies": {
     "animation-frame": "~0.2.4",
-    "ember": "2.1.0",
-    "ember-cli-shims": "~0.0.6",
+    "ember": "2.2.0",
+    "ember-cli-shims": "0.0.6",
     "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "~0.1.7",
-    "ember-qunit": "0.4.15",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
-    "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.3.0",
+    "ember-load-initializers": "0.1.7",
+    "ember-qunit": "0.4.16",
+    "ember-qunit-notifications": "0.1.0",
+    "ember-resolver": "~0.1.20",
+    "jquery": "^1.11.3",
+    "loader.js": "ember-cli/loader.js#3.4.0",
     "qunit": "~1.20.0"
   },
   "devDependencies": {

config/ember-try.js

@@ -1,3 +1,4 @@
+/*jshint node:true*/
 module.exports = {
   scenarios: [
     {

config/environment.js

@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

index.js

@@ -1,18 +1,20 @@
+// jscs: disable
 /* jshint node: true */
+
 'use strict';
 
 module.exports = {
   name: 'smoke-and-mirrors',
 
-  included : function (app) {
+  included: function(app) {
     if (!/production/.test(app.env)) {
       console.info('Smoke-and-mirrors:: Including Vertical-Collection Debug CSS');
       app.import('./vendor/debug.css');
     }
   },
 
   isDevelopingAddon: function() {
-    return false;
+    return true;
   }
 
 };

package.json

@@ -35,25 +35,25 @@
   "license": "MIT",
   "devDependencies": {
     "babel-eslint": "^4.1.5",
-    "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
+    "broccoli-asset-rev": "^2.2.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.1.0",
     "ember-cli-eslint": "1.2.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-ic-ajax": "0.2.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "^1.0.3",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-uglify": "^1.0.1",
+    "ember-cli-ic-ajax": "0.2.4",
+    "ember-cli-inject-live-reload": "^1.3.1",
+    "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-code-snippet": "^1.1.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-run-raf": "^1.0.5",
     "ember-suave": "1.2.2",
-    "ember-try": "0.0.6",
     "eslint": "^1.9.0",
     "eslint-config-ember": "^0.2.0",
     "ghooks": "^1.0.0",
@@ -63,10 +63,10 @@
     "jit-grunt": "0.9.0",
     "js-string-escape": "^1.0.0",
     "jscs": "^2.5.1",
-    "time-grunt": "1.0.0"
+    "time-grunt": "1.0.0",
+    "ember-try": "~0.0.8"
   },
   "keywords": [
-    "ember-addon",
     "occlusion",
     "infinite",
     "infinite-scroll",
@@ -76,12 +76,13 @@
     "recycling",
     "cloaking",
     "performance",
-    "lists"
+    "lists",
+    "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.5",
     "ember-cli-htmlbars": "^1.0.1",
-    "ember-async-image": "0.0.1"
+    "ember-async-image": "0.0.1",
+    "ember-cli-babel": "^5.1.5"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

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}}
+{{outlet}}

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/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'}}