fix renderer tests after new build process

Hyperkid123 · Hyperkid123 · commit 1b5a7810cacb · 2020-12-02T08:54:54.000+01:00
diff --git a/packages/react-form-renderer/src/common/helpers.js b/packages/react-form-renderer/src/common/helpers.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-vars */
 import { isValidElement } from 'react';
-import Validators from '../validators/validators';
+import Validators from '../validators';
 
 const HAS_PROP = {}.hasOwnProperty;
 export const TO_STRING = {}.toString;
diff --git a/packages/react-form-renderer/src/tests/form-renderer/condition.test.js b/packages/react-form-renderer/src/tests/form-renderer/condition.test.js
@@ -3,11 +3,11 @@ import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
 import FormTemplate from '../../../../../__mocks__/mock-form-template';
-import componentTypes from '../../../dist/cjs/component-types';
-import useFieldApi from '../../use-field-api/use-field-api';
-import FormRenderer from '../../form-renderer/form-renderer';
+import componentTypes from '../../component-types';
+import useFieldApi from '../../use-field-api';
+import FormRenderer from '../../form-renderer';
 
-import { reducer } from '../../condition/condition';
+import { reducer } from '../../condition';
 
 const TextField = (props) => {
   const { input } = useFieldApi(props);
diff --git a/packages/react-form-renderer/src/tests/form-renderer/data-types.test.js b/packages/react-form-renderer/src/tests/form-renderer/data-types.test.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import FormRenderer from '../../form-renderer/form-renderer';
+import FormRenderer from '../../form-renderer';
 import FormTemplate from '../../../../../__mocks__/mock-form-template';
-import componentTypes from '../../component-types/component-types';
-import useFieldApi from '../../use-field-api/use-field-api';
+import componentTypes from '../../component-types';
+import useFieldApi from '../../use-field-api';
 
 const DataTypeInput = (props) => {
   const { input, type, label } = useFieldApi(props);
diff --git a/packages/react-form-renderer/src/tests/form-renderer/form-renderer.test.js b/packages/react-form-renderer/src/tests/form-renderer/form-renderer.test.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import FormRenderer from '../../form-renderer/form-renderer';
-import SchemaErrorComponent from '../../form-renderer-old/schema-error-component';
-import componentTypes from '../../component-types/component-types';
+import FormRenderer from '../../form-renderer';
+import SchemaErrorComponent from '../../form-renderer/schema-error-component';
+import componentTypes from '../../component-types';
 import FormTemplate from '../../../../../__mocks__/mock-form-template';
-import useFieldApi from '../../use-field-api/use-field-api';
+import useFieldApi from '../../use-field-api';
 
 const TextField = (props) => {
   const { input } = useFieldApi(props);
diff --git a/packages/react-form-renderer/src/tests/form-renderer/helpers.test.js b/packages/react-form-renderer/src/tests/form-renderer/helpers.test.js
@@ -1,4 +1,4 @@
-import composeValidators from '../../compose-validators/compose-validators';
+import composeValidators from '../../compose-validators';
 
 describe('Form helpers', () => {
   describe('Compose validators helper', () => {
diff --git a/packages/react-form-renderer/src/tests/form-renderer/parse-condition.test.js b/packages/react-form-renderer/src/tests/form-renderer/parse-condition.test.js
@@ -1,4 +1,4 @@
-import parseCondition from '../../parse-condition/parse-condition';
+import parseCondition from '../../parse-condition';
 
 describe('parseCondition', () => {
   let condition;
diff --git a/packages/react-form-renderer/src/tests/form-renderer/render-form.test.js b/packages/react-form-renderer/src/tests/form-renderer/render-form.test.js
@@ -3,14 +3,14 @@ import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { Form } from 'react-final-form';
 import arrayMutators from 'final-form-arrays';
-import renderForm from '../../form-renderer-old/render-form';
-import RendererContext from '../../renderer-context/renderer-context';
-import FormRenderer from '../../form-renderer/form-renderer';
-import validatorTypes from '../../validator-types/validator-types';
-import componentTypes from '../../component-types/component-types';
+import renderForm from '../../form-renderer/render-form';
+import RendererContext from '../../renderer-context';
+import FormRenderer from '../../form-renderer';
+import validatorTypes from '../../validator-types';
+import componentTypes from '../../component-types';
 import FormTemplate from '../../../../../__mocks__/mock-form-template';
-import useFieldApi from '../../use-field-api/use-field-api';
-import FieldProvider from '../../field-provider/field-provider';
+import useFieldApi from '../../use-field-api';
+import FieldProvider from '../../field-provider';
 
 const TextField = (props) => {
   const { input, meta, ...rest } = useFieldApi(props);
diff --git a/packages/react-form-renderer/src/tests/form-renderer/schema-error-component.test.js b/packages/react-form-renderer/src/tests/form-renderer/schema-error-component.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
-import SchemaErrorComponent from '../../form-renderer-old/schema-error-component';
+import SchemaErrorComponent from '../../form-renderer/schema-error-component';
 
 describe('schemaErrorComponent', () => {
   it('renders correctly', () => {
diff --git a/packages/react-form-renderer/src/tests/form-renderer/schema-validator-mapper.test.js b/packages/react-form-renderer/src/tests/form-renderer/schema-validator-mapper.test.js
@@ -1,10 +1,10 @@
 /* eslint-disable no-console */
 import React from 'react';
 import { mount } from 'enzyme';
-import FormRenderer from '../../form-renderer/form-renderer';
-import componentTypes from '../../component-types/component-types';
-import DefaultSchemaError from '../../schema-errors/schema-errors';
-import SchemaErrorComponent from '../../form-renderer-old/schema-error-component';
+import FormRenderer from '../../form-renderer';
+import componentTypes from '../../component-types';
+import DefaultSchemaError from '../../schema-errors';
+import SchemaErrorComponent from '../../form-renderer/schema-error-component';
 
 describe('schemaValidatorMapper', () => {
   let initialProps;
diff --git a/packages/react-form-renderer/src/tests/form-renderer/use-field-api.test.js b/packages/react-form-renderer/src/tests/form-renderer/use-field-api.test.js
@@ -2,11 +2,11 @@ import React, { Component } from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import useFieldApi from '../../use-field-api/use-field-api';
-import componentTypes from '../../component-types/component-types';
-import Form from '../../files/form';
-import RendererContext from '../../renderer-context/renderer-context';
-import validatorTypes from '../../validator-types/validator-types';
+import useFieldApi from '../../use-field-api';
+import componentTypes from '../../component-types';
+import Form from '../../form';
+import RendererContext from '../../renderer-context';
+import validatorTypes from '../../validator-types';
 
 describe('useFieldApi', () => {
   const Catcher = ({ children }) => children;
diff --git a/packages/react-form-renderer/src/tests/form-renderer/validator.test.js b/packages/react-form-renderer/src/tests/form-renderer/validator.test.js
@@ -2,10 +2,10 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import FormRenderer from '../../form-renderer/form-renderer';
-import componentTypes from '../../component-types/component-types';
+import FormRenderer from '../../form-renderer';
+import componentTypes from '../../component-types';
 import FormTemplate from '../../../../../__mocks__/mock-form-template';
-import useFieldApi from '../../use-field-api/use-field-api';
+import useFieldApi from '../../use-field-api';
 
 describe('FormRenderer validator', () => {
   const TextField = (props) => {
diff --git a/packages/react-form-renderer/src/tests/parsers/default-schema-validator.test.js b/packages/react-form-renderer/src/tests/parsers/default-schema-validator.test.js
@@ -1,8 +1,8 @@
-import output from './output';
 import React from 'react';
-import defaultSchemaValidator from '../../default-schema-validator/default-schema-validator';
-import componentTypes from '../../component-types/component-types';
-import { validatorTypes as validatorTypesDefault } from '../..';
+import output from './output';
+import defaultSchemaValidator from '../../default-schema-validator';
+import componentTypes from '../../component-types';
+import validatorTypesDefault from '../../validator-types';
 
 describe('Default schema validator', () => {
   let componentMapper;
diff --git a/packages/react-form-renderer/src/tests/parsers/output.js b/packages/react-form-renderer/src/tests/parsers/output.js
@@ -1,5 +1,6 @@
 /* eslint-disable camelcase */
-import { validatorTypes, componentTypes } from '@data-driven-forms/react-form-renderer';
+import validatorTypes from '../../validator-types';
+import componentTypes from '../../component-types';
 
 const output = {
   title: 'Testing dialog',
diff --git a/packages/react-form-renderer/src/tests/validators/compose-validators.test.js b/packages/react-form-renderer/src/tests/validators/compose-validators.test.js
@@ -1,4 +1,4 @@
-import composeValidators from '../../compose-validators/compose-validators';
+import composeValidators from '../../compose-validators';
 
 describe('Compose validators', () => {
   const syncValidator = (value) => (value === 'sync-error' ? 'sync-error' : undefined);
diff --git a/packages/react-form-renderer/src/tests/validators/messages.test.js b/packages/react-form-renderer/src/tests/validators/messages.test.js
@@ -1,4 +1,4 @@
-import messages from '../../validators-old/messages';
+import messages from '../../validators/messages';
 
 describe('validator messages', () => {
   const getMessage = ({ defaultMessage }) => (typeof defaultMessage === 'function' ? defaultMessage(5) : defaultMessage);
diff --git a/packages/react-form-renderer/src/tests/validators/validators.test.js b/packages/react-form-renderer/src/tests/validators/validators.test.js
@@ -1,8 +1,8 @@
-import { dataTypeValidator, numericality } from '../../validators-old/validator-functions';
-import Validator from '../../validators/validators';
-import messages from '../../validators-old/messages';
-import validatorTypes from '../../validator-types/validator-types';
-import validatorMapper from '../../validator-mapper/validator-mapper';
+import { dataTypeValidator, numericality } from '../../validators/validator-functions';
+import Validator from '../../validators';
+import messages from '../../validators/validator-functions';
+import validatorTypes from '../../validator-types';
+import validatorMapper from '../../validator-mapper';
 
 describe('New validators', () => {
   describe('Required validator', () => {
diff --git a/packages/react-form-renderer/src/use-field-api/validator-helpers.d.ts b/packages/react-form-renderer/src/use-field-api/validator-helpers.d.ts
@@ -1,6 +1,6 @@
 import { ValidatorType } from "./use-field-api";
 import { ReactNode } from "react";
-import { ValidatorMapper } from "../validator-mapper/validator-mapper";
+import { ValidatorMapper } from "../validator-mapper";
 import { DataType } from "../data-types";
 import { ValidatorFunction } from "../validators/validators";
 
diff --git a/packages/react-form-renderer/src/use-field-api/validator-helpers.js b/packages/react-form-renderer/src/use-field-api/validator-helpers.js
@@ -1,6 +1,6 @@
 import { memoize } from '../common/helpers';
 import { dataTypeValidator } from '../validators/validator-functions';
-import composeValidators from '../compose-validators/compose-validators';
+import composeValidators from '../compose-validators';
 
 export const convertToWarning = (validator) => (...args) => ({
   type: 'warning',
diff --git a/packages/react-form-renderer/src/validators/url-validator.js b/packages/react-form-renderer/src/validators/url-validator.js
@@ -1,4 +1,4 @@
-import Validators from '../validators/validators';
+import Validators from '../validators';
 import { assign } from '../common/helpers';
 
 // user:pass BasicAuth (optional)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import composeValidators from '../../compose-validators/compose-validators';`
	`1`	`+import composeValidators from '../../compose-validators';`
`2`	`2`
`3`	`3`	`describe('Form helpers', () => {`
`4`	`4`	`describe('Compose validators helper', () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import parseCondition from '../../parse-condition/parse-condition';`
	`1`	`+import parseCondition from '../../parse-condition';`
`2`	`2`
`3`	`3`	`describe('parseCondition', () => {`
`4`	`4`	`let condition;`