From 46ac02925cbf80416bae55b91303cfc574a0d943 Mon Sep 17 00:00:00 2001 From: cibernox Date: Tue, 19 Jan 2016 12:34:45 +0000 Subject: [PATCH 1/4] Update ember-data --- bower.json | 3 +-- config/ember-try.js | 4 ++-- package.json | 1 + tests/integration/components/power-select/ember-data-test.js | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 24963ca82..fd40ee4b6 100644 --- a/bower.json +++ b/bower.json @@ -2,9 +2,8 @@ "name": "ember-power-select", "dependencies": { "ember": "2.3.0", - "ember-cli-shims": "0.0.6", + "ember-cli-shims": "0.1.0", "ember-cli-test-loader": "0.2.2", - "ember-data": "^2.2.1", "ember-load-initializers": "0.1.7", "ember-qunit-notifications": "0.1.0", "jquery": "^2.1.4", diff --git a/config/ember-try.js b/config/ember-try.js index 3666f4ce3..9f26a377f 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -7,10 +7,10 @@ module.exports = { { name: 'ember-1.13', dependencies: { - 'ember': '1.13.10' + 'ember': '1.13.12' }, resolutions: { - 'ember': '1.13.10' + 'ember': '1.13.12' } }, { diff --git a/package.json b/package.json index cf5036147..5ada7ad3d 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "ember-cli-sass": "5.1.0", "ember-cli-sri": "^2.0.0", "ember-cli-uglify": "^1.2.0", + "ember-data": "2.3.2", "ember-disable-prototype-extensions": "^1.0.0", "ember-disable-proxy-controllers": "^1.0.1", "ember-export-application-global": "^1.0.4", diff --git a/tests/integration/components/power-select/ember-data-test.js b/tests/integration/components/power-select/ember-data-test.js index ed5f02fb7..f1cd99b68 100644 --- a/tests/integration/components/power-select/ember-data-test.js +++ b/tests/integration/components/power-select/ember-data-test.js @@ -2,11 +2,13 @@ import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { typeInSearch, clickTrigger } from '../../../helpers/ember-power-select'; import mirageInitializer from '../../../../initializers/ember-cli-mirage'; +import emberDataInitializer from '../../../../initializers/ember-data'; moduleForComponent('ember-power-select', 'Integration | Component | Ember Power Select (Ember-data integration)', { integration: true, beforeEach() { mirageInitializer.initialize(this.container); + emberDataInitializer.initialize(this.registry); this.store = this.container.lookup('service:store'); } }); @@ -36,7 +38,6 @@ test('Passing as options of a `store.findAll` works', function(assert) { test('Passing as options the result of `store.query` works', function(assert) { let done = assert.async(); server.createList('user', 10); - this.users = this.store.query('user', { foo: 'bar' }); this.render(hbs` {{#power-select options=users searchField="name" onchange=(action (mut foo)) as |option|}} From eea909c5b1d8de6b34155885a8b6dc63d4867078 Mon Sep 17 00:00:00 2001 From: cibernox Date: Tue, 19 Jan 2016 12:38:49 +0000 Subject: [PATCH 2/4] Use Ember.getOwner --- .../components/power-select/ember-data-test.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/integration/components/power-select/ember-data-test.js b/tests/integration/components/power-select/ember-data-test.js index f1cd99b68..b84b2f824 100644 --- a/tests/integration/components/power-select/ember-data-test.js +++ b/tests/integration/components/power-select/ember-data-test.js @@ -1,3 +1,4 @@ +import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; import hbs from 'htmlbars-inline-precompile'; import { typeInSearch, clickTrigger } from '../../../helpers/ember-power-select'; @@ -7,9 +8,10 @@ import emberDataInitializer from '../../../../initializers/ember-data'; moduleForComponent('ember-power-select', 'Integration | Component | Ember Power Select (Ember-data integration)', { integration: true, beforeEach() { - mirageInitializer.initialize(this.container); - emberDataInitializer.initialize(this.registry); - this.store = this.container.lookup('service:store'); + let owner = Ember.getOwner(this); + mirageInitializer.initialize(owner); + emberDataInitializer.initialize(owner); + this.store = owner.lookup('service:store'); } }); From 38b7048596da4aa261f42e964acea9f3244624a2 Mon Sep 17 00:00:00 2001 From: cibernox Date: Tue, 19 Jan 2016 12:47:12 +0000 Subject: [PATCH 3/4] Try this for ember 1.13 --- config/ember-try.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/ember-try.js b/config/ember-try.js index 9f26a377f..00a37251b 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -7,10 +7,12 @@ module.exports = { { name: 'ember-1.13', dependencies: { - 'ember': '1.13.12' + 'ember': '1.13.12', + 'ember-data': '^2.2.1' }, resolutions: { - 'ember': '1.13.12' + 'ember': '1.13.12', + 'ember-data': '^2.2.1' } }, { From beba4c44eff785b0eeed142267e1d55fb8ae4401 Mon Sep 17 00:00:00 2001 From: cibernox Date: Tue, 19 Jan 2016 12:52:20 +0000 Subject: [PATCH 4/4] Disable ember-data 1.13 for now --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0bc80760c..2f9cef007 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: env: - EMBER_TRY_SCENARIO=default - - EMBER_TRY_SCENARIO=ember-1.13 + # - EMBER_TRY_SCENARIO=ember-1.13 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary