From e1233084abdd6b5cb40070da54431f32d03c25e7 Mon Sep 17 00:00:00 2001 From: paddyobrien Date: Thu, 8 Oct 2015 09:52:27 +0100 Subject: [PATCH 1/4] Remove dependence on Enumerable utils --- ember-model.js | 22 +++++++++++----------- package.json | 2 +- packages/ember-model/lib/has_many_array.js | 12 ++++++------ packages/ember-model/lib/model.js | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ember-model.js b/ember-model.js index 7d3e8f5..056f6b0 100644 --- a/ember-model.js +++ b/ember-model.js @@ -191,7 +191,7 @@ Ember.RecordArray = Ember.ArrayProxy.extend(Ember.Evented, { var modelClass = this.get('modelClass'), self = this, promises; - + set(this, 'isLoaded', false); if (modelClass._findAllRecordArray === this) { return modelClass.adapter.findAll(modelClass, this); @@ -340,29 +340,29 @@ Ember.ManyArray = Ember.RecordArray.extend({ }, replaceContent: function(index, removed, added) { - added = Ember.EnumerableUtils.map(added, function(record) { + added = added.map(function(record) { return record._reference; }, this); this._super(index, removed, added); }, - _contentWillChange: function() { + _contentDidChange: function() { var content = get(this, 'content'); + var contentPrev = this._content; - if (content) { - this.arrayWillChange(content, 0, get(content, 'length'), 0); - content.removeArrayObserver(this); + if (contentPrev && contentPrev !== content) { + this.arrayWillChange(contentPrev, 0, get(contentPrev, 'length'), 0); + contentPrev.removeArrayObserver(this); this._setupOriginalContent(content); } - }.observesBefore('content'), - _contentDidChange: function() { - var content = get(this, 'content'); if (content) { content.addArrayObserver(this); this.arrayDidChange(content, 0, 0, get(content, 'length')); } + + this._content = content; }.observes('content'), arrayWillChange: function(item, idx, removedCnt, addedCnt) { @@ -891,7 +891,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, { } else { mapFunction = function(id) { return type._getOrCreateReferenceForId(id); }; } - content = Ember.EnumerableUtils.map(content, mapFunction); + content = content.map(mapFunction); } return Ember.A(content || []); @@ -2111,4 +2111,4 @@ Ember.onLoad('Ember.Application', function(Application) { }); -})(); +})(); \ No newline at end of file diff --git a/package.json b/package.json index caa8089..b9cbf57 100644 --- a/package.json +++ b/package.json @@ -32,5 +32,5 @@ "grunt-contrib-watch": "~0.4.4", "grunt-ember-s3": "~1.0.2" }, - "version": "0.0.16" + "version": "0.0.17" } diff --git a/packages/ember-model/lib/has_many_array.js b/packages/ember-model/lib/has_many_array.js index 9ffefcc..0c2d35f 100644 --- a/packages/ember-model/lib/has_many_array.js +++ b/packages/ember-model/lib/has_many_array.js @@ -39,12 +39,12 @@ Ember.ManyArray = Ember.RecordArray.extend({ var content = get(this, 'content'); if (!content.length) { return; } - + // need to add observer if it wasn't materialized before var observerNeeded = (content[idx].record) ? false : true; var record = this.materializeRecord(idx, this.container); - + if (observerNeeded) { var isDirtyRecord = record.get('isDirty'), isNewRecord = record.get('isNew'); if (isDirtyRecord || isNewRecord) { this._modifiedRecords.pushObject(content[idx]); } @@ -63,7 +63,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ }, replaceContent: function(index, removed, added) { - added = Ember.EnumerableUtils.map(added, function(record) { + added = added.map(function(record) { return record._reference; }, this); @@ -107,7 +107,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ var content = item; for (var i = idx; i < idx+addedCnt; i++) { var currentItem = content[i]; - if (currentItem && currentItem.record) { + if (currentItem && currentItem.record) { var isDirtyRecord = currentItem.record.get('isDirty'), isNewRecord = currentItem.record.get('isNew'); // why newly created object is not dirty? if (isDirtyRecord || isNewRecord) { this._modifiedRecords.pushObject(currentItem); } Ember.addObserver(currentItem, 'record.isDirty', this, 'recordStateChanged'); @@ -149,7 +149,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ }, recordStateChanged: function(obj, keyName) { - var parent = get(this, 'parent'), relationshipKey = get(this, 'relationshipKey'); + var parent = get(this, 'parent'), relationshipKey = get(this, 'relationshipKey'); if (obj.record.get('isDirty')) { if (this._modifiedRecords.indexOf(obj) === -1) { this._modifiedRecords.pushObject(obj); } @@ -157,7 +157,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ } else { if (this._modifiedRecords.indexOf(obj) > -1) { this._modifiedRecords.removeObject(obj); } if (!this.get('isDirty')) { - parent._relationshipBecameClean(relationshipKey); + parent._relationshipBecameClean(relationshipKey); } } } diff --git a/packages/ember-model/lib/model.js b/packages/ember-model/lib/model.js index 6224ddd..a768b43 100644 --- a/packages/ember-model/lib/model.js +++ b/packages/ember-model/lib/model.js @@ -379,7 +379,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, { } else { mapFunction = function(id) { return type._getOrCreateReferenceForId(id); }; } - content = Ember.EnumerableUtils.map(content, mapFunction); + content = content.map(mapFunction); } return Ember.A(content || []); From 21b28abdeed6c9152cca5b4d882069b634445aa0 Mon Sep 17 00:00:00 2001 From: Bob Long Date: Thu, 8 Oct 2015 12:18:44 +0100 Subject: [PATCH 2/4] Resolve empty successful deletes --- packages/ember-model/lib/rest_adapter.js | 13 ++++++-- .../tests/adapter/rest_adapter_test.js | 30 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/packages/ember-model/lib/rest_adapter.js b/packages/ember-model/lib/rest_adapter.js index cb1bd1c..133da60 100644 --- a/packages/ember-model/lib/rest_adapter.js +++ b/packages/ember-model/lib/rest_adapter.js @@ -90,7 +90,7 @@ Ember.RESTAdapter = Ember.Adapter.extend({ url = this.buildURL(record.constructor, get(record, primaryKey)), self = this; - return this.ajax(url, record.toJSON(), "DELETE").then(function(data) { // TODO: Some APIs may or may not return data + return this.ajax(url, record.toJSON(), "DELETE").then(function(data) { self.didDeleteRecord(record, data); }); }, @@ -124,6 +124,7 @@ Ember.RESTAdapter = Ember.Adapter.extend({ }, _ajax: function(url, params, method, settings) { + var self = this; if (!settings) { settings = this.ajaxSettings(url, method); } @@ -148,7 +149,7 @@ Ember.RESTAdapter = Ember.Adapter.extend({ jqXHR.then = null; } - Ember.run(null, reject, jqXHR); + self._handleRejections(method, jqXHR, resolve, reject); }; @@ -156,6 +157,14 @@ Ember.RESTAdapter = Ember.Adapter.extend({ }); }, + _handleRejections: function(method, jqXHR, resolve, reject) { + if (method === "DELETE" && jqXHR.status >= 200 && jqXHR.status < 300) { + Ember.run(null, resolve, null); + } else { + Ember.run(null, reject, jqXHR); + } + }, + _loadRecordFromData: function(record, data) { var rootKey = get(record.constructor, 'rootKey'), primaryKey = get(record.constructor, 'primaryKey'); diff --git a/packages/ember-model/tests/adapter/rest_adapter_test.js b/packages/ember-model/tests/adapter/rest_adapter_test.js index 233c1ec..a24f7b5 100644 --- a/packages/ember-model/tests/adapter/rest_adapter_test.js +++ b/packages/ember-model/tests/adapter/rest_adapter_test.js @@ -881,3 +881,33 @@ test("buildURL() creates url from model's url, id, and url suffix", function() { url = adapter.buildURL(RESTModel, "123"); equal(url, "/posts/123.json" ); }); + +test('_handleRejections() will resolve empty successful DELETEs', function() { + expect(1); + var resolve = function(data) { + ok(data === null, "resolved with null"); + }; + Ember.run(function() { + adapter._handleRejections("DELETE", {status: 200}, resolve, Ember.$.noop); + }); +}); + +test('_handleRejections() will reject empty responses for other verbs', function() { + expect(1); + var reject = function(data) { + ok(data.status === 200, "rejected with 200 status"); + }; + Ember.run(function() { + adapter._handleRejections("PUT", {status: 200}, Ember.$.noop, reject); + }); +}); + +test('_handleRejections() will reject DELETEs with unsuccessful status codes', function() { + expect(1); + var reject = function(data) { + ok(data.status === 403, "rejected with 403 status"); + }; + Ember.run(function() { + adapter._handleRejections("DELETE", {status: 403}, Ember.$.noop, reject); + }); +}); From 595c31447217504927099daf61f49ee0ec1041ed Mon Sep 17 00:00:00 2001 From: paddyobrien Date: Thu, 8 Oct 2015 09:52:27 +0100 Subject: [PATCH 3/4] Remove dependence on Enumerable utils --- ember-model.js | 22 +++++++++++----------- package.json | 2 +- packages/ember-model/lib/has_many_array.js | 12 ++++++------ packages/ember-model/lib/model.js | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ember-model.js b/ember-model.js index 7d3e8f5..056f6b0 100644 --- a/ember-model.js +++ b/ember-model.js @@ -191,7 +191,7 @@ Ember.RecordArray = Ember.ArrayProxy.extend(Ember.Evented, { var modelClass = this.get('modelClass'), self = this, promises; - + set(this, 'isLoaded', false); if (modelClass._findAllRecordArray === this) { return modelClass.adapter.findAll(modelClass, this); @@ -340,29 +340,29 @@ Ember.ManyArray = Ember.RecordArray.extend({ }, replaceContent: function(index, removed, added) { - added = Ember.EnumerableUtils.map(added, function(record) { + added = added.map(function(record) { return record._reference; }, this); this._super(index, removed, added); }, - _contentWillChange: function() { + _contentDidChange: function() { var content = get(this, 'content'); + var contentPrev = this._content; - if (content) { - this.arrayWillChange(content, 0, get(content, 'length'), 0); - content.removeArrayObserver(this); + if (contentPrev && contentPrev !== content) { + this.arrayWillChange(contentPrev, 0, get(contentPrev, 'length'), 0); + contentPrev.removeArrayObserver(this); this._setupOriginalContent(content); } - }.observesBefore('content'), - _contentDidChange: function() { - var content = get(this, 'content'); if (content) { content.addArrayObserver(this); this.arrayDidChange(content, 0, 0, get(content, 'length')); } + + this._content = content; }.observes('content'), arrayWillChange: function(item, idx, removedCnt, addedCnt) { @@ -891,7 +891,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, { } else { mapFunction = function(id) { return type._getOrCreateReferenceForId(id); }; } - content = Ember.EnumerableUtils.map(content, mapFunction); + content = content.map(mapFunction); } return Ember.A(content || []); @@ -2111,4 +2111,4 @@ Ember.onLoad('Ember.Application', function(Application) { }); -})(); +})(); \ No newline at end of file diff --git a/package.json b/package.json index caa8089..b9cbf57 100644 --- a/package.json +++ b/package.json @@ -32,5 +32,5 @@ "grunt-contrib-watch": "~0.4.4", "grunt-ember-s3": "~1.0.2" }, - "version": "0.0.16" + "version": "0.0.17" } diff --git a/packages/ember-model/lib/has_many_array.js b/packages/ember-model/lib/has_many_array.js index 9ffefcc..0c2d35f 100644 --- a/packages/ember-model/lib/has_many_array.js +++ b/packages/ember-model/lib/has_many_array.js @@ -39,12 +39,12 @@ Ember.ManyArray = Ember.RecordArray.extend({ var content = get(this, 'content'); if (!content.length) { return; } - + // need to add observer if it wasn't materialized before var observerNeeded = (content[idx].record) ? false : true; var record = this.materializeRecord(idx, this.container); - + if (observerNeeded) { var isDirtyRecord = record.get('isDirty'), isNewRecord = record.get('isNew'); if (isDirtyRecord || isNewRecord) { this._modifiedRecords.pushObject(content[idx]); } @@ -63,7 +63,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ }, replaceContent: function(index, removed, added) { - added = Ember.EnumerableUtils.map(added, function(record) { + added = added.map(function(record) { return record._reference; }, this); @@ -107,7 +107,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ var content = item; for (var i = idx; i < idx+addedCnt; i++) { var currentItem = content[i]; - if (currentItem && currentItem.record) { + if (currentItem && currentItem.record) { var isDirtyRecord = currentItem.record.get('isDirty'), isNewRecord = currentItem.record.get('isNew'); // why newly created object is not dirty? if (isDirtyRecord || isNewRecord) { this._modifiedRecords.pushObject(currentItem); } Ember.addObserver(currentItem, 'record.isDirty', this, 'recordStateChanged'); @@ -149,7 +149,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ }, recordStateChanged: function(obj, keyName) { - var parent = get(this, 'parent'), relationshipKey = get(this, 'relationshipKey'); + var parent = get(this, 'parent'), relationshipKey = get(this, 'relationshipKey'); if (obj.record.get('isDirty')) { if (this._modifiedRecords.indexOf(obj) === -1) { this._modifiedRecords.pushObject(obj); } @@ -157,7 +157,7 @@ Ember.ManyArray = Ember.RecordArray.extend({ } else { if (this._modifiedRecords.indexOf(obj) > -1) { this._modifiedRecords.removeObject(obj); } if (!this.get('isDirty')) { - parent._relationshipBecameClean(relationshipKey); + parent._relationshipBecameClean(relationshipKey); } } } diff --git a/packages/ember-model/lib/model.js b/packages/ember-model/lib/model.js index c3e50b0..e5f05fc 100644 --- a/packages/ember-model/lib/model.js +++ b/packages/ember-model/lib/model.js @@ -383,7 +383,7 @@ Ember.Model = Ember.Object.extend(Ember.Evented, { } else { mapFunction = function(id) { return type._getOrCreateReferenceForId(id); }; } - content = Ember.EnumerableUtils.map(content, mapFunction); + content = content.map(mapFunction); } return Ember.A(content || []); From 6f79257fd6c1eef1aecedd762338e778d3630b10 Mon Sep 17 00:00:00 2001 From: Eoin Nolan Date: Fri, 28 Oct 2016 11:47:49 -0700 Subject: [PATCH 4/4] Rename store and adapter --- ember-model.js | 40 +++++++-------- packages/ember-model/lib/belongs_to.js | 18 +++---- packages/ember-model/lib/debug_adapter.js | 4 +- packages/ember-model/lib/has_many.js | 6 +-- packages/ember-model/lib/store.js | 10 ++-- packages/ember-model/tests/store_test.js | 60 +++++++++++------------ 6 files changed, 69 insertions(+), 69 deletions(-) diff --git a/ember-model.js b/ember-model.js index abb9424..740bc40 100644 --- a/ember-model.js +++ b/ember-model.js @@ -1418,9 +1418,9 @@ function getType(record) { this.type = get(Ember.lookup, this.type); if (!this.type) { - var store = record.container.lookup('store:main'); - this.type = store.modelFor(type); - this.type.reopenClass({ adapter: store.adapterFor(type) }); + var emstore = record.container.lookup('emstore:main'); + this.type = emstore.modelFor(type); + this.type.reopenClass({ adapter: emstore.adapterFor(type) }); } } @@ -1480,7 +1480,7 @@ var get = Ember.get, function storeFor(record) { if (record.container) { - return record.container.lookup('store:main'); + return record.container.lookup('emstore:main'); } return null; @@ -1493,9 +1493,9 @@ function getType(record) { type = Ember.get(Ember.lookup, this.type); if (!type) { - var store = storeFor(record); - type = store.modelFor(this.type); - type.reopenClass({ adapter: store.adapterFor(this.type) }); + var emstore = storeFor(record); + type = emstore.modelFor(this.type); + type.reopenClass({ adapter: emstore.adapterFor(this.type) }); } } @@ -1523,8 +1523,8 @@ Ember.belongsTo = function(type, options) { } }; - var store = storeFor(this), - value = this.getBelongsTo(key, type, meta, store); + var emstore = storeFor(this), + value = this.getBelongsTo(key, type, meta, emstore); this._registerBelongsTo(meta); if (value !== null && meta.options.embedded) { value.get('isDirty'); // getter must be called before adding observer @@ -1583,7 +1583,7 @@ Ember.belongsTo = function(type, options) { }; Ember.Model.reopen({ - getBelongsTo: function(key, type, meta, store) { + getBelongsTo: function(key, type, meta, emstore) { var idOrAttrs = get(this, '_data.' + key), record; @@ -1597,8 +1597,8 @@ Ember.Model.reopen({ record = type.create({ isLoaded: false, id: id, container: this.container }); record.load(id, idOrAttrs); } else { - if (store) { - record = store._findSync(meta.type, idOrAttrs); + if (emstore) { + record = emstore._findSync(meta.type, idOrAttrs); } else { record = type.find(idOrAttrs); } @@ -2036,11 +2036,11 @@ var DebugAdapter = Ember.DataAdapter.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "data-adapter", + name: "em-data-adapter", initialize: function() { var application = arguments[1] || arguments[0]; - application.register('data-adapter:main', DebugAdapter); + application.register('em-data-adapter:main', DebugAdapter); } }); }); @@ -2111,16 +2111,16 @@ Ember.Model.Store = Ember.Object.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "store", + name: "emstore", initialize: function() { var application = arguments[1] || arguments[0]; - var store = application.Store || Ember.Model.Store; - application.register('store:application', store); - application.register('store:main', store); + var emstore = application.Store || Ember.Model.Store; + application.register('emstore:application', emstore); + application.register('emstore:main', emstore); - application.inject('route', 'store', 'store:main'); - application.inject('controller', 'store', 'store:main'); + application.inject('route', 'emstore', 'emstore:main'); + application.inject('controller', 'emstore', 'emstore:main'); } }); diff --git a/packages/ember-model/lib/belongs_to.js b/packages/ember-model/lib/belongs_to.js index 36e4751..013553a 100644 --- a/packages/ember-model/lib/belongs_to.js +++ b/packages/ember-model/lib/belongs_to.js @@ -4,7 +4,7 @@ var get = Ember.get, function storeFor(record) { if (record.container) { - return record.container.lookup('store:main'); + return record.container.lookup('emstore:main'); } return null; @@ -17,9 +17,9 @@ function getType(record) { type = Ember.get(Ember.lookup, this.type); if (!type) { - var store = storeFor(record); - type = store.modelFor(this.type); - type.reopenClass({ adapter: store.adapterFor(this.type) }); + var emstore = storeFor(record); + type = emstore.modelFor(this.type); + type.reopenClass({ adapter: emstore.adapterFor(this.type) }); } } @@ -47,8 +47,8 @@ Ember.belongsTo = function(type, options) { } }; - var store = storeFor(this), - value = this.getBelongsTo(key, type, meta, store); + var emstore = storeFor(this), + value = this.getBelongsTo(key, type, meta, emstore); this._registerBelongsTo(meta); if (value !== null && meta.options.embedded) { value.get('isDirty'); // getter must be called before adding observer @@ -107,7 +107,7 @@ Ember.belongsTo = function(type, options) { }; Ember.Model.reopen({ - getBelongsTo: function(key, type, meta, store) { + getBelongsTo: function(key, type, meta, emstore) { var idOrAttrs = get(this, '_data.' + key), record; @@ -121,8 +121,8 @@ Ember.Model.reopen({ record = type.create({ isLoaded: false, id: id, container: this.container }); record.load(id, idOrAttrs); } else { - if (store) { - record = store._findSync(meta.type, idOrAttrs); + if (emstore) { + record = emstore._findSync(meta.type, idOrAttrs); } else { record = type.find(idOrAttrs); } diff --git a/packages/ember-model/lib/debug_adapter.js b/packages/ember-model/lib/debug_adapter.js index 57384cf..cc82bc2 100644 --- a/packages/ember-model/lib/debug_adapter.js +++ b/packages/ember-model/lib/debug_adapter.js @@ -105,11 +105,11 @@ var DebugAdapter = Ember.DataAdapter.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "data-adapter", + name: "em-data-adapter", initialize: function() { var application = arguments[1] || arguments[0]; - application.register('data-adapter:main', DebugAdapter); + application.register('em-data-adapter:main', DebugAdapter); } }); }); diff --git a/packages/ember-model/lib/has_many.js b/packages/ember-model/lib/has_many.js index aa5652c..a2ee68c 100644 --- a/packages/ember-model/lib/has_many.js +++ b/packages/ember-model/lib/has_many.js @@ -8,9 +8,9 @@ function getType(record) { this.type = get(Ember.lookup, this.type); if (!this.type) { - var store = record.container.lookup('store:main'); - this.type = store.modelFor(type); - this.type.reopenClass({ adapter: store.adapterFor(type) }); + var emstore = record.container.lookup('emstore:main'); + this.type = emstore.modelFor(type); + this.type.reopenClass({ adapter: emstore.adapterFor(type) }); } } diff --git a/packages/ember-model/lib/store.js b/packages/ember-model/lib/store.js index f273129..a6f097f 100644 --- a/packages/ember-model/lib/store.js +++ b/packages/ember-model/lib/store.js @@ -59,16 +59,16 @@ Ember.Model.Store = Ember.Object.extend({ Ember.onLoad('Ember.Application', function(Application) { Application.initializer({ - name: "store", + name: "emstore", initialize: function() { var application = arguments[1] || arguments[0]; var store = application.Store || Ember.Model.Store; - application.register('store:application', store); - application.register('store:main', store); + application.register('emstore:application', store); + application.register('emstore:main', store); - application.inject('route', 'store', 'store:main'); - application.inject('controller', 'store', 'store:main'); + application.inject('route', 'emstore', 'emstore:main'); + application.inject('controller', 'emstore', 'emstore:main'); } }); diff --git a/packages/ember-model/tests/store_test.js b/packages/ember-model/tests/store_test.js index 2072a2e..4809487 100644 --- a/packages/ember-model/tests/store_test.js +++ b/packages/ember-model/tests/store_test.js @@ -1,11 +1,11 @@ -var TestModel, EmbeddedModel, UUIDModel, store, registry, container, App; +var TestModel, EmbeddedModel, UUIDModel, emstore, registry, container, App; module("Ember.Model.Store", { setup: function() { registry = new Ember.Registry(); container = registry.container(); - store = Ember.Model.Store.create({container: container}); + emstore = Ember.Model.Store.create({container: container}); TestModel = Ember.Model.extend({ token: Ember.attr(), name: Ember.attr(), @@ -64,26 +64,26 @@ module("Ember.Model.Store", { registry.register('model:test', TestModel); registry.register('model:embedded', EmbeddedModel); registry.register('model:uuid', UUIDModel); - registry.register('store:main', Ember.Model.Store); + registry.register('emstore:main', Ember.Model.Store); } }); -test("store.createRecord(type) returns a record with a container", function() { - var record = Ember.run(store, store.createRecord, 'test'); +test("emstore.createRecord(type) returns a record with a container", function() { + var record = Ember.run(emstore, emstore.createRecord, 'test'); equal(record.container, container); equal(record.container, container); }); -test("store.createRecord(type) with properties", function() { +test("emstore.createRecord(type) with properties", function() { expect(2); - var record = Ember.run(store, store.createRecord, 'test', {token: 'c', name: 'Andrew'}); + var record = Ember.run(emstore, emstore.createRecord, 'test', {token: 'c', name: 'Andrew'}); equal(record.get('token'), 'c'); equal(record.get('name'), 'Andrew'); }); test("model.load(hashes) returns a existing record with correct container", function() { - var model = store.modelFor('uuid'), - record = Ember.run(store, store.createRecord, 'uuid'); + var model = emstore.modelFor('uuid'), + record = Ember.run(emstore, emstore.createRecord, 'uuid'); equal(model, UUIDModel); equal(record.container, container); @@ -108,9 +108,9 @@ test("model.load(hashes) returns a existing record with correct container", func equal(record.get('container'), container); }); -test("store.find(type) returns a record with hasMany and belongsTo that should all have a container", function() { +test("emstore.find(type) returns a record with hasMany and belongsTo that should all have a container", function() { expect(4); - var promise = Ember.run(store, store.find, 'test', 'a'); + var promise = Ember.run(emstore, emstore.find, 'test', 'a'); promise.then(function(record) { start(); ok(record.get('container')); @@ -123,10 +123,10 @@ test("store.find(type) returns a record with hasMany and belongsTo that should a stop(); }); -test("store.find(type, id) returns a promise and loads a container for the record", function() { +test("emstore.find(type, id) returns a promise and loads a container for the record", function() { expect(2); - var promise = Ember.run(store, store.find, 'test','a'); + var promise = Ember.run(emstore, emstore.find, 'test','a'); promise.then(function(record) { start(); ok(record.get('isLoaded')); @@ -135,10 +135,10 @@ test("store.find(type, id) returns a promise and loads a container for the recor stop(); }); -test("store.find(type) returns a promise and loads a container for each record", function() { +test("emstore.find(type) returns a promise and loads a container for each record", function() { expect(5); - var promise = Ember.run(store, store.find, 'test'); + var promise = Ember.run(emstore, emstore.find, 'test'); promise.then(function(records) { start(); equal(records.content.length, 2); @@ -150,10 +150,10 @@ test("store.find(type) returns a promise and loads a container for each record", stop(); }); -test("store.find(type, Array) returns a promise and loads a container for each record", function() { +test("emstore.find(type, Array) returns a promise and loads a container for each record", function() { expect(5); - var promise = Ember.run(store, store.find, 'test', ['a','b']); + var promise = Ember.run(emstore, emstore.find, 'test', ['a','b']); promise.then(function(records) { start(); equal(records.content.length, 2); @@ -165,45 +165,45 @@ test("store.find(type, Array) returns a promise and loads a container for each r stop(); }); -test("store.adapterFor(type) returns klass.adapter first", function() { - var adapter = Ember.run(store, store.adapterFor, 'test'); +test("emstore.adapterFor(type) returns klass.adapter first", function() { + var adapter = Ember.run(emstore, emstore.adapterFor, 'test'); equal(adapter.constructor, Ember.FixtureAdapter); }); -test("store.adapterFor(type) returns type adapter if no klass.adapter", function() { +test("emstore.adapterFor(type) returns type adapter if no klass.adapter", function() { TestModel.adapter = undefined; registry.register('adapter:test', Ember.FixtureAdapter); registry.register('adapter:application', null); - var adapter = Ember.run(store, store.adapterFor, 'test'); + var adapter = Ember.run(emstore, emstore.adapterFor, 'test'); ok(adapter instanceof Ember.FixtureAdapter); }); -test("store.adapterFor(type) returns application adapter if no klass.adapter or type adapter", function() { +test("emstore.adapterFor(type) returns application adapter if no klass.adapter or type adapter", function() { TestModel.adapter = undefined; registry.register('adapter:test', null); registry.register('adapter:application', Ember.FixtureAdapter); - var adapter = Ember.run(store, store.adapterFor, 'test'); + var adapter = Ember.run(emstore, emstore.adapterFor, 'test'); ok(adapter instanceof Ember.FixtureAdapter); }); -test("store.adapterFor(type) defaults to RESTAdapter if no adapter specified", function() { +test("emstore.adapterFor(type) defaults to RESTAdapter if no adapter specified", function() { TestModel.adapter = undefined; registry.register('adapter:test', null); registry.register('adapter:application', null); registry.register('adapter:REST', Ember.RESTAdapter); - var adapter = Ember.run(store, store.adapterFor, 'test'); + var adapter = Ember.run(emstore, emstore.adapterFor, 'test'); ok(adapter instanceof Ember.RESTAdapter); }); -test("store.find(type) records use application adapter if no klass.adapter or type adapter", function() { +test("emstore.find(type) records use application adapter if no klass.adapter or type adapter", function() { expect(3); TestModel.adapter = undefined; EmbeddedModel.adapter = undefined; registry.register('adapter:test', null); registry.register('adapter:application', Ember.FixtureAdapter); - var promise = Ember.run(store, store.find, 'test','a'); + var promise = Ember.run(emstore, emstore.find, 'test','a'); promise.then(function(record) { start(); @@ -225,11 +225,11 @@ test("Registering a custom store on application works", function() { }); container = App.__container__; - ok(container.lookup('store:application')); - ok(container.lookup('store:main').get('custom')); + ok(container.lookup('emstore:application')); + ok(container.lookup('emstore:main').get('custom')); var testRoute = container.lookup('route:test'); - ok(testRoute.get('store.custom')); + ok(testRoute.get('emstore.custom')); Ember.run(App, 'destroy'); });