fix: Update tests

Author: makeev-pavel

test/compatibility-suites/openapi/parameters-schema.test.ts

@@ -12,18 +12,9 @@ const PARAMETERS_SCHEMA_PATH = [
   'schema',
 ]
 
-const PATH_TO_PARAMETERS_SCHEMA31 = [
-  'paths',
-  '/example',
-  'get',
-  'parameters',
-  0,
-  'schema',
-]
-
 describe('Openapi3 Parameters Schema', () => {
   runCommonSchemaTests(SUITE_ID, PARAMETERS_SCHEMA_PATH)
 })
 describe('Openapi31 Parameters Schema', () => {
-  runCommonSchema31Tests(SUITE_ID, PATH_TO_PARAMETERS_SCHEMA31)
+  runCommonSchema31Tests(SUITE_ID, PARAMETERS_SCHEMA_PATH)
 })

test/compatibility-suites/openapi/request-body-schema.test.ts

@@ -13,20 +13,10 @@ const REQUEST_SCHEMA_PATH = [
   'schema',
 ]
 
-const PATH_TO_PARAMETERS_SCHEMA31 = [
-  'paths',
-  '/example',
-  'post',
-  'requestBody',
-  'content',
-  'application/json',
-  'schema',
-]
-
 describe('Openapi3 Request Body Schema', () => {
   runCommonSchemaTests(SUITE_ID, REQUEST_SCHEMA_PATH)
 })
 
 describe('Openapi31 Request Body Schema', () => {
-  runCommonSchema31Tests(SUITE_ID, PATH_TO_PARAMETERS_SCHEMA31)
+  runCommonSchema31Tests(SUITE_ID, REQUEST_SCHEMA_PATH)
 })

test/compatibility-suites/openapi/response-body-schema.test.ts

@@ -2,7 +2,7 @@ import { compareFiles, compareFilesWithMerge, TEST_DEFAULTS_DECLARATION_PATHS }
 import { diffsMatcher } from '../../helper/matchers'
 import { annotation, breaking, DiffAction, nonBreaking, risky } from '../../../src'
 import { JSON_SCHEMA_NODE_SYNTHETIC_TYPE_ANY } from '@netcracker/qubership-apihub-api-unifier'
-import { runCommonSchema31Tests } from './templates/schema31'
+import { runCommonResponseSchema31Tests } from './templates/response-schema31'
 
 const SUITE_ID = 'response-body-schema'
 
@@ -138,7 +138,7 @@ describe('Openapi3 ResponseBody.Schema ', () => {
           afterDeclarationPaths: TEST_DEFAULTS_DECLARATION_PATHS,
           type: nonBreaking,
         }),
-      ]
+      ],
     ))
   })
 
@@ -305,7 +305,7 @@ describe('Openapi3 ResponseBody.Schema ', () => {
         beforeDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option2', 'minLength']],
         afterDeclarationPaths: TEST_DEFAULTS_DECLARATION_PATHS,
         type: breaking,
-      })
+      }),
     ]))
   })
 
@@ -694,7 +694,7 @@ describe('Openapi3 ResponseBody.Schema ', () => {
         beforeDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option1', 'minItems']],
         afterDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option1', 'minItems']],
         type: nonBreaking,
-      })
+      }),
     ]))
   })
 
@@ -739,7 +739,7 @@ describe('Openapi3 ResponseBody.Schema ', () => {
         beforeDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option1', 'minItems']],
         afterDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option1', 'minItems']],
         type: breaking,
-      })
+      }),
     ]))
   })
 
@@ -1021,7 +1021,7 @@ describe('Openapi3 ResponseBody.Schema ', () => {
         beforeDeclarationPaths: TEST_DEFAULTS_DECLARATION_PATHS,
         afterDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option2', 'minProperties']],
         type: nonBreaking,
-      })
+      }),
     ]))
   })
 
@@ -1066,7 +1066,7 @@ describe('Openapi3 ResponseBody.Schema ', () => {
         beforeDeclarationPaths: [[...RESPONSE_SCHEMA_PATH, 'properties', 'option2', 'minProperties']],
         afterDeclarationPaths: TEST_DEFAULTS_DECLARATION_PATHS,
         type: breaking,
-      })
+      }),
     ]))
   })
 
@@ -1630,17 +1630,6 @@ describe('Openapi3 ResponseBody.Schema ', () => {
   })
 })
 
-const PATH_TO_PARAMETERS_SCHEMA31 = [
-  'paths',
-  '/example',
-  'post',
-  'responses',
-  '200',
-  'content',
-  'application/json',
-  'schema',
-]
-
 describe('Openapi31 ResponseBody.Schema', () => {
-  runCommonSchema31Tests(SUITE_ID, PATH_TO_PARAMETERS_SCHEMA31, true)
+  runCommonResponseSchema31Tests(SUITE_ID, RESPONSE_SCHEMA_PATH)
 })

test/compatibility-suites/openapi/response-headers-schema.test.ts

@@ -1,11 +1,11 @@
-import { runCommonSchema31Tests } from './templates/schema31'
+import { runCommonResponseSchema31Tests } from './templates/response-schema31'
 
 const SUITE_ID = 'response-headers-schema'
 
