fix(Collection): respect noValidate override passed in to find/findAll when adding records (#446)

ivanvoznyakovsky · jmdobry · commit fb065db08cb0 · 2017-02-20T14:01:58.000-08:00
diff --git a/src/Collection.js b/src/Collection.js
@@ -212,6 +212,7 @@ export default Component.extend({
    * @param {(Object|Object[]|Record|Record[])} data The record or records to insert.
    * @param {Object} [opts] Configuration options.
    * @param {boolean} [opts.commitOnMerge=true] See {@link Collection#commitOnMerge}.
+   * @param {boolean} [opts.noValidate] See {@link Mapper#noValidate}.
    * @param {string} [opts.onConflict] See {@link Collection#onConflict}.
    * @returns {(Object|Object[]|Record|Record[])} The added record or records.
    */
@@ -253,6 +254,12 @@ export default Component.extend({
         // Here, the currently visited record corresponds to a record already
         // in the collection, so we need to merge them
         const onConflict = opts.onConflict || this.onConflict
+        let restoreNoValidate
+        // `noValidate` might have been overriden in find/findAll. respect that
+        if (opts.noValidate !== undefined) {
+          restoreNoValidate = existing._set.bind(existing, 'noValidate', existing._get('noValidate'))
+          existing._set('noValidate', opts.noValidate)
+        }
         if (onConflict === 'merge') {
           utils.deepMixIn(existing, record)
         } else if (onConflict === 'replace') {
@@ -263,8 +270,12 @@ export default Component.extend({
           })
           existing.set(record)
         } else {
+          // restore prev `noValidate` before throwing if it was overriden for the record
+          utils.isFunction(restoreNoValidate) && restoreNoValidate()
           throw utils.err(`${DOMAIN}#add`, 'opts.onConflict')(400, 'one of (merge, replace)', onConflict, true)
         }
+        // restore prev `noValidate` value if it was overriden for the record
+        utils.isFunction(restoreNoValidate) && restoreNoValidate()
         record = existing
         if (opts.commitOnMerge && utils.isFunction(record.commit)) {
           record.commit()
diff --git a/test/unit/collection/add.test.js b/test/unit/collection/add.test.js
@@ -115,6 +115,27 @@ describe('Collection#add', function () {
       collection.add({ id: 1 }, { onConflict: 'invalid_choice' })
     }, Error, `[Collection#add:opts.onConflict] expected: one of (merge, replace), found: invalid_choice\nhttp://www.js-data.io/v3.0/docs/errors#400`)
   })
+  it('should respect opts.noValidate', function () {
+    const mapper = new JSData.Mapper({
+      name: 'user',
+      noValidate: false,
+      schema: {
+        type: 'object',
+        properties: {
+          id: { type: 'string' },
+          name: { type: 'string' }
+        }
+      }
+    })
+    const collection = new JSData.Collection({ mapper })
+    const userData = { id: Math.random().toString(), name: Math.random().toString() }
+    const user = collection.add(userData)
+    assert.doesNotThrow(() => {
+      collection.add(Object.assign({}, userData, { name: null }), { noValidate: true })
+    })
+    // original noValidate prop value should be restored
+    assert.equal(user._get('noValidate'), false)
+  })
   it('should required an argument', function () {
     const collection = new JSData.Collection()
     TYPES_EXCEPT_OBJECT_OR_ARRAY.forEach((value) => {
