Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecation warnings #3433

Merged
merged 1 commit into from
Jun 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 } } });

Expand Down
7 changes: 2 additions & 5 deletions packages/ember-data/tests/integration/application-test.js
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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'
Expand Down Expand Up @@ -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()
});
Expand Down Expand Up @@ -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() })
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ test("store should not reload record array when shouldReloadAll returns false",
});

run(function() {
store.find('person');
store.findAll('person');
});
});

Expand Down
2 changes: 1 addition & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

var skipPackageRegexp = new RegExp('^('+skipPackages.join('|')+')/');

var keys = Ember.keys(requirejs.entries);
var keys = Object.keys(requirejs.entries);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one has been missed in #3432

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!


for (var i = 0, length = keys.length; i < length; i++) {
var moduleName = keys[i];
Expand Down