@redocly/openapi-core 1.0.0-beta.49 → 1.0.0-beta.53

package/src/rules/__tests__/no-unresolved-refs.test.ts

@@ -2,10 +2,10 @@ import path = require('path');
 import { outdent } from 'outdent';
 
 import { lintDocument } from '../../lint';
-import { LintConfig } from '../..';
 import { BaseResolver } from '../../resolve';
 
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../__tests__/utils';
+import { makeConfig } from './config';
 
 describe('oas3 boolean-parameter-prefixes', () => {
   it('should report on unresolved $ref', async () => {
@@ -24,11 +24,8 @@ describe('oas3 boolean-parameter-prefixes', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'no-unresolved-refs': 'error',
-        },
+      config: makeConfig({
+        'no-unresolved-refs': 'error',
       }),
     });
 
@@ -67,11 +64,8 @@ describe('oas3 boolean-parameter-prefixes', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'no-unresolved-refs': 'error',
-        },
+      config: makeConfig({
+        'no-unresolved-refs': 'error',
       }),
     });
 
@@ -127,11 +121,8 @@ describe('oas3 boolean-parameter-prefixes', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'no-unresolved-refs': 'error',
-        },
+      config: makeConfig({
+        'no-unresolved-refs': 'error',
       }),
     });
 
@@ -154,11 +145,8 @@ describe('oas3 boolean-parameter-prefixes', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'no-unresolved-refs': 'error',
-        },
+      config: makeConfig({
+        'no-unresolved-refs': 'error',
       }),
     });
 

package/src/rules/ajv.ts

@@ -1,11 +1,8 @@
-// @ts-ignore
-import * as Ajv from '@redocly/ajv';
-// import * as jsonSpecV4 from 'ajv/lib/refs/json-schema-draft-04.json';
-// import { OasVersion } from '../validate';
+import Ajv, { ValidateFunction, ErrorObject } from '@redocly/ajv';
 import { Location, escapePointer } from '../ref-utils';
 import { ResolveFn } from '../walk';
 
