Acceptance test fixes for ember 2.0

mike-north · Aug 24, 2015 · aa3502b · aa3502b
1 parent f6c25f3
commit aa3502b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 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/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-api-actions",
   "dependencies": {
-    "ember": "1.13.9",
+    "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",

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.1.2",
     "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.1",
+    "ember-cli-app-version": "0.5.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.1",
     "ember-cli-github-pages": "0.0.6",
@@ -35,7 +35,7 @@
     "ember-data": "1.0.0-beta.19",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
+    "ember-export-application-global": "^1.0.4",
     "ember-suave": "1.0.0",
     "ember-try": "0.0.8"
   },

diff --git a/tests/dummy/app/routes/index.js b/tests/dummy/app/routes/index.js
@@ -1,10 +1,9 @@
 import Ember from 'ember';
 import Pretender from 'pretender';
 
-export default Ember.Route.extend({
-
-  model() {
-    return Ember.A(this.store.pushMany('fruit', [{
+const LEGACY_PAYLOAD = {
+  'fruit': [
+    {
       id: 1,
       name: 'apple'
     }, {
@@ -16,7 +15,43 @@ export default Ember.Route.extend({
     }, {
       id: 4,
       name: 'grape'
-    }]));
+    }
+  ]
+};
+
+const PAYLOAD = {
+  data: [{
+    type: 'fruit',
+    id: 1,
+    attributes: {
+      name: 'apple'
+    }
+  }, {
+    type: 'fruit',
+    id: 2,
+    attributes: {
+      name: 'pear'
+    }
+  }, {
+    type: 'fruit',
+    id: 3,
+    attributes: {
+      name: 'orange'
+    }
+  }, {
+    type: 'fruit',
+    id: 4,
+    attributes: {
+      name: 'grape'
+    }
+  }]
+};
+
+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'));
     // return this.get('store').findAll('fruit');
   },