Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Refactor test files location #12

Closed
wants to merge 1 commit into from
Closed

Refactor test files location #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build": "npx webpack",
"clean": "rm -rf dist",
"lint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
"test": "jest test/.*\\.test\\..* --coverage",
"test": "jest src/test/.*\\\\.test\\\\..* --coverage",
"typecheck": "tsc -b"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion common/mockData/formatterMockData.ts → src/common/mockData/formatterMockData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ElementDisplay } from "../../src/utils/utils";
import { ElementDisplay } from "../../utils/utils";

export const JSON_SCHEMA_SPECIAL_CHARS_FAKE_DATA = '{\n' +
' "definition": [\n' +
Expand Down
0 common/mockData/jsonSchemaExpectedMock.json → ...mmon/mockData/jsonSchemaExpectedMock.json
View file
Open in desktop
File renamed without changes.
0 common/mockData/jsonSchemaFielSetMock.json → ...ommon/mockData/jsonSchemaFielSetMock.json
View file
Open in desktop
File renamed without changes.
0 common/mockData/jsonSchemaMock.json → src/common/mockData/jsonSchemaMock.json
View file
Open in desktop
File renamed without changes.
0 common/mockData/uiSchemaExpectedMock.json → ...common/mockData/uiSchemaExpectedMock.json
View file
Open in desktop
File renamed without changes.
0 ...mockData/uiSchemaFielSetExpectedMock.json → ...mockData/uiSchemaFielSetExpectedMock.json
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { generateUISchema } from './generateUISchema';
export { validateJSONSchema } from './validateJsonSchema';
import 'jest-extended';
17 changes: 8 additions & 9 deletions test/JsonFormatter.test.tsx → src/test/JsonFormatter.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import jsonSchemaFieldSets from "../common/mockData/jsonSchemaFielSetMock.json";
import expectedSchema from "../common/mockData/jsonSchemaExpectedMock.json";
import expectedUISchema from "../common/mockData/uiSchemaExpectedMock.json";
import expectedFieldSetUISchema from "../common/mockData/uiSchemaFielSetExpectedMock.json";
import { validateJSONSchema } from "../src/validateJsonSchema";
import { generateUISchema } from "../src/generateUISchema";
import { validateJSONSchema } from "../validateJsonSchema";
import { generateUISchema } from "../generateUISchema";
import {
JSON_SCHEMA_ID_$SCHEMA_FAKE_DATA,
JSON_SCHEMA_EMPTY_CHOICES_FAKE_DATA,
Expand All @@ -25,18 +25,18 @@ import {
describe('JSON Schema validation', () => {

it('Special chars should throw an exception', () => {
expect(() => { validateJSONSchema(JSON_SCHEMA_SPECIAL_CHARS_FAKE_DATA) }).toThrowError('Special characters not supported in JSON Schema');
expect(() => { validateJSONSchema(JSON_SCHEMA_SPECIAL_CHARS_FAKE_DATA) }).toThrow('Special characters not supported in JSON Schema');
});

it('Validate invalid double quotes', () => {
expect(validateJSONSchema(JSON_SCHEMA_INVALID_DOUBLE_QUOTES_FAKE_DATA).toString).not.toContain(/([“”])/g);
expect(JSON.stringify(validateJSONSchema(JSON_SCHEMA_INVALID_DOUBLE_QUOTES_FAKE_DATA))).not.toMatch(/([“”])/g);
});

it('Validate empty choices', () => {
const validSchema = validateJSONSchema(JSON_SCHEMA_EMPTY_CHOICES_FAKE_DATA).toString;
expect(validSchema).not.toContain(/\"enum\"\n*\s*\:\n*\s*\[\n*\s*\]/g);
expect(validSchema).not.toContain(/\"enumNames\"\n*\s*\:\n*\s*\{\n*\s*\}/g);
expect(validSchema).not.toContain(/\"titleMap\"\n*\s*\:\n*\s*\[\n*\s*\]/g);
const validSchema = JSON.stringify(validateJSONSchema(JSON_SCHEMA_EMPTY_CHOICES_FAKE_DATA));
expect(validSchema).not.toMatch(/"enum"\n*\s*:\n*\s*\[\n*\s*]/g);
expect(validSchema).not.toMatch(/"enumNames"\n*\s*:\n*\s*\{\n*\s*}/g);
expect(validSchema).not.toMatch(/"titleMap"\n*\s*:\n*\s*\[\n*\s*]/g);
});

it('Validate remove $schema and id properties', () => {
Expand Down Expand Up @@ -129,7 +129,6 @@ describe('JSON Schema validation', () => {
expect(validSchema.schema.properties['calendar'].required).toBeUndefined();
expect(validSchema.schema.properties['checkbox_static_choice'].required).toBeUndefined();
expect(validSchema.schema.properties['checkbox_query'].required).toBeUndefined();
// @ts-ignore
expect(validSchema.schema.required).toIncludeAllMembers([
'string',
'paragraph',
Expand Down