Skip to content

Commit 1675c6d

Browse files
authored
QUnit tests: remove BUILD_INPROGRESS_RENOVATION flag and renovation parts (DevExpress#31372)
1 parent 4ded346 commit 1675c6d

File tree

9 files changed

+1
-133
lines changed

9 files changed

+1
-133
lines changed

packages/devextreme/build/gulp/env-variables.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ function readFlag(variableName) {
77
module.exports = {
88
TEST_CI: readFlag('DEVEXTREME_TEST_CI'),
99
BUILD_ESM_PACKAGE: readFlag('BUILD_ESM_PACKAGE') && !readFlag('DEVEXTREME_TEST_CI'),
10-
BUILD_INPROGRESS_RENOVATION: readFlag('BUILD_INPROGRESS_RENOVATION'),
1110
BUILD_TESTCAFE: readFlag('BUILD_TESTCAFE'),
1211
BUILD_INTERNAL_PACKAGE: readFlag('BUILD_INTERNAL_PACKAGE'),
1312
BUILD_TEST_INTERNAL_PACKAGE: readFlag('BUILD_TEST_INTERNAL_PACKAGE')

packages/devextreme/build/gulp/generator/gulpfile.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
'use strict';
22

33
const gulp = require('gulp');
4-
const file = require('gulp-file');
54
const del = require('del');
65
const path = require('path');
7-
const fs = require('fs');
86
const { generateComponents } = require('@devextreme-generator/build-helpers');
97
const { InfernoGenerator } = require('@devextreme-generator/inferno');
108
const ts = require('gulp-typescript');
@@ -34,8 +32,6 @@ const SRC = [
3432
'!js/renovation/test_utils/**/*'
3533
];
3634

37-
const COMPAT_TESTS_PARTS = 'testing/tests/Renovation/';
38-
3935
const knownErrors = [
4036
'js/renovation/component_wrapper/',
4137
'js\\renovation\\component_wrapper\\',
@@ -119,25 +115,6 @@ function generateInfernoComponents(distPath, babelConfig, dev) {
119115
};
120116
}
121117

122-
function processRenovationMeta() {
123-
const widgetsMeta = generator
124-
.getComponentsMeta()
125-
.filter(meta =>
126-
meta.decorator &&
127-
meta.decorator.jQuery &&
128-
meta.decorator.jQuery.register === 'true' &&
129-
fs.existsSync(meta.path));
130-
131-
const metaJson = JSON.stringify(widgetsMeta.map(meta => ({
132-
widgetName: `dx${meta.name}`,
133-
...meta,
134-
path: path.relative(COMPAT_TESTS_PARTS, meta.path).replace(/\\/g, '/')
135-
})), null, 2);
136-
137-
return file('widgets.json', metaJson, { src: true })
138-
.pipe(gulp.dest(COMPAT_TESTS_PARTS));
139-
}
140-
141118
gulp.task('generate-jquery-components-clean', deleteJQueryComponents);
142119

143120
gulp.task('generate-jquery-components-run', function generateJQuery() {
@@ -155,13 +132,11 @@ gulp.task('generate-components', gulp.series(
155132
generateInfernoComponents('./', transpileConfig.cjs),
156133
ifEsmPackage(generateInfernoComponents('./esm', transpileConfig.esm)),
157134
ifEsmPackage(generateInfernoComponents('./cjs', transpileConfig.cjs)),
158-
processRenovationMeta
159135
));
160136

161137
gulp.task('generate-components-dev', gulp.series(
162138
'generate-jquery-components',
163139
generateInfernoComponents('./', transpileConfig.cjs, true),
164-
processRenovationMeta
165140
));
166141

167142
gulp.task('generate-inferno-components-watch', function() {

packages/devextreme/build/gulp/qunit-in-docker.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

packages/devextreme/build/gulp/renovation-pipes.js

Lines changed: 0 additions & 63 deletions
This file was deleted.

packages/devextreme/build/gulp/transpile.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const through2 = require('through2');
1818

1919
const removeDebug = require('./compression-pipes.js').removeDebug;
2020
const ctx = require('./context.js');
21-
const { replaceWidgets, reloadConfig, renovatedComponentsPath } = require('./renovation-pipes');
2221
const { ifEsmPackage } = require('./utils');
2322
const testsConfig = require('../../testing/tests.babelrc.json');
2423
const transpileConfig = require('./transpile-config');
@@ -177,7 +176,6 @@ const transpileRenovation = () => transpile(
177176
ctx.TRANSPILED_RENOVATION_PATH,
178177
{
179178
jsPipes: [
180-
replaceWidgets(true),
181179
cachedJsBabelCjs(),
182180
touch()
183181
],
@@ -191,7 +189,6 @@ const transpileProd = (dist, isEsm) => transpile(
191189
{
192190
jsPipes: [
193191
removeDebug(),
194-
replaceWidgets(false),
195192
isEsm ? babel(transpileConfig.esm) : cachedJsBabelCjs()
196193
],
197194
tsPipes: [
@@ -253,22 +250,6 @@ gulp.task('transpile', (done) => {
253250
});
254251
});
255252

256-
gulp.task('renovated-components-watch', () => {
257-
return gulp
258-
.watch(
259-
[renovatedComponentsPath + '.js'],
260-
function transpileRenovatedComponents(done) {
261-
gulp.series(
262-
reloadConfig,
263-
transpileRenovation(),
264-
transpileRenovationProd()
265-
)(done);
266-
}
267-
)
268-
.on('ready', () => console.log('renovated-components task is watching for changes...'));
269-
270-
});
271-
272253

273254
const watchJsTask = () => {
274255
const watchTask = watch(src)
@@ -282,12 +263,10 @@ const watchJsTask = () => {
282263
.pipe(babel(transpileConfig.cjs))
283264
.pipe(gulp.dest(ctx.TRANSPILED_PATH));
284265
watchTask
285-
.pipe(replaceWidgets(true))
286266
.pipe(babel(transpileConfig.cjs))
287267
.pipe(gulp.dest(ctx.TRANSPILED_RENOVATION_PATH));
288268
watchTask
289269
.pipe(removeDebug())
290-
.pipe(replaceWidgets(true))
291270
.pipe(babel(transpileConfig.cjs))
292271
.pipe(gulp.dest(ctx.TRANSPILED_PROD_RENOVATION_PATH));
293272
return watchTask;

packages/devextreme/gulpfile.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ require('./build/gulp/ts');
3939
require('./build/gulp/localization');
4040
require('./build/gulp/generator/gulpfile');
4141
require('./build/gulp/check_licenses');
42-
require('./build/gulp/qunit-in-docker');
4342
require('./build/gulp/systemjs');
4443
require('./build/gulp/state_manager');
4544

@@ -102,7 +101,6 @@ gulp.task('dev-watch', gulp.parallel(
102101
'generate-jquery-components-watch',
103102
'generate-inferno-components-watch',
104103
'transpile-watch',
105-
'renovated-components-watch',
106104
'bundler-config-watch',
107105
'js-bundles-watch',
108106
'test-env'

packages/devextreme/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@
238238
"build:systemjs": "gulp transpile-systemjs",
239239
"compile:r": "tsc -p ./renovation.tsconfig.json",
240240
"dev": "dotnet build build/build-dotnet.sln && cross-env DEVEXTREME_TEST_CI=true gulp dev",
241-
"dev-inprogress": "dotnet build build/build-dotnet.sln && cross-env DEVEXTREME_TEST_CI=true BUILD_INPROGRESS_RENOVATION=true gulp dev",
242241
"dev:watch": "cross-env DEVEXTREME_TEST_CI=true gulp dev-watch",
243242
"transpile-tests": "gulp transpile-tests",
244243
"update-ts-reexports": "dx-tools generate-reexports --sources ./js --exclude \"((dialog|export|list_light|notify|overlay|palette|set_template_engine|splitter_control|themes|themes_callback|track_bar|utils|validation_engine|validation_message)[.d.ts])|(js/renovation/)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"",
@@ -251,7 +250,6 @@
251250
"test-jest:watch": "jest --watch",
252251
"test-jest:node": "jest --no-coverage --runInBand --selectProjects node-tests",
253252
"test-jest:all": "pnpm test-jest && pnpm test-jest:node",
254-
"qunit-in-docker": "gulp qunit-in-docker --constel",
255253
"tcd-update": "tcd-update"
256254
},
257255
"bin": {

packages/devextreme/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
],
5252
"inputs": [
5353
{ "env": "BUILD_TEST_INTERNAL_PACKAGE" },
54-
{ "env": "BUILD_INPROGRESS_RENOVATION" },
5554
{ "env": "DEVEXTREME_TEST_CI" },
5655
{ "env": "DOTNET_CLI_TELEMETRY_OPTOUT" },
5756
{ "env": "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" },

packages/devextreme/testing/runner/Tools/UIModelHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Runner.Tools
1414
public class UIModelHelper
1515
{
1616
// constellation is a set of categories, they are defined in __meta.json files inside category directories
17-
static readonly ICollection<string> KnownConstellations = new HashSet<string> { "export", "misc", "ui", "ui.widgets", "ui.editors", "ui.htmlEditor", "ui.grid", "ui.scheduler", "viz", "perf", "ai_integration" };
17+
static readonly ICollection<string> KnownConstellations = new HashSet<string> { "export", "misc", "ui", "ui.widgets", "ui.editors", "ui.htmlEditor", "ui.grid", "ui.scheduler", "viz" };
1818

1919
UrlHelper UrlHelper;
2020
string TestsRootPath;

0 commit comments

Comments
 (0)