Skip to content

Commit c4dc457

Browse files
Update tests.ts
1 parent 9fe0588 commit c4dc457

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

tools/tests.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { promisify } from 'util';
77
import { getLanguageService } from 'vscode-json-languageservice';
88
import { TextDocument } from 'vscode-languageserver-types';
99
import draft4MetaSchema from 'ajv/lib/refs/json-schema-draft-04.json';
10-
import draft7MetaSchema from 'ajv/lib/refs/json-schema-draft-07.json';
1110
import * as schemaTestsRunner from './schemaTestsRunner';
1211
import 'mocha';
1312
import { findCycle } from './cycleCheck';
@@ -20,15 +19,13 @@ const testSchemasFolder = __dirname + '/schemas/';
2019
const templateTestsFolder = __dirname + '/templateTests/';
2120
const armSchemasPrefix = /^https?:\/\/schema\.management\.azure\.com\/schemas\//
2221
const jsonSchemaDraft4Prefix = /^https?:\/\/json-schema\.org\/draft-04\/schema/
23-
const jsonSchemaDraft7Prefix = /^https?:\/\/json-schema\.org\/draft-07\/schema/
2422

2523
const ajvInstance = new Ajv({
2624
loadSchema: loadSchema,
2725
strictDefaults: true,
2826
schemaId: 'id',
29-
meta: false
27+
meta: true,
3028
}).addMetaSchema(draft4MetaSchema)
31-
.addMetaSchema(draft7MetaSchema)
3229
.addFormat('int32', /.*/)
3330
.addFormat('duration', /.*/)
3431
.addFormat('password', /.*/);
@@ -46,9 +43,6 @@ async function loadRawSchema(uri: string) : Promise<string> {
4643
else if (uri.match(jsonSchemaDraft4Prefix)) {
4744
return JSON.stringify(draft4MetaSchema);
4845
}
49-
else if (uri.match(jsonSchemaDraft7Prefix)) {
50-
return JSON.stringify(draft7MetaSchema);
51-
}
5246
else {
5347
jsonPath = uri;
5448
}
@@ -91,7 +85,6 @@ function listSchemaPaths(basePath: string): string[] {
9185

9286
const metaSchemaPaths = [
9387
'http://json-schema.org/draft-04/schema',
94-
'http://json-schema.org/draft-07/schema',
9588
testSchemasFolder + 'ResourceMetaSchema.json',
9689
];
9790

@@ -140,6 +133,7 @@ const schemasToSkip = [
140133
'2019-08-01/managementGroupDeploymentTemplate.json',
141134
'2019-08-01/tenantDeploymentParameters.json',
142135
'2019-08-01/tenantDeploymentTemplate.json',
136+
'2021-09-09/uiFormDefinition.schema.json',
143137
'common/definitions.json',
144138
'common/manuallyAddedResources.json',
145139
'common/autogeneratedResources.json',
@@ -235,4 +229,4 @@ describe('Validate test templates against VSCode language service', () => {
235229
expect(result).to.deep.equal([]);
236230
});
237231
}
238-
});
232+
});

0 commit comments

Comments
 (0)