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.

Sign up for GitHub

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

Jump to bottom

[CLEANUP beta] Remove BuildURLMixin deprecations #3438

Merged
merged 1 commit into from
Jun 30, 2015
Merged

[CLEANUP beta] Remove BuildURLMixin deprecations #3438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 0 additions & 43 deletions packages/ember-data/lib/adapters/build-url-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,10 @@ export default Ember.Mixin.create({
*/
buildURL: function(modelName, id, snapshot, requestType, query) {
switch (requestType) {
case 'find':
// The `find` case is deprecated
return this.urlForFind(id, modelName, snapshot);
case 'findRecord':
return this.urlForFindRecord(id, modelName, snapshot);
case 'findAll':
return this.urlForFindAll(modelName);
case 'findQuery':
// The `findQuery` case is deprecated
return this.urlForFindQuery(query, modelName);
case 'query':
return this.urlForQuery(query, modelName);
case 'findMany':
Expand Down Expand Up @@ -109,16 +103,6 @@ export default Ember.Mixin.create({
return url;
},

/**
* @method urlForFind
* @param {String} id
* @param {String} modelName
* @param {DS.Snapshot} snapshot
* @return {String} url
* @deprecated Use [urlForFindRecord](#method_urlForFindRecord) instead
*/
urlForFind: urlForFind,

/**
* @method urlForFind
* @param {String} id
Expand All @@ -127,10 +111,6 @@ export default Ember.Mixin.create({
* @return {String} url
*/
urlForFindRecord: function(id, modelName, snapshot) {
if (this.urlForFind !== urlForFind) {
Ember.deprecate('BuildURLMixin#urlForFind has been deprecated and renamed to `urlForFindRecord`.');
return this.urlForFind(id, modelName, snapshot);
}
return this._buildURL(modelName, id);
},

Expand All @@ -143,26 +123,13 @@ export default Ember.Mixin.create({
return this._buildURL(modelName);
},

/**
* @method urlForFindQuery
* @param {Object} query
* @param {String} modelName
* @return {String} url
* @deprecated Use [urlForQuery](#method_urlForQuery) instead
*/
urlForFindQuery: urlForFindQuery,

/**
* @method urlForQuery
* @param {Object} query
* @param {String} modelName
* @return {String} url
*/
urlForQuery: function(query, modelName) {
if (this.urlForFindQuery !== urlForFindQuery) {
Ember.deprecate('BuildURLMixin#urlForFindQuery has been deprecated and renamed to `urlForQuery`.');
return this.urlForFindQuery(query, modelName);
}
return this._buildURL(modelName);
},

Expand Down Expand Up @@ -303,13 +270,3 @@ export default Ember.Mixin.create({
return Ember.String.pluralize(camelized);
}
});

function urlForFind(id, modelName, snapshot) {
Ember.deprecate('BuildURLMixin#urlForFind has been deprecated and renamed to `urlForFindRecord`.');
return this._buildURL(modelName, id);
}

function urlForFindQuery(query, modelName) {
Ember.deprecate('BuildURLMixin#urlForFindQuery has been deprecated and renamed to `urlForQuery`.');
return this._buildURL(modelName);
}
30 changes: 0 additions & 30 deletions packages/ember-data/tests/integration/adapter/build-url-mixin-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,33 +308,3 @@ test('buildURL - with absolute namespace', function() {
equal(passedUrl, "/api/v1/posts/1");
}));
});


test('buildURL - urlForFindRecord calls deprecated urlForFind', function() {
expect(2);

var adapter = DS.RESTAdapter.extend({
urlForFind: function() {
ok(true, 'urlForFind should be called');
}
}).create();

expectDeprecation(function() {
adapter.buildURL('post', 1, {}, 'findRecord');
}, /urlForFindRecord/);
});


test('buildURL - urlForQuery calls deprecated urlForFindQuery', function() {
expect(2);

var adapter = DS.RESTAdapter.extend({
urlForFindQuery: function() {
ok(true, 'urlForFindQuery should be called');
}
}).create();

expectDeprecation(function() {
adapter.buildURL('post', 1, {}, 'query');
}, /urlForQuery/);
});