Dummy App upgraded and fixed

.npmignore

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

.travis.yml

@@ -1,29 +1,34 @@
+---
 language: node_js
 node_js:
-- '0.12'
+  - "0.12"
+
 sudo: false
+
 cache:
   directories:
-  - node_modules
+    - node_modules
+
 env:
-- EMBER_TRY_SCENARIO=default
-- EMBER_TRY_SCENARIO=ember-release
-- EMBER_TRY_SCENARIO=ember-beta
-- EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
+
 matrix:
   fast_finish: true
   allow_failures:
-  - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
 before_install:
-- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-- npm config set spin false
-- npm install -g npm@^2
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+  - "npm config set spin false"
+  - "npm install -g npm@^2"
+
 install:
-- npm install -g bower
-- npm install
-- bower install
+  - npm install -g bower
+  - npm install
+  - bower install
+
 script:
-- ember try $EMBER_TRY_SCENARIO test
-notifications:
-  slack:
-    secure: JL1+WF/xOaVDvvQ1dEM8g/Bu4LS7f7pKe7mp9FfIBJvPPcZFAZ+D1QgFH+W9V/U7vKk8ecL68IrRP9K8baZeEaYXH+Zn5AupOXeQaJ5J9SCWfJ87B0ysYiDV2HN8ZPrdxHIqvSKzTzDqBL7j4+okwNMIXnqOH3+dwGAAIKdL57emiVViaYtD1xfpMWDylB27866gysVxjucInu5h7P4Hj2gNfVU1zUH87YRESKsoZhjjTsGG4gOZPIznj8y7NwcQrueB/nu97L14c+i+DhViZqVLwDbE7PDuKemJS0GJoT46bZ+BmJioVh7/Peyaup9lo6A1m8BKFLGSILKj2l6+KWEL8QUOZ9+xOn2ElK5y6MyDqKWiwj0foiDh2oNw3zgNNceTosGPiQFaoCug0s9z+fvdX7jnMgXAFvJbl0bG8QFtkxDiUbgXYQjfq0ZNSvPo5lhMHHN2ncerAmBInCE+GB3+2jLlB/AWAxk/Wc9EFjqcpYm39OYs/DLjQZnn/oVPuYzgWipuH988fQ4VnL9qAZtkPwMfd0bY+mrI4bagsbhn0KsAIID+Q/Eno7CieISQxvE1aeCY+P7gFIUvJMoBHBSDRa6ZhuO3qA2zN5xJvy+Z3sMIQkgwwuKS5l9FzlG6OMuRx3KMV6tzd1nOGeGj04dSdMJdmOlnXBxoxAd9h1Y=
+  - ember try $EMBER_TRY_SCENARIO test

.watchmanconfig

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

bower.json

@@ -1,16 +1,16 @@
 {
   "name": "ember-image-drop",
   "dependencies": {
-    "ember": "1.13.3",
+    "ember": "2.2",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.5",
+    "ember-data": "2.3.2",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
     "ember-qunit": "0.4.2",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.2.0",
+    "loader.js": "ember-cli/loader.js#3.4.0",
     "qunit": "~1.17.1"
   }
 }

package.json

@@ -22,7 +22,7 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "1.13.1",
+    "ember-cli": "^1.13.13",
     "ember-cli-app-version": "0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
@@ -33,9 +33,9 @@
     "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.13.5",
+    "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-disable-prototype-extensions": "^1.0.0",
     "ember-try": "0.0.6"
   },
   "keywords": [

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/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);
+      }
+    }
+  });
+}