Merge pull request #246 from cibernox/update_ember_data

Update ember-data

.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

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",

config/ember-try.js

@@ -7,10 +7,12 @@ module.exports = {
     {
       name: 'ember-1.13',
       dependencies: {
-        'ember': '1.13.10'
+        'ember': '1.13.12',
+        'ember-data': '^2.2.1'
       },
       resolutions: {
-        'ember': '1.13.10'
+        'ember': '1.13.12',
+        'ember-data': '^2.2.1'
       }
     },
     {

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",

tests/integration/components/power-select/ember-data-test.js

@@ -1,13 +1,17 @@
+import Ember from 'ember';
 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);
-    this.store = this.container.lookup('service:store');
+    let owner = Ember.getOwner(this);
+    mirageInitializer.initialize(owner);
+    emberDataInitializer.initialize(owner);
+    this.store = owner.lookup('service:store');
   }
 });
 
@@ -36,7 +40,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|}}