Skip to content

Commit

Permalink
Renovation: file-name.ext -> file_name.ext (DevExpress#13556)
Browse files Browse the repository at this point in the history
* Renovation: file-name.ext -> file_name.ext

* fix paths

* Move independent components to the 'shared' folder

Co-authored-by: Andrey Churkin <[email protected]>
  • Loading branch information
churkin and Andrey Churkin authored Jun 24, 2020
1 parent 4e45a9d commit 7e01e1f
Show file tree
Hide file tree
Showing 24 changed files with 75 additions and 77 deletions.
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ module.exports = {
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
preset: 'ts-jest',
setupFiles: [
path.join(path.resolve('.'), './testing/jest/setup-enzyme.ts'),
path.join(path.resolve('.'), './testing/jest/setup_enzyme.ts'),
],
testMatch: [
path.join(path.resolve('.'), './testing/jest/**/*.tests.[jt]s?(x)')
],
transform: {
'test_components.+\\.tsx$': path.resolve('./testing/jest/utils/declaration-transformer.js'),
'test_components.+\\.tsx$': path.resolve('./testing/jest/utils/declaration_transformer.js'),
'\\.(js|jsx|ts|tsx)$': resolve.sync('ts-jest')
}
};
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import { h } from 'preact';
import { mount, shallow } from 'enzyme';
import devices from '../../js/core/devices';
import { convertRulesToOptions } from '../../js/core/options/utils';
import themes from '../../js/ui/themes';
import devices from '../../../js/core/devices';
import { convertRulesToOptions } from '../../../js/core/options/utils';
import themes from '../../../js/ui/themes';
import {
clear as clearEventHandlers,
defaultEvent,
emit,
getEventHandlers,
EVENT,
} from './utils/events-mock';
import Button, { ButtonProps, defaultOptionRules, viewFunction } from '../../js/renovation/button';
import Widget from '../../js/renovation/widget';
import Icon from '../../js/renovation/icon';
import InkRipple from '../../js/renovation/ink-ripple';
} from '../utils/events_mock';
import Button, { ButtonProps, defaultOptionRules, viewFunction } from '../../../js/renovation/button';
import Widget from '../../../js/renovation/widget';
import Icon from '../../../js/renovation/icon';
import InkRipple from '../../../js/renovation/ink-ripple';

type Mock = jest.Mock;

