Remove format from other tests

ehmicky · ehmicky · commit 42bed9de8ada · 2018-05-16T11:56:40.000+02:00
diff --git a/test/combination_keywords.test.js b/test/combination_keywords.test.js
@@ -17,16 +17,14 @@ test('iterates allOfs', function(assert) {
 				required: ['foo'],
 				properties: {
 					foo: {
-						type: 'integer',
-						format: 'int64'
+						type: 'integer'
 					}
 				}
 			},
 			{
 				allOf: [
 					{
-						type: 'number',
-						format: 'double'
+						type: 'number'
 					}
 				]
 			}
@@ -43,16 +41,14 @@ test('iterates allOfs', function(assert) {
 				required: ['foo'],
 				properties: {
 					foo: {
-						type: 'integer',
-						format: 'int64'
+						type: 'integer'
 					}
 				}
 			},
 			{
 				allOf: [
 					{
-						type: 'number',
-						format: 'double'
+						type: 'number'
 					}
 				]
 			}
@@ -207,7 +203,6 @@ test('converts types in not', function(assert) {
 		properties: {
 			not: {
 				type: 'string',
-				format: 'password',
 				minLength: 8
 			}
 		}
@@ -221,7 +216,6 @@ test('converts types in not', function(assert) {
 		properties: {
 			not: {
 				type: 'string',
-				format: 'password',
 				minLength: 8
 			}
 		}
@@ -241,7 +235,6 @@ test('converts types in not', function(assert) {
 	schema = {
 		not: {
 			type: 'string',
-			format: 'password',
 			minLength: 8
 		}
 	};
@@ -252,7 +245,6 @@ test('converts types in not', function(assert) {
 		$schema: 'http://json-schema.org/draft-04/schema#',
 		not: {
 			type: 'string',
-			format: 'password',
 			minLength: 8
 		}
 	};
diff --git a/test/items.test.js b/test/items.test.js
@@ -14,7 +14,6 @@ test('items', function(assert) {
 		type: 'array',
 		items: {
 			type: 'string',
-			format: 'date-time',
 			example: '2017-01-01T12:34:56Z'
 		}
 	};
@@ -25,8 +24,7 @@ test('items', function(assert) {
 		$schema: 'http://json-schema.org/draft-04/schema#',
 		type: 'array',
 		items: {
-			type: 'string',
-			format: 'date-time'
+			type: 'string'
 		}
 	};
 
diff --git a/test/properties.test.js b/test/properties.test.js
@@ -134,8 +134,7 @@ test('additionalProperties is an object', function(assert) {
 			type: 'object',
 			properties: {
 				foo: {
-					type: 'string',
-					format: 'date-time'
+					type: 'string'
 				}
 			}
 		}
@@ -155,8 +154,7 @@ test('additionalProperties is an object', function(assert) {
 			type: 'object',
 			properties: {
 				foo: {
-					type: 'string',
-					format: 'date-time'
+					type: 'string'
 				}
 			}
 		}
diff --git a/test/schemas/schema-1-expected.json b/test/schemas/schema-1-expected.json
@@ -8,8 +8,7 @@
             "cats": {
               "type": "array",
               "items": {
-                "type": "integer",
-                "format": "int64"
+                "type": "integer"
               }
             }
           }
@@ -20,8 +19,7 @@
             "dogs": {
               "type": "array",
               "items": {
-                "type": "integer",
-                "format": "int64"
+                "type": "integer"
               }
             }
           }
@@ -118,4 +116,3 @@
   ],
   "$schema": "http://json-schema.org/draft-04/schema#"
 }
-
diff --git a/test/schemas/schema-1.json b/test/schemas/schema-1.json
@@ -9,7 +9,6 @@
               "type": "array",
               "items": {
                 "type": "integer",
-                "format": "int64",
                 "example": [
                   1
                 ]
@@ -24,7 +23,6 @@
               "type": "array",
               "items": {
                 "type": "integer",
-                "format": "int64",
                 "example": [
                   1
                 ]
diff --git a/test/schemas/schema-2-invalid-type.json b/test/schemas/schema-2-invalid-type.json
@@ -9,7 +9,6 @@
               "type": "array",
               "items": {
                 "type": "integer",
-                "format": "int64",
                 "example": [
                   1
                 ]
@@ -24,7 +23,6 @@
               "type": "array",
               "items": {
                 "type": "integer",
-                "format": "int64",
                 "example": [
                   1
                 ]
diff --git a/test/unsupported_properties.test.js b/test/unsupported_properties.test.js
@@ -110,7 +110,6 @@ test('remove writeOnly by default', function(assert) {
 		properties: {
 			test: {
 				type: 'string',
-				format: 'password',
 				writeOnly: true
 			}
 		}
@@ -123,8 +122,7 @@ test('remove writeOnly by default', function(assert) {
 		type: 'object',
 		properties: {
 			test: {
-				type: 'string',
-				format: 'password'
+				type: 'string'
 			}
 		}
 	};
@@ -301,4 +299,3 @@ test('retaining fields', function(assert) {
 
 	assert.deepEqual(result, expected, 'example and writeOnly removed');
 });
-

Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,14 @@ test('iterates allOfs', function(assert) {`
`17`	`17`	`required: ['foo'],`
`18`	`18`	`properties: {`
`19`	`19`	`foo: {`
`20`		`- type: 'integer',`
`21`		`- format: 'int64'`
	`20`	`+ type: 'integer'`
`22`	`21`	`}`
`23`	`22`	`}`
`24`	`23`	`},`
`25`	`24`	`{`
`26`	`25`	`allOf: [`
`27`	`26`	`{`
`28`		`- type: 'number',`
`29`		`- format: 'double'`
	`27`	`+ type: 'number'`
`30`	`28`	`}`
`31`	`29`	`]`
`32`	`30`	`}`
`@@ -43,16 +41,14 @@ test('iterates allOfs', function(assert) {`
`43`	`41`	`required: ['foo'],`
`44`	`42`	`properties: {`
`45`	`43`	`foo: {`
`46`		`- type: 'integer',`
`47`		`- format: 'int64'`
	`44`	`+ type: 'integer'`
`48`	`45`	`}`
`49`	`46`	`}`
`50`	`47`	`},`
`51`	`48`	`{`
`52`	`49`	`allOf: [`
`53`	`50`	`{`
`54`		`- type: 'number',`
`55`		`- format: 'double'`
	`51`	`+ type: 'number'`
`56`	`52`	`}`
`57`	`53`	`]`
`58`	`54`	`}`
`@@ -207,7 +203,6 @@ test('converts types in not', function(assert) {`
`207`	`203`	`properties: {`
`208`	`204`	`not: {`
`209`	`205`	`type: 'string',`
`210`		`- format: 'password',`
`211`	`206`	`minLength: 8`
`212`	`207`	`}`
`213`	`208`	`}`
`@@ -221,7 +216,6 @@ test('converts types in not', function(assert) {`
`221`	`216`	`properties: {`
`222`	`217`	`not: {`
`223`	`218`	`type: 'string',`
`224`		`- format: 'password',`
`225`	`219`	`minLength: 8`
`226`	`220`	`}`
`227`	`221`	`}`
`@@ -241,7 +235,6 @@ test('converts types in not', function(assert) {`
`241`	`235`	`schema = {`
`242`	`236`	`not: {`
`243`	`237`	`type: 'string',`
`244`		`- format: 'password',`
`245`	`238`	`minLength: 8`
`246`	`239`	`}`
`247`	`240`	`};`
`@@ -252,7 +245,6 @@ test('converts types in not', function(assert) {`
`252`	`245`	`$schema: 'http://json-schema.org/draft-04/schema#',`
`253`	`246`	`not: {`
`254`	`247`	`type: 'string',`
`255`		`- format: 'password',`
`256`	`248`	`minLength: 8`
`257`	`249`	`}`
`258`	`250`	`};`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ test('additionalProperties is an object', function(assert) {`
`134`	`134`	`type: 'object',`
`135`	`135`	`properties: {`
`136`	`136`	`foo: {`
`137`		`- type: 'string',`
`138`		`- format: 'date-time'`
	`137`	`+ type: 'string'`
`139`	`138`	`}`
`140`	`139`	`}`
`141`	`140`	`}`
`@@ -155,8 +154,7 @@ test('additionalProperties is an object', function(assert) {`
`155`	`154`	`type: 'object',`
`156`	`155`	`properties: {`
`157`	`156`	`foo: {`
`158`		`- type: 'string',`
`159`		`- format: 'date-time'`
	`157`	`+ type: 'string'`
`160`	`158`	`}`
`161`	`159`	`}`
`162`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`"cats": {`
`9`	`9`	`"type": "array",`
`10`	`10`	`"items": {`
`11`		`- "type": "integer",`
`12`		`- "format": "int64"`
	`11`	`+ "type": "integer"`
`13`	`12`	`}`
`14`	`13`	`}`
`15`	`14`	`}`
`@@ -20,8 +19,7 @@`
`20`	`19`	`"dogs": {`
`21`	`20`	`"type": "array",`
`22`	`21`	`"items": {`
`23`		`- "type": "integer",`
`24`		`- "format": "int64"`
	`22`	`+ "type": "integer"`
`25`	`23`	`}`
`26`	`24`	`}`
`27`	`25`	`}`
`@@ -118,4 +116,3 @@`
`118`	`116`	`],`
`119`	`117`	`"$schema": "http://json-schema.org/draft-04/schema#"`
`120`	`118`	`}`
`121`		`-`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`"type": "array",`
`10`	`10`	`"items": {`
`11`	`11`	`"type": "integer",`
`12`		`- "format": "int64",`
`13`	`12`	`"example": [`
`14`	`13`	`1`
`15`	`14`	`]`
`@@ -24,7 +23,6 @@`
`24`	`23`	`"type": "array",`
`25`	`24`	`"items": {`
`26`	`25`	`"type": "integer",`
`27`		`- "format": "int64",`
`28`	`26`	`"example": [`
`29`	`27`	`1`
`30`	`28`	`]`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@ test('remove writeOnly by default', function(assert) {`
`110`	`110`	`properties: {`
`111`	`111`	`test: {`
`112`	`112`	`type: 'string',`
`113`		`- format: 'password',`
`114`	`113`	`writeOnly: true`
`115`	`114`	`}`
`116`	`115`	`}`
`@@ -123,8 +122,7 @@ test('remove writeOnly by default', function(assert) {`
`123`	`122`	`type: 'object',`
`124`	`123`	`properties: {`
`125`	`124`	`test: {`
`126`		`- type: 'string',`
`127`		`- format: 'password'`
	`125`	`+ type: 'string'`
`128`	`126`	`}`
`129`	`127`	`}`
`130`	`128`	`};`
`@@ -301,4 +299,3 @@ test('retaining fields', function(assert) {`
`301`	`299`
`302`	`300`	`assert.deepEqual(result, expected, 'example and writeOnly removed');`
`303`	`301`	`});`
`304`		`-`