-const PATH_TO_PARAMETERS_SCHEMA31 = [
+const RESPONSE_SCHEMA_PATH = [
   'paths',
-  '/example',
-  'get',
+  '/path1',
+  'post',
   'responses',
   '200',
   'headers',
@@ -14,5 +14,5 @@ const PATH_TO_PARAMETERS_SCHEMA31 = [
 ]
 
 describe('Openapi31 ResponseHeaders.Schema', () => {
-  runCommonSchema31Tests(SUITE_ID, PATH_TO_PARAMETERS_SCHEMA31, true)
+  runCommonResponseSchema31Tests(SUITE_ID, RESPONSE_SCHEMA_PATH)
 })

test/compatibility-suites/openapi/templates/response-schema31.ts

@@ -0,0 +1,60 @@
+import { compareFiles } from '../../utils'
+import { JsonPath } from '@netcracker/qubership-apihub-json-crawl'
+import { breaking, DiffAction, nonBreaking } from '../../../../src'
+import { diffsMatcher } from '../../../helper/matchers'
+
+export function runCommonResponseSchema31Tests(suiteId: string, commonPath: JsonPath): void {
+  test('Add union type', async () => {
+    const testId = 'add-union-type'
+    const result = await compareFiles(suiteId, testId)
+    expect(result).toEqual(diffsMatcher([
+      expect.objectContaining({
+        action: DiffAction.add,
+        afterDeclarationPaths: [[...commonPath, 'type', 1]],
+        type: breaking,
+      }),
+    ]))
+  })
+
+  test('Add null to union type', async () => {
+    const testId = 'add-null-to-union-type'
+    const result = await compareFiles(suiteId, testId)
+    expect(result).toEqual(diffsMatcher([
+      expect.objectContaining({
+        action: DiffAction.add,
+        afterDeclarationPaths: [[...commonPath, 'type', 2]],
+        type: breaking,
+      }),
+    ]))
+  })
+
+  test('Remove union type', async () => {
+    const testId = 'remove-union-type'
+    const result = await compareFiles(suiteId, testId)
+    expect(result).toEqual(diffsMatcher([
+      expect.objectContaining({
+        action: DiffAction.remove,
+        beforeDeclarationPaths: [[...commonPath, 'type', 1]],
+        type: nonBreaking,
+      }),
+    ]))
+  })
+
+  test('Remove null from union type', async () => {
+    const testId = 'remove-null-from-union-type'
+    const result = await compareFiles(suiteId, testId)
+    expect(result).toEqual(diffsMatcher([
+      expect.objectContaining({
+        action: DiffAction.remove,
+        beforeDeclarationPaths: [[...commonPath, 'type', 2]],
+        type: nonBreaking,
+      }),
+    ]))
+  })
+
+  test('Reorder types in union type', async () => {
+    const testId = 'reorder-types-in-union-type'
+    const result = await compareFiles(suiteId, testId)
+    expect(result.length).toEqual(0)
+  })
+}

test/compatibility-suites/openapi/templates/schema31.ts

@@ -3,15 +3,15 @@ import { JsonPath } from '@netcracker/qubership-apihub-json-crawl'
 import { breaking, DiffAction, nonBreaking } from '../../../../src'
 import { diffsMatcher } from '../../../helper/matchers'
 
-export function runCommonSchema31Tests(suiteId: string, commonPath: JsonPath, isResponseSchema = false): void {
+export function runCommonSchema31Tests(suiteId: string, commonPath: JsonPath): void {
   test('Add union type', async () => {
     const testId = 'add-union-type'
     const result = await compareFiles(suiteId, testId)
     expect(result).toEqual(diffsMatcher([
       expect.objectContaining({
         action: DiffAction.add,
         afterDeclarationPaths: [[...commonPath, 'type', 1]],
-        type: isResponseSchema ? breaking : nonBreaking,
+        type: nonBreaking,
       }),
     ]))
   })
@@ -23,7 +23,7 @@ export function runCommonSchema31Tests(suiteId: string, commonPath: JsonPath, is
       expect.objectContaining({
         action: DiffAction.add,
         afterDeclarationPaths: [[...commonPath, 'type', 2]],
-        type: isResponseSchema ? breaking : nonBreaking,
+        type: nonBreaking,
       }),
     ]))
   })
@@ -35,7 +35,7 @@ export function runCommonSchema31Tests(suiteId: string, commonPath: JsonPath, is
       expect.objectContaining({
         action: DiffAction.remove,
         beforeDeclarationPaths: [[...commonPath, 'type', 1]],
-        type: isResponseSchema ? nonBreaking : breaking,
+        type: breaking,
       }),
     ]))
   })
@@ -47,7 +47,7 @@ export function runCommonSchema31Tests(suiteId: string, commonPath: JsonPath, is
       expect.objectContaining({
         action: DiffAction.remove,
         beforeDeclarationPaths: [[...commonPath, 'type', 2]],
-        type: isResponseSchema ? nonBreaking : breaking,
+        type: breaking,
       }),
     ]))
   })