jest.mock('../../js/core/devices', () => {
const actualDevices = require.requireActual('../../js/core/devices');
jest.mock('../../../js/core/devices', () => {
const actualDevices = require.requireActual('../../../js/core/devices');
const isSimulator = actualDevices.isSimulator.bind(actualDevices);
const real = actualDevices.real.bind(actualDevices);

Expand All @@ -28,8 +28,8 @@ jest.mock('../../js/core/devices', () => {
return actualDevices;
});

jest.mock('../../js/ui/themes', () => ({
...require.requireActual('../../js/ui/themes'),
jest.mock('../../../js/ui/themes', () => ({
...require.requireActual('../../../js/ui/themes'),
current: jest.fn(() => 'generic'),
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
*/

import { act } from 'preact/test-utils';
import $ from '../../js/core/renderer';
import './test_components/preact_test_widget';
import './test_components/empty_test_widget';
import $ from '../../../js/core/renderer';
import '../test_components/preact_test_widget';
import '../test_components/empty_test_widget';
import {
defaultEvent,
emitKeyboard,
KEY,
} from './utils/events-mock';
} from '../utils/events_mock';

beforeEach(() => {
document.body.innerHTML = `
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { h } from 'preact';
import { shallow } from 'enzyme';
import PagerContentComponent, { PagerContentProps } from '../../../js/renovation/pager/pager-content';
import PageSizeSelectorComponent from '../../../js/renovation/pager/page-size-selector';
import PagerContentComponent, { PagerContentProps } from '../../../../js/renovation/pager/pager-content';
import PageSizeSelectorComponent from '../../../../js/renovation/pager/page-size-selector';
// import type { PageSizeSelectorPropsType } from '../../../js/renovation/pager/page-size-selector';
import PageIndexSelectorComponent from '../../../js/renovation/pager/page-index-selector';
import InfoTextComponent from '../../../js/renovation/pager/info';
import { PAGER_CLASS_FULL, PAGER_PAGES_CLASS, LIGHT_MODE_CLASS } from '../../../js/renovation/pager/consts';
import PageIndexSelectorComponent from '../../../../js/renovation/pager/page-index-selector';
import InfoTextComponent from '../../../../js/renovation/pager/info';
import { PAGER_CLASS_FULL, PAGER_PAGES_CLASS, LIGHT_MODE_CLASS } from '../../../../js/renovation/pager/consts';

jest.mock('../../../js/renovation/select-box', () => { });
jest.mock('../../../../js/renovation/select-box', () => { });

describe('PagerContent', () => {
const render = (props: Partial<PagerContentProps>) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { h, createRef } from 'preact';
import { shallow } from 'enzyme';
import InfoText, { viewFunction as InfoTextComponent } from '../../../js/renovation/pager/info';
import InfoText, { viewFunction as InfoTextComponent } from '../../../../js/renovation/pager/info';

describe('Info, separate view and component approach', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { h, createRef } from 'preact';
import { mount } from 'enzyme';
import {
EVENT, emit, getEventHandlers, clear,
} from '../utils/events-mock';
import { registerKeyboardAction } from '../../../js/ui/shared/accessibility';
import LightButton, { viewFunction as LightButtonComponent } from '../../../js/renovation/pager/light-button';
import * as LightButtonModule from '../../../js/renovation/pager/light-button';
} from '../../utils/events_mock';
import { registerKeyboardAction } from '../../../../js/ui/shared/accessibility';
import LightButton, { viewFunction as LightButtonComponent } from '../../../../js/renovation/pager/light-button';
import * as LightButtonModule from '../../../../js/renovation/pager/light-button';

const { dxClickEffect } = LightButtonModule;

jest.mock('../../../js/ui/shared/accessibility');
jest.mock('../../../../js/ui/shared/accessibility');

describe('LightButton', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { h } from 'preact';
import { shallow } from 'enzyme';
import PageIndexSelector, { viewFunction as PageIndexSelectorComponent } from '../../../js/renovation/pager/page-index-selector';
import PageIndexSelector, { viewFunction as PageIndexSelectorComponent } from '../../../../../js/renovation/pager/page-index-selector';

describe('Page index selector', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'preact';
import { shallow } from 'enzyme';
import Page, { viewFunction as PageComponent } from '../../../js/renovation/pager/page';
import { PAGER_PAGE_CLASS, PAGER_SELECTION_CLASS } from '../../../js/renovation/pager/consts';
import Page, { viewFunction as PageComponent } from '../../../../../js/renovation/pager/page';
import { PAGER_PAGE_CLASS, PAGER_SELECTION_CLASS } from '../../../../../js/renovation/pager/consts';

describe('Small pager pages', () => {
it('view', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { h } from 'preact';
import { shallow } from 'enzyme';
import PageSizeLarge, {
PAGER_SELECTED_PAGE_SIZE_CLASS, PAGER_PAGE_SIZE_CLASS,
} from '../../../js/renovation/pager/page-size-large';
} from '../../../../../js/renovation/pager/page-size-large';

describe('Pager size selector', () => {
const pageSizes = [{ text: '5', value: 5 }, { text: '10', value: 10 }];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { h } from 'preact';
import { shallow } from 'enzyme';
import PageSizeSelector from '../../../js/renovation/pager/page-size-selector';
import PageSizeSelector from '../../../../../js/renovation/pager/page-size-selector';

jest.mock('../../../js/renovation/pager/page-size-small', () => { });
jest.mock('../../../js/renovation/pager/page-size-large', () => { });
jest.mock('../../../../../js/renovation/pager/page-size-small', () => { });
jest.mock('../../../../../js/renovation/pager/page-size-large', () => { });

describe('Pager size selector', () => {
it('View, default props', () => {
const pageSizeChange = jest.fn();
const tree = shallow(<PageSizeSelector
pageSizeChange={pageSizeChange}
/>);
const tree = shallow(<PageSizeSelector pageSizeChange={pageSizeChange} />);
expect(tree.props()).toEqual({ className: 'dx-page-sizes' });
expect(tree.childAt(0).props()).toEqual({
pageSize: 5,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { h } from 'preact';
import { shallow } from 'enzyme';
import PageSizeSmall from '../../../js/renovation/pager/page-size-small';
import getElementComputedStyle from '../../../js/renovation/pager/utils/get-computed-style';
import PageSizeSmall from '../../../../../js/renovation/pager/page-size-small';
import getElementComputedStyle from '../../../../../js/renovation/pager/utils/get-computed-style';

jest.mock('../../../js/renovation/pager/utils/get-computed-style');
jest.mock('../../../js/renovation/select-box', () => { });
jest.mock('../../../../../js/renovation/pager/utils/get-computed-style');
jest.mock('../../../../../js/renovation/select-box', () => { });

describe('Pager size selector', () => {
const pageSizes = [{ text: '5', value: 5 }, { text: '10', value: 10 }];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { h } from 'preact';
import { shallow } from 'enzyme';
import PagerContentComponent from '../../../js/renovation/pager/pager-content';
import PagerComponent from '../../../js/renovation/pager/pager';
import PagerContentComponent from '../../../../js/renovation/pager/pager-content';
import PagerComponent from '../../../../js/renovation/pager/pager';

jest.mock('../../../js/renovation/select-box', jest.fn());
jest.mock('../../../../js/renovation/select-box', jest.fn());

describe('Pager', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* eslint-disable spellcheck/spell-checker */
import { h } from 'preact';
import { shallow } from 'enzyme';
import PagesLarge, { viewFunction as PagesLargeComponent } from '../../../js/renovation/pager/pages-large';
import Page from '../../../js/renovation/pager/page';
import PagesLarge, { viewFunction as PagesLargeComponent } from '../../../../../js/renovation/pager/pages-large';
import Page from '../../../../../js/renovation/pager/page';

describe('View', () => {
it('render', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { h, createRef } from 'preact';
import { mount } from 'enzyme';
import PagesSmall, { viewFunction as PagesSmallComponent } from '../../../js/renovation/pager/pages-small';
import getElementComputedStyle from '../../../js/renovation/pager/utils/get-computed-style';
import NumberBox from '../../../js/renovation/number-box';
import PagesSmall, { viewFunction as PagesSmallComponent } from '../../../../../js/renovation/pager/pages-small';
import getElementComputedStyle from '../../../../../js/renovation/pager/utils/get-computed-style';
import NumberBox from '../../../../../js/renovation/number-box';

jest.mock('../../../js/renovation/number-box', jest.fn());
jest.mock('../../../js/renovation/pager/page', jest.fn());
jest.mock('../../../js/renovation/pager/utils/get-computed-style');
jest.mock('../../../../../js/renovation/number-box', jest.fn());
jest.mock('../../../../../js/renovation/pager/page', jest.fn());
jest.mock('../../../../../js/renovation/pager/utils/get-computed-style');

describe('Small pager pages', () => {
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import { h } from 'preact';
import { shallow } from 'enzyme';
import getElementComputedStyle from '../../../js/renovation/pager/utils/get-computed-style';
import ResizableContainer, { viewFunction as ResizableContainerComponent, ResizableContainerProps, updateChildProps } from '../../../js/renovation/pager/resizable-container';
import { GetHtmlElement } from '../../../js/renovation/pager/pager.types.d';
import getElementComputedStyle from '../../../../js/renovation/pager/utils/get-computed-style';
import ResizableContainer, { viewFunction as ResizableContainerComponent, ResizableContainerProps, updateChildProps } from '../../../../js/renovation/pager/resizable-container';
import { GetHtmlElement } from '../../../../js/renovation/pager/pager.types';

jest.mock('../../../js/renovation/pager/utils/get-computed-style');
jest.mock('../../../../js/renovation/pager/utils/get-computed-style');

(getElementComputedStyle as jest.Mock).mockImplementation((el) => el);
describe('resizable-container', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { h } from 'preact';
import { shallow } from 'enzyme';
import { viewFunction as TooltipItemContentView } from '../../../../js/renovation/scheduler/appointment-tooltip/item-content';
import { viewFunction as TooltipItemContentView } from '../../../../../js/renovation/scheduler/appointment-tooltip/item-content';

describe('TooltipItemContent', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { h } from 'preact';
import { shallow } from 'enzyme';
import { Fragment } from 'devextreme-generator/component_declaration/common';
import { dxSchedulerAppointment } from '../../../../js/ui/scheduler';
import { dxSchedulerAppointment } from '../../../../../js/ui/scheduler';
import TooltipItemLayout, {
viewFunction as TooltipItemLayoutView,
TooltipItemLayoutProps,
} from '../../../../js/renovation/scheduler/appointment-tooltip/item-layout';
import DeleteButton from '../../../../js/renovation/button';
import Marker from '../../../../js/renovation/scheduler/appointment-tooltip/marker';
import TooltipItemContent from '../../../../js/renovation/scheduler/appointment-tooltip/item-content';

jest.mock('../../../../js/renovation/button', () => () => null);
jest.mock('../../../../js/renovation/scheduler/appointment-tooltip/marker', () => () => null);
jest.mock('../../../../js/renovation/scheduler/appointment-tooltip/item-content', () => () => null);
} from '../../../../../js/renovation/scheduler/appointment-tooltip/item-layout';
import DeleteButton from '../../../../../js/renovation/button';
import Marker from '../../../../../js/renovation/scheduler/appointment-tooltip/marker';
import TooltipItemContent from '../../../../../js/renovation/scheduler/appointment-tooltip/item-content';

jest.mock('../../../../../js/renovation/button', () => () => null);
jest.mock('../../../../../js/renovation/scheduler/appointment-tooltip/marker', () => () => null);
jest.mock('../../../../../js/renovation/scheduler/appointment-tooltip/item-content', () => () => null);

describe('TooltipItemLayout', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'preact';
import { shallow } from 'enzyme';
import Marker, { viewFunction as MarkerView } from '../../../../js/renovation/scheduler/appointment-tooltip/marker';
import { Deferred } from '../../../../js/core/utils/deferred';
import Marker, { viewFunction as MarkerView } from '../../../../../js/renovation/scheduler/appointment-tooltip/marker';
import { Deferred } from '../../../../../js/core/utils/deferred';

describe('Marker', () => {
describe('View', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { h } from 'preact';
import { shallow } from 'enzyme';
import ErrorMessage from '../../js/renovation/error-message';
import ErrorMessage from '../../../../js/renovation/error-message';

describe('ErrorMessage', () => {
describe('Props', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { h } from 'preact';
import { shallow } from 'enzyme';
import Icon from '../../js/renovation/icon';
import Icon from '../../../../js/renovation/icon';

describe('Icon', () => {
describe('Props', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { h, createRef } from 'preact';
import { mount, shallow, ShallowWrapper } from 'enzyme';
import {
clear as clearEventHandlers, defaultEvent, emit, getEventHandlers, fakeClickEvent, EVENT,
} from './utils/events-mock';
import Widget from '../../js/renovation/widget.p';
import type { WidgetRef } from '../../js/renovation/widget.p';
import type { WidgetProps } from '../../js/renovation/widget';
} from '../utils/events_mock';
import Widget from '../../../js/renovation/widget.p';
import type { WidgetRef } from '../../../js/renovation/widget.p';
import type { WidgetProps } from '../../../js/renovation/widget';

describe('Widget', () => {
const render = (props = {}): ShallowWrapper => shallow(<Widget {...props} />);
Expand Down
File renamed without changes.

0 comments on commit 7e01e1f

Please sign in to comment.