Merge pull request #3433 from pangratz/fix_deprecations

Fix deprecation warnings
emberjs · Jun 24, 2015 · 9022250 · 9022250
2 parents 23a5b13 + 8553200
commit 9022250
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/packages/ember-data/tests/integration/adapter/json-api-adapter-test.js b/packages/ember-data/tests/integration/adapter/json-api-adapter-test.js
@@ -204,7 +204,7 @@ test('find many records', function() {
   }]);
 
   run(function() {
-    store.find('post', { filter: { id: 1 } }).then(function(posts) {
+    store.query('post', { filter: { id: 1 } }).then(function(posts) {
       equal(passedUrl[0], '/posts');
       deepEqual(passedHash[0], { data: { filter: { id: 1 } } });
 

diff --git a/packages/ember-data/tests/integration/application-test.js b/packages/ember-data/tests/integration/application-test.js
@@ -1,7 +1,6 @@
 var run = Ember.run;
 var Application = Ember.Application;
 var Controller = Ember.Controller;
-var View = Ember.View;
 var Store = DS.Store;
 var Namespace = Ember.Namespace;
 
@@ -24,9 +23,8 @@ module("integration/application - Injecting a Custom Store", {
   setup: function() {
     run(function() {
       app = Application.create({
-        ApplicationStore: Store.extend({ isCustom: true }),
+        StoreService: Store.extend({ isCustom: true }),
         FooController: Controller.extend(),
-        ApplicationView: View.extend(),
         BazController: {},
         ApplicationController: Controller.extend(),
         rootElement: '#qunit-fixture'
@@ -83,7 +81,6 @@ module("integration/application - Injecting the Default Store", {
     run(function() {
       app = Application.create({
         FooController: Controller.extend(),
-        ApplicationView: View.extend(),
         BazController: {},
         ApplicationController: Controller.extend()
       });
@@ -120,7 +117,7 @@ if (Ember.inject && Ember.inject.service) {
     setup: function() {
       run(function() {
         app = Application.create({
-          DoodleService: Ember.Object.extend({ store: Ember.inject.service() })
+          DoodleService: Ember.Service.extend({ store: Ember.inject.service() })
         });
       });
 

diff --git a/packages/ember-data/tests/integration/debug-adapter-test.js b/packages/ember-data/tests/integration/debug-adapter-test.js
@@ -8,7 +8,7 @@ module("DS.DebugAdapter", {
       App = Ember.Application.create();
       App.toString = function() { return 'App'; };
 
-      App.ApplicationStore = DS.Store.extend({
+      App.StoreService = DS.Store.extend({
         adapter: DS.Adapter.extend()
       });
 

diff --git a/packages/ember-data/tests/unit/store/adapter-interop-test.js b/packages/ember-data/tests/unit/store/adapter-interop-test.js
@@ -1034,7 +1034,7 @@ test("store should not reload record array when shouldReloadAll returns false",
   });
 
   run(function() {
-    store.find('person');
+    store.findAll('person');
   });
 });
 

diff --git a/tests/index.html b/tests/index.html
@@ -62,7 +62,7 @@
 
         var skipPackageRegexp = new RegExp('^('+skipPackages.join('|')+')/');
 
-        var keys = Ember.keys(requirejs.entries);
+        var keys = Object.keys(requirejs.entries);
 
         for (var i = 0, length = keys.length; i < length; i++) {
           var moduleName = keys[i];
-Original file line number
+Diff line change
@@ Expand Up @@
       });
       run(function() {
-        store.find('person');
+        store.findAll('person');
       });
     });
@@ Expand Down @@