From a7a4ac57bd8ebb10f4fe0601ccd1860de5ef5449 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <e.poberezkin@me.com>
Date: Thu, 3 Mar 2016 00:28:44 +0000
Subject: [PATCH] fixed instances list for async test; readme re
 removeAdditional (related to #129, #134)

---
 README.md                   | 47 +++++++++++++++++++++++++++++++++++++
 spec/ajv_async_instances.js |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 29dc17893..7203de967 100644
--- a/README.md
+++ b/README.md
@@ -492,6 +492,53 @@ If `removeAdditional` option in the example above were `"all"` then both `additi
 
 If the option were `"failing"` then property `additional1` would have been removed regardless of its value and property `additional2` would have been removed only if its value were failing the schema in the inner `additionalProperties` (so in the example above it would have stayed because it passes the schema, but any non-number would have been removed).
 
+__Please note__: If you use `removeAdditional` option with `additionalProperties` keyword inside `anyOf`/`oneOf` keywords your validation can fail with this schema, for example:
+
+```JSON
+{
+  "type": "object",
+  "oneOf": [
+    {
+      "properties": {
+        "foo": { "type": "string" }
+      },
+      "required": [ "foo" ],
+      "additionalProperties": false
+    },
+    {
+      "properties": {
+        "bar": { "type": "integer" }
+      },
+      "required": [ "bar" ],
+      "additionalProperties": false
+    }
+  ]
+}
+```
+
+The intention of the schema above is to allow objects with either the string property "foo" or the integer property "bar", but not with both and not with any other properties.
+
+With the option `removeAdditional: true` the validation will pass for the object `{ "foo": "abc"}` but will fail for the object `{"bar": 1}`. It happens because while the first subschema in `oneOf` is validated, the property `bar` is removed because it is an additional property according to the standard (because it is not included in `properties` keyword in the same schema).
+
+While this behaviour is unexpected (issues #129, #134), it is correct. To have the expected behaviour (both objects are allowed and additional properties are removed) the schema has to be refactored in this way:
+
+```JSON
+{
+  "type": "object",
+  "properties": {
+    "foo": { "type": "string" },
+    "bar": { "type": "integer" }
+  },
+  "additionalProperties": false,
+  "oneOf": [
+    { "required": [ "foo" ] },
+    { "required": [ "bar" ] }
+  ]
+}
+```
+
+The schema above is also more efficient - it will compile into a faster function.
+
 
 ## Assigning defaults
 
diff --git a/spec/ajv_async_instances.js b/spec/ajv_async_instances.js
index b1164295f..3556c8e9a 100644
--- a/spec/ajv_async_instances.js
+++ b/spec/ajv_async_instances.js
@@ -54,7 +54,7 @@ function getAjvInstances(opts) {
 
     // es7 functions transpiled with regenerator are excluded from test in Safari/Firefox/Edge/IE9.
     // They fail in IE9 and emit multiple 'uncaught exception' warnings in Safari/Firefox/Edge anc cause remote tests to disconnect.
-    if (!(ua && !((!/safari/.test(ua) || /chrome|phantomjs/.test(ua)) && (!/firefox|edge|msie\s9/.test(ua))))) {
+    if (!(ua && ((/safari/.test(ua) && !/chrome|phantomjs/.test(ua)) || /firefox|edge|msie\s9/.test(ua)))) {
       options = options.concat([
         { transpile: 'regenerator' },
         { async: true, transpile: 'regenerator' },