diff --git a/packages/ember-data/lib/adapters/build-url-mixin.js b/packages/ember-data/lib/adapters/build-url-mixin.js index c483a022d55..70d101de943 100644 --- a/packages/ember-data/lib/adapters/build-url-mixin.js +++ b/packages/ember-data/lib/adapters/build-url-mixin.js @@ -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': @@ -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 @@ -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); }, @@ -143,15 +123,6 @@ 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 @@ -159,10 +130,6 @@ export default Ember.Mixin.create({ * @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); }, @@ -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); -} diff --git a/packages/ember-data/tests/integration/adapter/build-url-mixin-test.js b/packages/ember-data/tests/integration/adapter/build-url-mixin-test.js index 5f3d66f25db..6795e7450ea 100644 --- a/packages/ember-data/tests/integration/adapter/build-url-mixin-test.js +++ b/packages/ember-data/tests/integration/adapter/build-url-mixin-test.js @@ -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/); -});