Fixes update with nested observable attributes

sevenval · Jun 30, 2017 · 14d3341 · 14d3341
1 parent cc5e55a
commit 14d3341
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/__tests__/Model.spec.js b/__tests__/Model.spec.js
@@ -302,6 +302,28 @@ describe('Model', () => {
           expect(model.get('album')).toBe(item.album)
           expect(model.request.label).toBe('updating')
         })
+
+        it('sends merged attributes on the request', () => {
+          const adapter = apiClient()
+
+          spy = jest.spyOn(adapter, 'put')
+          model.save({
+            name,
+            tracks: [
+              { name: 'Track 1' },
+              { name: 'Track 2' }
+            ]
+          })
+
+          expect(spy).toHaveBeenCalledTimes(1)
+          expect(spy.mock.calls[0][1]).toEqual({
+            name: 'dylan',
+            tracks: [
+              { name: 'Track 1' },
+              { name: 'Track 2' }
+            ]
+          })
+        })
       })
 
       describe('and its not patching', () => {
@@ -311,6 +333,29 @@ describe('Model', () => {
           expect(model.get('album')).toBe('kind of blue')
           expect(model.request.label).toBe('updating')
         })
+
+        it('sends merged attributes on the request', () => {
+          const adapter = apiClient()
+
+          spy = jest.spyOn(adapter, 'put')
+          model.save({
+            name,
+            tracks: [
+              { name: 'Track 1' },
+              { name: 'Track 2' }
+            ]
+          }, { patch: false })
+
+          expect(spy).toHaveBeenCalledTimes(1)
+          expect(spy.mock.calls[0][1]).toEqual({
+            ...item,
+            name: 'dylan',
+            tracks: [
+              { name: 'Track 1' },
+              { name: 'Track 2' }
+            ]
+          })
+        })
       })
 
       describe('when it fails', () => {

diff --git a/src/Model.js b/src/Model.js
@@ -210,7 +210,7 @@ export default class Model {
     let newAttributes
     let data
     const label: Label = 'updating'
-    const originalAttributes = this.attributes.toJS()
+    const originalAttributes = this.toJS()
 
     if (patch) {
       newAttributes = Object.assign({}, originalAttributes, attributes)