[BUGFIX beta] pass snapshot into urlForFindHasMany/BelongsTo

(cherry picked from commit 85a1220)

Author: trevorrjohn

addon/-private/adapters/build-url-mixin.js

@@ -64,9 +64,9 @@ export default Ember.Mixin.create({
       case 'findMany':
         return this.urlForFindMany(id, modelName, snapshot);
       case 'findHasMany':
-        return this.urlForFindHasMany(id, modelName);
+        return this.urlForFindHasMany(id, modelName, snapshot);
       case 'findBelongsTo':
-        return this.urlForFindBelongsTo(id, modelName);
+        return this.urlForFindBelongsTo(id, modelName, snapshot);
       case 'createRecord':
         return this.urlForCreateRecord(modelName, snapshot);
       case 'updateRecord':
@@ -163,19 +163,21 @@ export default Ember.Mixin.create({
    * @method urlForFindHasMany
    * @param {String} id
    * @param {String} modelName
+   * @param {DS.Snapshot} snapshot
    * @return {String} url
    */
-  urlForFindHasMany(id, modelName) {
+  urlForFindHasMany(id, modelName, snapshot) {
     return this._buildURL(modelName, id);
   },
 
   /**
    * @method urlForFindBelongTo
    * @param {String} id
    * @param {String} modelName
+   * @param {DS.Snapshot} snapshot
    * @return {String} url
    */
-  urlForFindBelongsTo(id, modelName) {
+  urlForFindBelongsTo(id, modelName, snapshot) {
     return this._buildURL(modelName, id);
   },
 

addon/adapters/rest.js

@@ -569,7 +569,7 @@ export default Adapter.extend(BuildURLMixin, {
     var id   = snapshot.id;
     var type = snapshot.modelName;
 
-    url = this.urlPrefix(url, this.buildURL(type, id, null, 'findHasMany'));
+    url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findHasMany'));
 
     return this.ajax(url, 'GET');
   },
@@ -613,7 +613,7 @@ export default Adapter.extend(BuildURLMixin, {
     var id   = snapshot.id;
     var type = snapshot.modelName;
 
-    url = this.urlPrefix(url, this.buildURL(type, id, null, 'findBelongsTo'));
+    url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findBelongsTo'));
     return this.ajax(url, 'GET');
   },
 

tests/integration/adapter/rest-adapter-test.js

@@ -1687,8 +1687,10 @@ test("findHasMany - returning an array populates the array", function(assert) {
 });
 
 test("findHasMany - passes buildURL the requestType", function(assert) {
+  assert.expect(2);
   adapter.shouldBackgroundReloadRecord = () => false;
   adapter.buildURL = function(type, id, snapshot, requestType) {
+    assert.ok(snapshot instanceof DS.Snapshot);
     assert.equal(requestType, 'findHasMany');
   };
 
@@ -1833,8 +1835,10 @@ test("findMany - a custom serializer is used if present", function(assert) {
 });
 
 test('findBelongsTo - passes buildURL the requestType', function(assert) {
+  assert.expect(2);
   adapter.shouldBackgroundReloadRecord = () => false;
   adapter.buildURL = function(type, id, snapshot, requestType) {
+    assert.ok(snapshot instanceof DS.Snapshot);
     assert.equal(requestType, 'findBelongsTo');
   };
 

tests/unit/adapters/build-url-mixin/build-url-test.js

@@ -90,25 +90,29 @@ test('buildURL - findMany requestType delegates to urlForFindMany', function(ass
 });
 
 test('buildURL - findHasMany requestType delegates to urlForFindHasMany', function(assert) {
-  assert.expect(3);
+  assert.expect(4);
   let originalMethod = adapter.urlForFindHasMany;
-  adapter.urlForFindHasMany = function(id, type) {
+  let snapshotStub = { snapshot: true };
+  adapter.urlForFindHasMany = function(id, type, snapshot) {
     assert.equal(id, 1);
     assert.equal(type, 'super-user');
+    assert.equal(snapshot, snapshotStub);
     return originalMethod.apply(this, arguments);
   };
-  assert.equal(adapter.buildURL('super-user', 1, null, 'findHasMany'), '/superUsers/1');
+  assert.equal(adapter.buildURL('super-user', 1, snapshotStub, 'findHasMany'), '/superUsers/1');
 });
 
 test('buildURL - findBelongsTo requestType delegates to urlForFindBelongsTo', function(assert) {
-  assert.expect(3);
+  assert.expect(4);
   let originalMethod = adapter.urlForFindBelongsTo;
-  adapter.urlForFindBelongsTo = function(id, type) {
+  let snapshotStub = { snapshot: true };
+  adapter.urlForFindBelongsTo = function(id, type, snapshot) {
     assert.equal(id, 1);
     assert.equal(type, 'super-user');
+    assert.equal(snapshot, snapshotStub);
     return originalMethod.apply(this, arguments);
   };
-  assert.equal(adapter.buildURL('super-user', 1, null, 'findBelongsTo'), '/superUsers/1');
+  assert.equal(adapter.buildURL('super-user', 1, snapshotStub, 'findBelongsTo'), '/superUsers/1');
 });
 
 test('buildURL - createRecord requestType delegates to urlForCreateRecord', function(assert) {