js-data
diff --git a/‎CHANGELOG.md
Lines changed: 3 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Collection.js
Lines changed: 15 additions & 12 deletions b/‎src/Collection.js
Lines changed: 15 additions & 12 deletions
diff --git a/‎src/Record.js
Lines changed: 15 additions & 5 deletions b/‎src/Record.js
Lines changed: 15 additions & 5 deletions
@@ -6,6 +6,9 @@
   - `Schema#pick` now copies properties not defined in the "properties" keyword if the "additionalProperties" keyword is present and truthy.
   - Mappers are no longer given an empty schema if no schema is provided
 
+###### Bug fixes
+- #446 - fix(Collection): Add noValidate option to Collection#add, by @ivanvoznyakovsky
+
 ##### 3.0.0-rc.7 - 29 January 2017
 
 ###### Bug fixes
 
@@ -1,8 +1,11 @@
 import utils from './utils'
 import Component from './Component'
 import Query from './Query'
+import Record from './Record'
 import Index from '../lib/mindex/index'
 
+const { noValidatePath } = Record
+
 const DOMAIN = 'Collection'
 
 const COLLECTION_DEFAULTS = {
@@ -212,7 +215,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 {boolean} [opts.noValidate] See {@link Record#noValidate}.
    * @param {string} [opts.onConflict] See {@link Collection#onConflict}.
    * @returns {(Object|Object[]|Record|Record[])} The added record or records.
    */
@@ -254,11 +257,13 @@ 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' && onConflict !== 'replace') {
+          throw utils.err(`${DOMAIN}#add`, 'opts.onConflict')(400, 'one of (merge, replace)', onConflict, true)
+        }
+        const existingNoValidate = existing._get(noValidatePath)
+        if (opts.noValidate) {
+          // Disable validation
+          existing._set(noValidatePath, true)
         }
         if (onConflict === 'merge') {
           utils.deepMixIn(existing, record)
@@ -269,13 +274,11 @@ 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()
+        if (opts.noValidate) {
+          // Restore previous `noValidate` value
+          existing._set(noValidatePath, existingNoValidate)
+        }
         record = existing
         if (opts.commitOnMerge && utils.isFunction(record.commit)) {
           record.commit()
 
@@ -120,6 +120,8 @@ const previousPath = 'previous'
  * @param {Object} [opts] Configuration options.
  * @param {boolean} [opts.noValidate=false] Whether to skip validation on the
  * initial properties.
+ * @param {boolean} [opts.validateOnSet=true] Whether to enable setter
+ * validation on properties after the Record has been initialized.
  * @since 3.0.0
  */
 function Record (props, opts) {
@@ -129,9 +131,7 @@ function Record (props, opts) {
   opts || (opts = {})
   const _set = this._set
   _set(creatingPath, true)
-  if (opts.noValidate) {
-    _set(noValidatePath, opts.noValidate === undefined ? true : opts.noValidate)
-  }
+  _set(noValidatePath, !!opts.noValidate)
   _set(keepChangeHistoryPath, opts.keepChangeHistory === undefined ? (mapper ? mapper.keepChangeHistory : true) : opts.keepChangeHistory)
 
   // Set the idAttribute value first, if it exists.
@@ -143,8 +143,13 @@ function Record (props, opts) {
 
   utils.fillIn(this, props)
   _set(creatingPath, false)
-  const validateOnSet = opts.validateOnSet === undefined ? (mapper ? mapper.validateOnSet : true) : opts.validateOnSet
-  _set(noValidatePath, !validateOnSet)
+  if (opts.validateOnSet !== undefined) {
+    _set(noValidatePath, !opts.validateOnSet)
+  } else if (mapper && mapper.validateOnSet !== undefined) {
+    _set(noValidatePath, !mapper.validateOnSet)
+  } else {
+    _set(noValidatePath, false)
+  }
   _set(previousPath, mapper ? mapper.toJSON(props) : utils.plainCopy(props))
 }
 
@@ -844,6 +849,11 @@ export default Component.extend({
   validate (opts) {
     return this._mapper().validate(this, opts)
   }
+}, {
+  creatingPath,
+  noValidatePath,
+  keepChangeHistoryPath,
+  previousPath
 })
 
 /**