Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const $ = require('jquery');
import $ from 'jquery';

QUnit.test('animation', function(assert) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const $ = require('jquery');
import $ from 'jquery';

QUnit.test('core', function(assert) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const $ = require('jquery');
import $ from 'jquery';

QUnit.test('data.odata', function(assert) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const $ = require('jquery');
const special = require('../../../helpers/eventHelper.js').special;
import $ from 'jquery';
import { special } from '../../../helpers/eventHelper.js';

QUnit.test('events', function(assert) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const $ = require('jquery');
import $ from 'jquery';

QUnit.test('widgets-base', function(assert) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const $ = require('jquery');
import $ from 'jquery';

QUnit.test('widgets-web', function(assert) {

Expand Down
18 changes: 9 additions & 9 deletions packages/devextreme/testing/tests/Bundles/dx.all.tests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const $ = require('jquery');
import $ from 'jquery';

require('bundles/dx.all.js');
import 'bundles/dx.all.js';

QUnit.test('DevExpress namespaces', function(assert) {
const namespaces = [
Expand All @@ -19,10 +19,10 @@ QUnit.test('DevExpress namespaces', function(assert) {
assert.ok(DevExpress.utils.readyCallbacks, 'readyCallbacks namespace');
});

require('./bundlesParts/core.tests.js');
require('./bundlesParts/events.tests.js');
require('./bundlesParts/data.tests.js');
require('./bundlesParts/data.odata.tests.js');
require('./bundlesParts/animation.tests.js');
require('./bundlesParts/widgets-base.tests.js');
require('./bundlesParts/widgets-web.tests.js');
import './bundlesParts/core.tests.js';
import './bundlesParts/events.tests.js';
import './bundlesParts/data.tests.js';
import './bundlesParts/data.odata.tests.js';
import './bundlesParts/animation.tests.js';
import './bundlesParts/widgets-base.tests.js';
import './bundlesParts/widgets-web.tests.js';
18 changes: 9 additions & 9 deletions packages/devextreme/testing/tests/Bundles/dx.custom.tests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const $ = require('jquery');
import $ from 'jquery';

require('bundles/dx.custom.js');
import 'bundles/dx.custom.js';

QUnit.test('DevExpress namespaces', function(assert) {
const namespaces = [
Expand All @@ -16,10 +16,10 @@ QUnit.test('DevExpress namespaces', function(assert) {
});
});

require('./bundlesParts/core.tests.js');
require('./bundlesParts/events.tests.js');
require('./bundlesParts/data.tests.js');
require('./bundlesParts/data.odata.tests.js');
require('./bundlesParts/animation.tests.js');
require('./bundlesParts/widgets-base.tests.js');
require('./bundlesParts/widgets-web.tests.js');
import './bundlesParts/core.tests.js';
import './bundlesParts/events.tests.js';
import './bundlesParts/data.tests.js';
import './bundlesParts/data.odata.tests.js';
import './bundlesParts/animation.tests.js';
import './bundlesParts/widgets-base.tests.js';
import './bundlesParts/widgets-web.tests.js';
14 changes: 7 additions & 7 deletions packages/devextreme/testing/tests/Bundles/dx.viz.tests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const $ = require('jquery');
import $ from 'jquery';

require('bundles/dx.viz.js');
import 'bundles/dx.viz.js';

QUnit.test('DevExpress namespaces', function(assert) {
const namespaces = [
Expand All @@ -16,8 +16,8 @@ QUnit.test('DevExpress namespaces', function(assert) {
});
});

require('./bundlesParts/core.tests.js');
require('./bundlesParts/events.tests.js');
require('./bundlesParts/data.tests.js');
require('./bundlesParts/data.odata.tests.js');
require('./bundlesParts/animation.tests.js');
import './bundlesParts/core.tests.js';
import './bundlesParts/events.tests.js';
import './bundlesParts/data.tests.js';
import './bundlesParts/data.odata.tests.js';
import './bundlesParts/animation.tests.js';
18 changes: 9 additions & 9 deletions packages/devextreme/testing/tests/Bundles/dx.web.tests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const $ = require('jquery');
import $ from 'jquery';

require('bundles/dx.web.js');
import 'bundles/dx.web.js';

QUnit.test('DevExpress namespaces', function(assert) {
const namespaces = [
Expand All @@ -23,10 +23,10 @@ QUnit.test('DevExpress namespaces', function(assert) {
});
});

require('./bundlesParts/core.tests.js');
require('./bundlesParts/events.tests.js');
require('./bundlesParts/data.tests.js');
require('./bundlesParts/data.odata.tests.js');
require('./bundlesParts/animation.tests.js');
require('./bundlesParts/widgets-base.tests.js');
require('./bundlesParts/widgets-web.tests.js');
import './bundlesParts/core.tests.js';
import './bundlesParts/events.tests.js';
import './bundlesParts/data.tests.js';
import './bundlesParts/data.odata.tests.js';
import './bundlesParts/animation.tests.js';
import './bundlesParts/widgets-base.tests.js';
import './bundlesParts/widgets-web.tests.js';
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
define(function(require) {
QUnit.test = QUnit.urlParams['nocsp'] ? QUnit.test : QUnit.skip;
require('bundles/dx.all.js');
import 'bundles/dx.all.js';

QUnit.module('config.useJQuery');
QUnit.test = QUnit.urlParams['nocsp'] ? QUnit.test : QUnit.skip;

QUnit.test('config value useJQuery should be false if jquery is not included', function(assert) {
const config = DevExpress.config;
assert.equal(!!config().useJQuery, false);
});
QUnit.module('config.useJQuery');

QUnit.test('config value useJQuery should be false if jquery is not included', function(assert) {
const config = DevExpress.config;
assert.equal(!!config().useJQuery, false);
});
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const config = require('core/config');
import config from 'core/config';

QUnit.module('config.useJQuery');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const domAdapter = require('core/dom_adapter');
import domAdapter from 'core/dom_adapter';

QUnit.module('DOM Adapter', {
beforeEach: function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const dataUtils = require('core/element_data');
import * as dataUtils from 'core/element_data';

QUnit.module('Data');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Guid = require('core/guid');
import Guid from 'core/guid';

QUnit.module('Guid');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const testGlobalExports = require('../../helpers/publicModulesHelper.js');
const { version } = require('core/version');
import testGlobalExports from '../../helpers/publicModulesHelper.js';
import { version } from 'core/version';

require('bundles/modules/core');
import 'bundles/modules/core';

testGlobalExports({
'DevExpress': DevExpress
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { setHeight, setWidth, implementationsMap } = require('core/utils/size');
const renderer = require('core/renderer');
import { setHeight, setWidth, implementationsMap } from 'core/utils/size';
import renderer from 'core/renderer';

QUnit.module('renderer');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const $ = require('jquery');
const ajax = require('core/utils/ajax');
const compareVersion = require('core/utils/version').compare;
import $ from 'jquery';
import ajax from 'core/utils/ajax';
import { compare as compareVersion } from 'core/utils/version';

QUnit.test = QUnit.urlParams['nocsp'] ? QUnit.test : QUnit.skip;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const $ = require('jquery');
const animationFrame = require('common/core/animation/frame');
const coreUtilsType = require('core/utils/type');
import $ from 'jquery';
import * as animationFrame from 'common/core/animation/frame';
import * as coreUtilsType from 'core/utils/type';

QUnit.module('animation frame');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const browser = require('core/utils/browser');
import browser from 'core/utils/browser';

const userAgents = {
webkit: 'Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Custom/43.0.2357.124',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const callOnce = require('core/utils/call_once');
import callOnce from 'core/utils/call_once';

QUnit.module('callOnce');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Callbacks = require('core/utils/callbacks');
import Callbacks from 'core/utils/callbacks';

QUnit.module('Methods', {
beforeEach: function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const dateUtils = require('core/utils/date');
import dateUtils from 'core/utils/date';

const WEEK_DAYS = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const dateSerialization = require('core/utils/date_serialization');
const config = require('core/config');
import dateSerialization from 'core/utils/date_serialization';
import config from 'core/config';

QUnit.module('Default DX Formats');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const dateSerialization = require('core/utils/date_serialization');
const config = require('core/config');
import dateSerialization from 'core/utils/date_serialization';
import config from 'core/config';

QUnit.module('date serialization tests', {
beforeEach: function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
define(function(require) {
const isFunction = require('core/utils/type').isFunction;
const deferredUtils = require('core/utils/deferred');
const Deferred = deferredUtils.Deferred;
import { isFunction } from 'core/utils/type';
import * as deferredUtils from 'core/utils/deferred';

if(!QUnit.urlParams['nojquery']) {
return;
}
const { Deferred } = deferredUtils;

if(QUnit.urlParams['nojquery']) {
QUnit.module('when');

QUnit.test('when should be resolved synchronously', function(assert) {
Expand Down Expand Up @@ -491,4 +488,4 @@ define(function(require) {

deferred.resolve(1);
});
});
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const dependencyInjector = require('core/utils/dependency_injector');
import dependencyInjector from 'core/utils/dependency_injector';

QUnit.module('dependencyInjector');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const inflector = require('core/utils/inflector');
import * as inflector from 'core/utils/inflector';

QUnit.module('inflector');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const mathUtils = require('core/utils/math');
import * as mathUtils from 'core/utils/math';
const adjust = mathUtils.adjust;

QUnit.test('fitIntoRange', function(assert) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const objectUtils = require('core/utils/object');
import * as objectUtils from 'core/utils/object';

QUnit.test('orderEach', function(assert) {
const checkOrderEach = function(mapKeys, keys) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const $ = require('jquery');
const queueUtils = require('core/utils/queue');
import $ from 'jquery';
import * as queueUtils from 'core/utils/queue';

QUnit.module('enqueue');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const readyCallbacks = require('core/utils/ready_callbacks');
import readyCallbacks from 'core/utils/ready_callbacks';

QUnit.module('readyCallbacks injection', {
afterEach: function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const stringUtils = require('core/utils/string');
import * as stringUtils from 'core/utils/string';

QUnit.module('String utils');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const hideTopOverlay = require('common/core/environment/hide_top_overlay');
const hideTopOverlayCallback = require('common/core/environment/hide_callback').hideCallback;
import hideTopOverlay from 'common/core/environment/hide_top_overlay';
import { hideCallback as hideTopOverlayCallback } from 'common/core/environment/hide_callback';

QUnit.module('top overlay util');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const $ = require('jquery');
const typeUtils = require('core/utils/type');
const Deferred = require('core/utils/deferred').Deferred;
const renderer = require('core/renderer');
const eventsEngine = require('common/core/events/core/events_engine');
import $ from 'jquery';
import * as typeUtils from 'core/utils/type';
import { Deferred } from 'core/utils/deferred';
import renderer from 'core/renderer';
import eventsEngine from 'common/core/events/core/events_engine';

QUnit.module('Type checking');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const variableWrapper = require('core/utils/variable_wrapper');
const { logger } = require('core/utils/console');
import variableWrapper from 'core/utils/variable_wrapper';
import { logger } from 'core/utils/console';

QUnit.test('Base wrapper methods', function(assert) {
assert.strictEqual(variableWrapper.isWrapped(3), false, 'isWrapped method');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const compare = require('core/utils/version').compare;
import { compare } from 'core/utils/version';

QUnit.module('version');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const $ = require('jquery');
const viewPortUtils = require('core/utils/view_port');
import $ from 'jquery';
import * as viewPortUtils from 'core/utils/view_port';
const viewPort = viewPortUtils.value;
const viewPortChanged = viewPortUtils.changeCallback;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const $ = require('jquery');
const ko = require('knockout');
import $ from 'jquery';
import ko from 'knockout';

require('ui/accordion');
require('integration/knockout');
import 'ui/accordion';
import 'integration/knockout';

if(QUnit.urlParams['nocsp']) {
QUnit.module('accordion');
Expand Down
Loading
Loading