From 3770c0407b2eaee00742af8f438cde90e1430f2c Mon Sep 17 00:00:00 2001 From: Mike North Date: Sun, 13 Sep 2015 08:20:39 -0800 Subject: [PATCH 1/2] Remove brocfile --- .travis.yml | 2 +- Brocfile.js | 18 ----------------- config/ember-try.js | 27 +++++++++---------------- tests/dummy/app/adapters/application.js | 3 +++ tests/dummy/app/routes/index.js | 8 +++++++- 5 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 Brocfile.js create mode 100644 tests/dummy/app/adapters/application.js diff --git a/.travis.yml b/.travis.yml index 6fc7f352..518cf45b 100644 --- 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 deleted file mode 100644 index fe0ff530..00000000 --- a/Brocfile.js +++ /dev/null @@ -1,18 +0,0 @@ -/* jshint node: true */ -/* global require, module */ - -var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); - -/* - This Brocfile specifes the options for the dummy test app of this - addon, located in `/tests/dummy` - - This Brocfile does *not* influence how the addon or the app using it - behave. You most likely want to be modifying `./index.js` or app's Brocfile -*/ - -var app = new EmberAddon({ - snippetSearchPaths: ['app', 'addon', 'tests/dummy/app'] -}); - -module.exports = app.toTree(); diff --git a/config/ember-try.js b/config/ember-try.js index 99946f43..8d30c5f2 100644 --- 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/tests/dummy/app/adapters/application.js b/tests/dummy/app/adapters/application.js new file mode 100644 index 00000000..d5b895cd --- /dev/null +++ b/tests/dummy/app/adapters/application.js @@ -0,0 +1,3 @@ +import DS from 'ember-data'; + +export default DS.RESTAdapter.extend({}); \ No newline at end of file diff --git a/tests/dummy/app/routes/index.js b/tests/dummy/app/routes/index.js index a0fe9132..197c78c6 100644 --- a/tests/dummy/app/routes/index.js +++ b/tests/dummy/app/routes/index.js @@ -51,7 +51,13 @@ 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 = []; + 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'); }, From 3376577fe6e760f9cb3918484994b76f9692f265 Mon Sep 17 00:00:00 2001 From: Mike North Date: Mon, 14 Sep 2015 09:57:04 -0700 Subject: [PATCH 2/2] Finally, a demo app that works across a bunch of ember-data versions --- package.json | 2 +- tests/dummy/app/adapters/application.js | 2 +- tests/dummy/app/routes/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5e1108bb..39235403 100644 --- 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 index d5b895cd..75d1158d 100644 --- a/tests/dummy/app/adapters/application.js +++ b/tests/dummy/app/adapters/application.js @@ -1,3 +1,3 @@ import DS from 'ember-data'; -export default DS.RESTAdapter.extend({}); \ No newline at end of file +export default (DS.JSONAPIAdapter || DS.RESTAdapter).extend({}); \ No newline at end of file diff --git a/tests/dummy/app/routes/index.js b/tests/dummy/app/routes/index.js index 197c78c6..44e7a6aa 100644 --- a/tests/dummy/app/routes/index.js +++ b/tests/dummy/app/routes/index.js @@ -50,8 +50,8 @@ const PAYLOAD = { export default Ember.Route.extend({ model() { - this.store.pushPayload('fruit', this.store.pushMany ? LEGACY_PAYLOAD : PAYLOAD); 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 {