additionalProperties of type array not removed

Author: Mika Kunnas

index.js

@@ -166,7 +166,7 @@ function patternPropertiesHandler(schema) {
 	for (pattern in patternsObj) {
 		type = patternsObj[pattern].type;
 
-		if ((type === additProps.type) && type !== 'object') {
+		if ((type === additProps.type) && type !== 'object' && type !== 'array') {
 			schema.additionalProperties = false;
 			break;
 		}

test/pattern_properties.js

@@ -160,6 +160,62 @@ test('keeping additionalProperties with object type', function(assert) {
 	assert.deepEqual(result, expected, 'additionalProperties kept unchanged');
 });
 
+test('keeping additionalProperties with array type', function(assert) {
+	var schema
+		, result
+		, expected
+	;
+
+	assert.plan(1);
+
+	schema = {
+		type: 'object',
+		additionalProperties: {
+			type: 'array',
+			items: {
+				type: 'string'
+			}
+		},
+		'x-patternProperties': {
+			'^[a-z]*$': {
+				type: 'string'
+			},
+			'^[A-Z]*$': {
+				type: 'array',
+				items: {
+					type: 'string'
+				}
+			}
+		}
+	};
+
+	result = convert(schema, {supportPatternProperties: true});
+
+	expected = {
+		$schema: 'http://json-schema.org/draft-04/schema#',
+		type: 'object',
+		additionalProperties: {
+			type: 'array',
+			items: {
+				type: 'string'
+			}
+		},
+		patternProperties: {
+			'^[a-z]*$': {
+				type: 'string'
+			},
+			'^[A-Z]*$': {
+				type: 'array',
+				items: {
+					type: 'string'
+				}
+			}
+		}
+	};
+
+	assert.deepEqual(result, expected, 'additionalProperties kept unchanged');
+});
+
 test('not supporting patternProperties', function(assert) {
 	var schema
 		, result
@@ -278,3 +334,38 @@ test('setting custom patternProperties handler', function(assert) {
 
 	assert.deepEqual(result, expected, 'handler with custom handler');
 });
+
+test('additionalProperties not modified if set to true', function(assert) {
+	var schema
+		, result
+		, expected
+		, options
+	;
+
+	assert.plan(1);
+
+	schema = {
+		type: 'object',
+		additionalProperties: true,
+		'x-patternProperties': {
+			'^[a-z]*$': {
+				type: 'string'
+			}
+		}
+	};
+
+	result = convert(schema, {supportPatternProperties: true});
+
+	expected = {
+		$schema: 'http://json-schema.org/draft-04/schema#',
+		type: 'object',
+		additionalProperties: true,
+		patternProperties: {
+			'^[a-z]*$': {
+				type: 'string'
+			}
+		}
+	};
+
+	assert.deepEqual(result, expected, 'additionalProperties not removed');
+});