-let ajvInstance: Ajv.Ajv | null = null;
+let ajvInstance: Ajv | null = null;
 
 export function releaseAjvInstance() {
   ajvInstance = null;
@@ -14,20 +11,20 @@ export function releaseAjvInstance() {
 function getAjv(resolve: ResolveFn<any>, disallowAdditionalProperties: boolean) {
   if (!ajvInstance) {
     ajvInstance = new Ajv({
-      schemaId: 'auto',
+      schemaId: '$id',
       meta: true,
       allErrors: true,
-      jsonPointers: true,
-      unknownFormats: 'ignore',
-      nullable: true,
-      missingRefs: 'ignore',
+      strictSchema: false,
       inlineRefs: false,
       validateSchema: false,
+      discriminator: true,
+      allowUnionTypes: true,
+      validateFormats: false, // TODO: fix it
       defaultAdditionalProperties: !disallowAdditionalProperties,
-      loadSchemaSync(base: string, $ref: string, id: string) {
-        const resolvedRef = resolve({ $ref }, base.replace(/#$/, ''));
+      loadSchemaSync(base: string, $ref: string) {
+        const resolvedRef = resolve({ $ref }, base.split('#')[0]);
         if (!resolvedRef || !resolvedRef.location) return undefined;
-        return { id, ...resolvedRef.node };
+        return { $id: resolvedRef.location.absolutePointer, ...resolvedRef.node };
       },
       logger: false,
     });
@@ -40,11 +37,11 @@ function getAjvValidator(
   loc: Location,
   resolve: ResolveFn<any>,
   disallowAdditionalProperties: boolean,
-): Ajv.ValidateFunction | undefined {
+): ValidateFunction | undefined {
   const ajv = getAjv(resolve, disallowAdditionalProperties);
 
   if (!ajv.getSchema(loc.absolutePointer)) {
-    ajv.addSchema({ id: loc.absolutePointer, ...schema }, loc.absolutePointer);
+    ajv.addSchema({ $id: loc.absolutePointer, ...schema }, loc.absolutePointer);
   }
 
   return ajv.getSchema(loc.absolutePointer);
@@ -54,23 +51,30 @@ export function validateJsonSchema(
   data: any,
   schema: any,
   schemaLoc: Location,
-  dataPath: string,
+  instancePath: string,
   resolve: ResolveFn<any>,
   disallowAdditionalProperties: boolean,
-): { valid: boolean; errors: (Ajv.ErrorObject & { suggest?: string[] })[] } {
+): { valid: boolean; errors: (ErrorObject & { suggest?: string[] })[] } {
   const validate = getAjvValidator(schema, schemaLoc, resolve, disallowAdditionalProperties);
   if (!validate) return { valid: true, errors: [] }; // unresolved refs are reported
 
-  const valid = validate(data, dataPath);
+  const valid = validate(data, {
+    instancePath,
+    parentData: { fake: {} },
+    parentDataProperty: 'fake',
+    rootData: {},
+    dynamicAnchors: {},
+  });
+
   return {
     valid: !!valid,
     errors: (validate.errors || []).map(beatifyErrorMessage),
   };
 
-  function beatifyErrorMessage(error: Ajv.ErrorObject) {
+  function beatifyErrorMessage(error: ErrorObject) {
     let message = error.message;
     let suggest =
-      error.keyword === 'enum' ? (error.params as Ajv.EnumParams).allowedValues : undefined;
+      error.keyword === 'enum' ? error.params.allowedValues : undefined;
     if (suggest) {
       message += ` ${suggest.map((e: any) => `"${e}"`).join(', ')}`;
     }
@@ -79,15 +83,15 @@ export function validateJsonSchema(
       message = `type ${message}`;
     }
 
-    const relativePath = error.dataPath.substring(dataPath.length + 1);
+    const relativePath = error.instancePath.substring(instancePath.length + 1);
     const propName = relativePath.substring(relativePath.lastIndexOf('/') + 1);
     if (propName) {
       message = `\`${propName}\` property ${message}`;
     }
     if (error.keyword === 'additionalProperties') {
-      const property = (error.params as Ajv.AdditionalPropertiesParams).additionalProperty;
+      const property = error.params.additionalProperty;
       message = `${message} \`${property}\``;
-      error.dataPath += '/' + escapePointer(property);
+      error.instancePath += '/' + escapePointer(property);
     }
 
     return {

package/src/rules/common/__tests__/info-description.test.ts

@@ -1,9 +1,10 @@
 import { outdent } from 'outdent';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
-import { LintConfig } from '../../../config/config';
 import { BaseResolver } from '../../../resolve';
 
+import { makeConfig } from '../../__tests__/config';
+
 describe('Oas3 info-description', () => {
   it('should report on info with no description', async () => {
     const document = parseYamlToDocument(
@@ -18,11 +19,8 @@ describe('Oas3 info-description', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'info-description': 'error',
-        },
+      config: makeConfig({
+        'info-description': 'error',
       }),
     });
 
@@ -59,11 +57,8 @@ describe('Oas3 info-description', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'info-description': 'error',
-        },
+      config: makeConfig({
+        'info-description': 'error',
       }),
     });
 
@@ -99,11 +94,8 @@ describe('Oas3 info-description', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: {
-          'info-description': 'error',
-        },
+      config: makeConfig({
+        'info-description': 'error',
       }),
     });
 

package/src/rules/common/__tests__/info-license.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 info-license', () => {
@@ -18,7 +18,7 @@ describe('Oas3 info-license', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'info-license': 'error' } }),
+      config: makeConfig({ 'info-license': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -55,7 +55,7 @@ describe('Oas3 info-license', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'info-license': 'error' } }),
+      config: makeConfig({ 'info-license': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/common/__tests__/license-url.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 license-url', () => {
@@ -19,7 +19,7 @@ describe('Oas3 license-url', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'info-license-url': 'error' } }),
+      config: makeConfig({ 'info-license-url': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -56,7 +56,7 @@ describe('Oas3 license-url', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'info-license-url': 'error' } }),
+      config: makeConfig({ 'info-license-url': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/common/__tests__/no-ambiguous-paths.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('no-ambiguous-paths', () => {
@@ -47,7 +47,7 @@ describe('no-ambiguous-paths', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-ambiguous-paths': 'error' } }),
+      config: makeConfig({ 'no-ambiguous-paths': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`

package/src/rules/common/__tests__/no-enum-type-mismatch.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 typed enum', () => {
@@ -30,7 +30,7 @@ describe('Oas3 typed enum', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-enum-type-mismatch': 'error' } }),
+      config: makeConfig({ 'no-enum-type-mismatch': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -63,7 +63,7 @@ describe('Oas3 typed enum', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-enum-type-mismatch': 'error' } }),
+      config: makeConfig({ 'no-enum-type-mismatch': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -93,7 +93,7 @@ describe('Oas3 typed enum', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-enum-type-mismatch': 'error' } }),
+      config: makeConfig({ 'no-enum-type-mismatch': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -141,7 +141,7 @@ describe('Oas3 typed enum', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-enum-type-mismatch': 'error' } }),
+      config: makeConfig({ 'no-enum-type-mismatch': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -162,4 +162,49 @@ describe('Oas3 typed enum', () => {
       ]
     `);
   });
+
+  it('should not crash on null schema when there is spec rule', async () => {
+    const document = parseYamlToDocument(
+      outdent`
+          openapi: 3.0.0
+          info:
+            title: test
+            version: 1.2.3
+          paths:
+            /some:
+              get:
+                responses:
+                  '200':
+                    description: test
+                    content:
+                      application/json:
+                        schema: null
+        `,
+      'foobar.yaml',
+    );
+
+    const results = await lintDocument({
+      externalRefResolver: new BaseResolver(),
+      document,
+      config: makeConfig({ 'spec': 'error', 'no-enum-type-mismatch': 'error' }),
+    });
+
+    expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "location": Array [
+            Object {
+              "pointer": "#/paths/~1some/get/responses/200/content/application~1json/schema",
+              "reportOnKey": false,
+              "source": "foobar.yaml",
+            },
+          ],
+          "message": "Expected type \`Schema\` (object) but got \`null\`",
+          "ruleId": "spec",
+          "severity": "error",
+          "suggest": Array [],
+        },
+      ]
+    `);
+  });
 });

package/src/rules/common/__tests__/no-identical-paths.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('no-identical-paths', () => {
@@ -35,7 +35,7 @@ describe('no-identical-paths', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-identical-paths': 'error' } }),
+      config: makeConfig({ 'no-identical-paths': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`

package/src/rules/common/__tests__/no-path-trailing-slash.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('no-path-trailing-slash', () => {
@@ -20,7 +20,7 @@ describe('no-path-trailing-slash', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-path-trailing-slash': 'error' } }),
+      config: makeConfig({ 'no-path-trailing-slash': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -57,7 +57,7 @@ describe('no-path-trailing-slash', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-path-trailing-slash': 'error' } }),
+      config: makeConfig({ 'no-path-trailing-slash': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -78,7 +78,7 @@ describe('no-path-trailing-slash', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'no-path-trailing-slash': 'error' } }),
+      config: makeConfig({ 'no-path-trailing-slash': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/common/__tests__/operation-2xx-response.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-2xx-response', () => {
@@ -22,7 +22,7 @@ describe('Oas3 operation-2xx-response', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-2xx-response': 'error' } }),
+      config: makeConfig({ 'operation-2xx-response': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -61,7 +61,7 @@ describe('Oas3 operation-2xx-response', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-2xx-response': 'error' } }),
+      config: makeConfig({ 'operation-2xx-response': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -84,7 +84,7 @@ describe('Oas3 operation-2xx-response', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-2xx-response': 'error' } }),
+      config: makeConfig({ 'operation-2xx-response': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/common/__tests__/operation-operationId-unique.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-operationId-unique', () => {
@@ -27,7 +27,7 @@ describe('Oas3 operation-operationId-unique', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-operationId-unique': 'error' } }),
+      config: makeConfig({ 'operation-operationId-unique': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -69,7 +69,7 @@ describe('Oas3 operation-operationId-unique', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'peration-operationId-unique': 'error' } }),
+      config: makeConfig({ 'peration-operationId-unique': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/common/__tests__/operation-operationId-url-safe.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-operationId-url-safe', () => {
@@ -22,10 +22,7 @@ describe('Oas3 operation-operationId-url-safe', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: { 'operation-operationId-url-safe': 'error' },
-      }),
+      config: makeConfig({ 'operation-operationId-url-safe': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`

package/src/rules/common/__tests__/operation-parameters-unique.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-parameters-unique', () => {
@@ -23,10 +23,7 @@ describe('Oas3 operation-parameters-unique', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: { 'operation-parameters-unique': 'error' },
-      }),
+      config: makeConfig({ 'operation-parameters-unique': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -69,10 +66,7 @@ describe('Oas3 operation-parameters-unique', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: { 'operation-parameters-unique': 'error' },
-      }),
+      config: makeConfig({ 'operation-parameters-unique': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);
@@ -102,10 +96,7 @@ describe('Oas3 operation-parameters-unique', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: { 'operation-parameters-unique': 'error' },
-      }),
+      config: makeConfig({ 'operation-parameters-unique': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -153,10 +144,7 @@ describe('Oas3 operation-parameters-unique', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({
-        extends: [],
-        rules: { 'operation-parameters-unique': 'error' },
-      }),
+      config: makeConfig({ 'operation-parameters-unique': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`

package/src/rules/common/__tests__/operation-security-defined.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-security-defined', () => {
@@ -20,7 +20,7 @@ describe('Oas3 operation-security-defined', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-security-defined': 'error' } }),
+      config: makeConfig({ 'operation-security-defined': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -62,7 +62,7 @@ describe('Oas3 operation-security-defined', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-security-defined': 'error' } }),
+      config: makeConfig({ 'operation-security-defined': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);

package/src/rules/common/__tests__/operation-singular-tag.test.ts

@@ -1,7 +1,7 @@
 import { outdent } from 'outdent';
-import { LintConfig } from '../../../config/config';
 import { lintDocument } from '../../../lint';
 import { parseYamlToDocument, replaceSourceWithRef } from '../../../../__tests__/utils';
+import { makeConfig } from '../../__tests__/config';
 import { BaseResolver } from '../../../resolve';
 
 describe('Oas3 operation-singular-tag', () => {
@@ -25,7 +25,7 @@ describe('Oas3 operation-singular-tag', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-singular-tag': 'error' } }),
+      config: makeConfig({ 'operation-singular-tag': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`
@@ -65,7 +65,7 @@ describe('Oas3 operation-singular-tag', () => {
     const results = await lintDocument({
       externalRefResolver: new BaseResolver(),
       document,
-      config: new LintConfig({ extends: [], rules: { 'operation-singular-tag': 'error' } }),
+      config: makeConfig({ 'operation-singular-tag': 'error' }),
     });
 
     expect(replaceSourceWithRef(results)).toMatchInlineSnapshot(`Array []`);