Merge pull request #15 from mike-north/update-ember-cli

Update ember cli to 1.13.13

.npmignore

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

.travis.yml

@@ -14,6 +14,8 @@ 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
+  - EMBER_TRY_SCENARIO=ember-2.1
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary

.watchmanconfig

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

bower.json

@@ -1,20 +1,20 @@
 {
   "name": "ember-api-actions",
   "dependencies": {
-    "ember": "1.13.7",
-    "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.0.0-beta.19",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.7",
+    "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",
     "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.2.1",
-    "qunit": "~1.18.0",
-    "pretender": "^0.9.0"
+    "loader.js": "ember-cli/loader.js#3.4.0",
+    "pretender": "^0.9.0",
+    "qunit": "~1.20.0"
   },
   "resolutions": {
-    "FakeXMLHttpRequest": "~1.2.0"
+    "qunit-notifications": "~0.1.0"
   }
 }

config/ember-try.js

@@ -44,37 +44,59 @@ module.exports = {
         'ember-data': '~1.13.0'
       }
     },
+    {
+      name: 'ember-2.0',
+      dependencies: {
+        'ember': '~2.0.0',
+        'ember-data': '~2.0.0'
+      },
+      resolutions: {
+        'ember': '~2.0.0',
+        'ember-data': '~2.0.0'
+      }
+    },
+    {
+      name: 'ember-2.1',
+      dependencies: {
+        'ember': '~2.1.0',
+        'ember-data': '~2.1.0'
+      },
+      resolutions: {
+        'ember': '~2.1.0',
+        'ember-data': '~2.1.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {
         'ember': 'components/ember#release',
-        'ember-data': '~2.0.0'
+        'ember-data': '~2.2.0'
       },
       resolutions: {
         'ember': 'release',
-        'ember-data': '~2.0.0'
+        'ember-data': '~2.2.0'
       }
     },
     {
       name: 'ember-beta',
       dependencies: {
         'ember': 'components/ember#beta',
-        'ember-data': '~2.0.0'
+        'ember-data': 'beta'
       },
       resolutions: {
         'ember': 'beta',
-        'ember-data': '~2.0.0'
+        'ember-data': 'beta'
       }
     },
     {
       name: 'ember-canary',
       dependencies: {
         'ember': 'components/ember#canary',
-        'ember-data': '~2.0.0'
+        'ember-data': 'canary'
       },
       resolutions: {
         'ember': 'canary',
-        'ember-data': '~2.0.0'
+        'ember-data': 'canary'
       }
     }
   ]

config/environment.js

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

ember-cli-build.js

@@ -1,9 +1,11 @@
+/*jshint node:true*/
 /* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
+  var app = new EmberAddon(defaults, {
     snippetSearchPaths: ['app', 'addon', 'tests/dummy/app']
+    // Add options here
   });
 
   /*

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-api-actions",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Trigger remote actions that don't fit into CRUD, in your Ember.js apps",
   "directories": {
     "doc": "doc",
@@ -19,31 +19,34 @@
   "author": "Mike North <michael.l.north@gmail.com> (http://mike.works)",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "1.13.8",
+    "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.0.1",
+    "ember-cli-dependency-checker": "^1.1.0",
     "ember-cli-github-pages": "0.0.6",
-    "ember-cli-htmlbars": "^1.0.0",
-    "ember-cli-ic-ajax": "0.2.1",
+    "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-pretender": "~0.5.0",
-    "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-code-snippet": "1.1.0",
-    "ember-data": "1.0.0-beta.19",
+    "ember-data": "1.13.15",
     "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
+    "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
     "ember-suave": "^1.1.0",
-    "ember-try": "0.0.8"
+    "ember-try": "~0.0.8"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.3"
+    "ember-cli-babel": "^5.1.5"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

tests/acceptance/index-test.js

@@ -21,14 +21,14 @@ module('Acceptance | index', {
 test('visiting /', function(assert) {
   visit('/');
   assert.expect(4);
-  server.put('/fruits/:id/doRipen', request => {
+  server.put('/fruits/:id/doRipen', (request) => {
     let data = JSON.parse(request.requestBody);
     assert.deepEqual(data, { id: '1', name: 'apple' }, 'member action - request payload is correct');
     assert.equal(request.url, '/fruits/1/doRipen', 'request was made to "doRipen"');
     return [200, { }, '{"status": "ok"}'];
   });
 
-  server.put('/fruits/ripenEverything', request => {
+  server.put('/fruits/ripenEverything', (request) => {
     let data = JSON.parse(request.requestBody);
     assert.deepEqual(data, { test: 'ok' }, 'collection action - request payload is correct');
     assert.ok(true, 'request was made to "ripenEverything"');

tests/dummy/app/routes/index.js

@@ -53,7 +53,7 @@ export default Ember.Route.extend({
     let arr = [];
     this.store.pushPayload('fruit', !this.store.peekAll ? LEGACY_PAYLOAD : PAYLOAD);
     if (!this.store.peekAll) {
-      arr = [1, 2, 3, 4].map(id => this.store.getById('fruit', id));
+      arr = [1, 2, 3, 4].map((id) => this.store.getById('fruit', id));
     } else {
       arr = this.store.peekAll('fruit');
     }
@@ -77,15 +77,15 @@ export default Ember.Route.extend({
     //     fruits:
     //   })];
     // });
-    server.put('/fruits/:id/doRipen', request => {
+    server.put('/fruits/:id/doRipen', (request) => {
       let controller = this.get('controller');
       controller.get('requests').addObject({
         url: request.url,
         data: JSON.parse(request.requestBody)
       });
       return [200, {}, '{"status": "ok"}'];
     });
-    server.put('/fruits/ripenEverything', request => {
+    server.put('/fruits/ripenEverything', (request) => {
       let controller = this.get('controller');
       controller.get('requests').addObject({
         url: request.url,
@@ -98,4 +98,4 @@ export default Ember.Route.extend({
   _teardownPretender() {
     this.get('server').shutdown();
   }
-});
+});

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

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