Skip to content

Commit 5b99e2a

Browse files
Chart: prepare tests to move files with code to TS (#30962) (#31006)
1 parent 29676f0 commit 5b99e2a

File tree

199 files changed

+3921
-7723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+3921
-7723
lines changed

packages/devextreme/js/viz/chart_components/layout_manager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { isNumeric as _isNumber } from '../../core/utils/type';
22
import consts from '../components/consts';
33
import { WrapperLayoutElement } from '../core/layout_element';
4+
45
const { floor, sqrt } = Math;
56
const _min = Math.min;
67
const _max = Math.max;

packages/devextreme/js/viz/chart_components/tracker.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import pointerEvents from '../../common/core/events/pointer';
99
import { addNamespace } from '../../common/core/events/utils/index';
1010
import { isDefined } from '../../core/utils/type';
1111
import { noop as _noop } from '../../core/utils/common';
12+
1213
const _floor = Math.floor;
1314
const eventsConsts = consts.events;
1415
const statesConsts = consts.states;

packages/devextreme/js/viz/core/loading_indicator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const plugin = {
107107
name: 'loading_indicator',
108108
init: function() {
109109
const that = this;
110-
// "exports" is used for testing purposes.
110+
111111
that._loadingIndicator = new LoadingIndicator({ eventTrigger: that._eventTrigger, renderer: that._renderer, notify: notify });
112112
that._scheduleLoadingIndicatorHiding();
113113
function notify(state) {

packages/devextreme/js/viz/core/title.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ export const plugin = {
305305
name: 'title',
306306
init: function() {
307307
const that = this;
308-
// "exports" is used for testing purposes.
308+
309309
that._title = new Title({
310310
renderer: that._renderer,
311311
cssClass: that._rootClassPrefix + '-title',

packages/devextreme/js/viz/core/tooltip.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ export const plugin = {
419419
members: {
420420
// The method exists only to be overridden in sparklines.
421421
_initTooltip: function() {
422-
// "exports" is used for testing purposes.
423422
this._tooltip = new Tooltip({
424423
cssClass: this._rootClassPrefix + '-tooltip',
425424
eventTrigger: this._eventTrigger,

packages/devextreme/js/viz/core/utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { each } from '../../core/utils/iterator';
55
import { adjust, sign } from '../../core/utils/math';
66
import dateUtils from '../../core/utils/date';
77
import Color from '../../color';
8+
89
const { PI, LN10, abs, log, floor, ceil, pow, sqrt, atan2 } = Math;
910
const _min = Math.min;
1011
const _max = Math.max;

packages/devextreme/testing/helpers/chartMocks.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ import pointModule from 'viz/series/points/base_point';
99
import translator2DModule from 'viz/translators/translator2d';
1010
import seriesFamilyModule from 'viz/core/series_family';
1111
import seriesModule from 'viz/series/base_series';
12-
import vizMocks from './vizMocks.js';
12+
import {
13+
Renderer,
14+
incidentOccurred,
15+
LoadingIndicator,
16+
} from './vizMocks.js';
1317
import { Range } from 'viz/translators/range';
18+
1419
const LoadingIndicatorOrig = loadingIndicatorModule.LoadingIndicator;
1520

1621
const firstCategory = 'First';
@@ -227,10 +232,10 @@ const defaultAxisYOptions = $.extend(true, {}, {
227232
});
228233

229234
export const createHorizontalAxis = function createHorizontalAxis(translatorData, orthogonalTranslatorData, allOptions) {
230-
return createAxis(translatorData, orthogonalTranslatorData, $.extend(true, {}, defaultAxisXOptions, { incidentOccurred: vizMocks.incidentOccurred() }, allOptions), true);
235+
return createAxis(translatorData, orthogonalTranslatorData, $.extend(true, {}, defaultAxisXOptions, { incidentOccurred: incidentOccurred() }, allOptions), true);
231236
};
232237
export const createVerticalAxis = function createVerticalAxis(translatorData, orthogonalTranslatorData, allOptions) {
233-
return createAxis(translatorData, orthogonalTranslatorData, $.extend(true, {}, defaultAxisYOptions, { incidentOccurred: vizMocks.incidentOccurred() }, allOptions));
238+
return createAxis(translatorData, orthogonalTranslatorData, $.extend(true, {}, defaultAxisYOptions, { incidentOccurred: incidentOccurred() }, allOptions));
234239
};
235240

236241
function createAxis(translatorData, orthogonalTranslatorData, allOptions, isHorizontal) {
@@ -256,7 +261,7 @@ function createAxis(translatorData, orthogonalTranslatorData, allOptions, isHori
256261
const mergedOptions = $.extend(true, {}, allOptions);
257262

258263
const axis = new axisModule.Axis({
259-
renderer: new vizMocks.Renderer(),
264+
renderer: new Renderer(),
260265
stripsGroup: allOptions.stripsGroup,
261266
stripLabelAxesGroup: allOptions.stripLabelAxesGroup,
262267
constantLinesGroup: allOptions.constantLinesGroup,
@@ -371,7 +376,7 @@ export const insertMockFactory = function insertMockFactory() {
371376
});
372377

373378
loadingIndicatorModule.DEBUG_set_LoadingIndicator(function(parameters) {
374-
return new vizMocks.LoadingIndicator(parameters);
379+
return new LoadingIndicator(parameters);
375380
});
376381
};
377382

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
(function(root, factory) {
2-
if(typeof define === 'function' && define.amd) {
3-
define(function(require, exports, module) {
4-
root.responsiveBoxScreenMock = module.exports = factory(require('jquery'), require('ui/responsive_box'), require('core/utils/resize_callbacks'));
5-
});
6-
} else {
7-
root.responsiveBoxScreenMock = factory(root.jQuery, DevExpress.require('ui/responsive_box'), DevExpress.require('core/utils/resize_callbacks'));
8-
}
9-
}(window, function($, ResponsiveBox, resizeCallbacks) {
10-
return {
11-
setup: function(screenSize) {
12-
screenSize = screenSize || 1000;
1+
import ResponsiveBox from 'ui/responsive_box';
2+
import resizeCallbacks from 'core/utils/resize_callbacks';
3+
4+
const responsiveBoxScreenMock = {
5+
setup(screenSize) {
6+
let currentSize = screenSize || 1000;
137

14-
this.setScreenSize = function(size) {
15-
screenSize = size;
16-
};
8+
this.setScreenSize = function(size) {
9+
currentSize = size;
10+
};
1711

18-
this.updateScreenSize = function(size) {
19-
this.setScreenSize(size);
20-
resizeCallbacks.fire();
21-
};
12+
this.updateScreenSize = function(size) {
13+
this.setScreenSize(size);
14+
resizeCallbacks.fire();
15+
};
16+
17+
this.originalScreenWidth = ResponsiveBox.prototype._screenWidth;
18+
ResponsiveBox.prototype._screenWidth = function() {
19+
return currentSize;
20+
};
21+
},
22+
teardown() {
23+
ResponsiveBox.prototype._screenWidth = this.originalScreenWidth;
24+
}
25+
};
2226

23-
this.originalScreenWidth = ResponsiveBox.prototype._screenWidth;
24-
ResponsiveBox.prototype._screenWidth = function() {
25-
return screenSize;
26-
};
27-
},
28-
teardown: function() {
29-
ResponsiveBox.prototype._screenWidth = this.originalScreenWidth;
30-
}
31-
};
32-
}));
27+
export default responsiveBoxScreenMock;

0 commit comments

Comments
 (0)