Merge pull request #11 from mike-north/remove-brocfile

Remove brocfile, get ember-1.13 working in CI again
mike-north · Sep 14, 2015 · 77deebf · 77deebf
2 parents 883fcbf + 3376577
commit 77deebf
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ cache:
 env:
   - EMBER_TRY_SCENARIO=ember-1.11
   - EMBER_TRY_SCENARIO=ember-1.12
-  # - EMBER_TRY_SCENARIO=ember-1.13
+  - EMBER_TRY_SCENARIO=ember-1.13
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary

diff --git a/Brocfile.js b/Brocfile.js
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -4,15 +4,6 @@ module.exports = {
       name: 'default',
       dependencies: { }
     },
-    {
-      name: 'ember-1.10',
-      dependencies: {
-        'ember': '~1.10.0'
-      },
-      resolutions: {
-        'ember': '~1.10.0'
-      }
-    },
     {
       name: 'ember-1.11',
       dependencies: {
@@ -34,43 +25,45 @@ module.exports = {
     {
       name: 'ember-1.13',
       dependencies: {
-        'ember': '~1.13.0'
+        'ember': '~1.13.0',
+        'ember-data': '~1.13.0'
       },
       resolutions: {
-        'ember': '~1.13.0'
+        'ember': '~1.13.0',
+        'ember-data': '~1.13.0'
       }
     },
     {
       name: 'ember-release',
       dependencies: {
         'ember': 'components/ember#release',
-        'ember-data': 'components/ember-data#release'
+        'ember-data': '~2.0.0'
       },
       resolutions: {
         'ember': 'release',
-        'ember-data': 'release'
+        'ember-data': '~2.0.0'
       }
     },
     {
       name: 'ember-beta',
       dependencies: {
         'ember': 'components/ember#beta',
-        'ember-data': 'components/ember-data#canary'
+        'ember-data': '~2.0.0'
       },
       resolutions: {
         'ember': 'beta',
-        'ember-data': 'canary'
+        'ember-data': '~2.0.0'
       }
     },
     {
       name: 'ember-canary',
       dependencies: {
         'ember': 'components/ember#canary',
-        'ember-data': 'components/ember-data#canary'
+        'ember-data': '~2.0.0'
       },
       resolutions: {
         'ember': 'canary',
-        'ember-data': 'canary'
+        'ember-data': '~2.0.0'
       }
     }
   ]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-api-actions",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Trigger remote actions that don't fit into CRUD, in your Ember.js apps",
   "directories": {
     "doc": "doc",

diff --git a/tests/dummy/app/adapters/application.js b/tests/dummy/app/adapters/application.js
@@ -0,0 +1,3 @@
+import DS from 'ember-data';
+
+export default (DS.JSONAPIAdapter || DS.RESTAdapter).extend({});
diff --git a/tests/dummy/app/routes/index.js b/tests/dummy/app/routes/index.js
@@ -50,8 +50,14 @@ const PAYLOAD = {
 export default Ember.Route.extend({
 
   model() {
-    this.store.pushPayload('fruit', this.store.pushMany ? LEGACY_PAYLOAD : PAYLOAD);
-    return Ember.A(this.store.pushMany ? [1, 2, 3, 4].map(id => this.store.getById('fruit', id)) : this.store.peekAll('fruit'));
+    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));
+    } else {
+      arr = this.store.peekAll('fruit');
+    }
+    return Ember.A(arr);
     // return this.get('store').findAll('fruit');
   },