diff --git a/testCafe/designer/add-new-question.ts b/functionalTests/designer/add-new-question.ts similarity index 100% rename from testCafe/designer/add-new-question.ts rename to functionalTests/designer/add-new-question.ts diff --git a/testCafe/designer/change-survey-locale.ts b/functionalTests/designer/change-survey-locale.ts similarity index 100% rename from testCafe/designer/change-survey-locale.ts rename to functionalTests/designer/change-survey-locale.ts diff --git a/testCafe/designer/clear-survey.ts b/functionalTests/designer/clear-survey.ts similarity index 100% rename from testCafe/designer/clear-survey.ts rename to functionalTests/designer/clear-survey.ts diff --git a/testCafe/designer/creator.ts b/functionalTests/designer/creator.ts similarity index 100% rename from testCafe/designer/creator.ts rename to functionalTests/designer/creator.ts diff --git a/testCafe/designer/delete-by-key.ts b/functionalTests/designer/delete-by-key.ts similarity index 100% rename from testCafe/designer/delete-by-key.ts rename to functionalTests/designer/delete-by-key.ts diff --git a/testCafe/designer/drag-drop.ts b/functionalTests/designer/drag-drop.ts similarity index 100% rename from testCafe/designer/drag-drop.ts rename to functionalTests/designer/drag-drop.ts diff --git a/testCafe/designer/empty-survey-json.ts b/functionalTests/designer/empty-survey-json.ts similarity index 100% rename from testCafe/designer/empty-survey-json.ts rename to functionalTests/designer/empty-survey-json.ts diff --git a/testCafe/designer/hovers.ts b/functionalTests/designer/hovers.ts similarity index 100% rename from testCafe/designer/hovers.ts rename to functionalTests/designer/hovers.ts diff --git a/testCafe/designer/image.jpg b/functionalTests/designer/image.jpg similarity index 100% rename from testCafe/designer/image.jpg rename to functionalTests/designer/image.jpg diff --git a/testCafe/designer/inplace-editors.ts b/functionalTests/designer/inplace-editors.ts similarity index 100% rename from testCafe/designer/inplace-editors.ts rename to functionalTests/designer/inplace-editors.ts diff --git a/testCafe/designer/localization.ts b/functionalTests/designer/localization.ts similarity index 100% rename from testCafe/designer/localization.ts rename to functionalTests/designer/localization.ts diff --git a/testCafe/designer/logic.ts b/functionalTests/designer/logic.ts similarity index 100% rename from testCafe/designer/logic.ts rename to functionalTests/designer/logic.ts diff --git a/testCafe/designer/logo-image.ts b/functionalTests/designer/logo-image.ts similarity index 100% rename from testCafe/designer/logo-image.ts rename to functionalTests/designer/logo-image.ts diff --git a/testCafe/designer/page-edit-modes.ts b/functionalTests/designer/page-edit-modes.ts similarity index 100% rename from testCafe/designer/page-edit-modes.ts rename to functionalTests/designer/page-edit-modes.ts diff --git a/testCafe/designer/page-navigator.ts b/functionalTests/designer/page-navigator.ts similarity index 100% rename from testCafe/designer/page-navigator.ts rename to functionalTests/designer/page-navigator.ts diff --git a/testCafe/designer/page-title.ts b/functionalTests/designer/page-title.ts similarity index 100% rename from testCafe/designer/page-title.ts rename to functionalTests/designer/page-title.ts diff --git a/testCafe/designer/question-converter.ts b/functionalTests/designer/question-converter.ts similarity index 100% rename from testCafe/designer/question-converter.ts rename to functionalTests/designer/question-converter.ts diff --git a/testCafe/designer/question-wrapper.ts b/functionalTests/designer/question-wrapper.ts similarity index 100% rename from testCafe/designer/question-wrapper.ts rename to functionalTests/designer/question-wrapper.ts diff --git a/testCafe/designer/responsiveness.ts b/functionalTests/designer/responsiveness.ts similarity index 100% rename from testCafe/designer/responsiveness.ts rename to functionalTests/designer/responsiveness.ts diff --git a/testCafe/designer/select-context.ts b/functionalTests/designer/select-context.ts similarity index 100% rename from testCafe/designer/select-context.ts rename to functionalTests/designer/select-context.ts diff --git a/testCafe/designer/side-bar.ts b/functionalTests/designer/side-bar.ts similarity index 100% rename from testCafe/designer/side-bar.ts rename to functionalTests/designer/side-bar.ts diff --git a/testCafe/designer/string-editor.ts b/functionalTests/designer/string-editor.ts similarity index 100% rename from testCafe/designer/string-editor.ts rename to functionalTests/designer/string-editor.ts diff --git a/testCafe/designer/surface.ts b/functionalTests/designer/surface.ts similarity index 100% rename from testCafe/designer/surface.ts rename to functionalTests/designer/surface.ts diff --git a/testCafe/designer/survey-description.ts b/functionalTests/designer/survey-description.ts similarity index 100% rename from testCafe/designer/survey-description.ts rename to functionalTests/designer/survey-description.ts diff --git a/testCafe/designer/survey-width.ts b/functionalTests/designer/survey-width.ts similarity index 100% rename from testCafe/designer/survey-width.ts rename to functionalTests/designer/survey-width.ts diff --git a/testCafe/designer/toolbox.ts b/functionalTests/designer/toolbox.ts similarity index 100% rename from testCafe/designer/toolbox.ts rename to functionalTests/designer/toolbox.ts diff --git a/testCafe/designer/translation.ts b/functionalTests/designer/translation.ts similarity index 100% rename from testCafe/designer/translation.ts rename to functionalTests/designer/translation.ts diff --git a/testCafe/designer/widget.ts b/functionalTests/designer/widget.ts similarity index 100% rename from testCafe/designer/widget.ts rename to functionalTests/designer/widget.ts diff --git a/testCafe/embed/embed.ts b/functionalTests/embed/embed.ts similarity index 100% rename from testCafe/embed/embed.ts rename to functionalTests/embed/embed.ts diff --git a/testCafe/helper.ts b/functionalTests/helper.ts similarity index 100% rename from testCafe/helper.ts rename to functionalTests/helper.ts diff --git a/testCafe/json/json.ts b/functionalTests/json/json.ts similarity index 100% rename from testCafe/json/json.ts rename to functionalTests/json/json.ts diff --git a/testCafe/preview/simulator.ts b/functionalTests/preview/simulator.ts similarity index 100% rename from testCafe/preview/simulator.ts rename to functionalTests/preview/simulator.ts diff --git a/testCafe/preview/survey-results.ts b/functionalTests/preview/survey-results.ts similarity index 100% rename from testCafe/preview/survey-results.ts rename to functionalTests/preview/survey-results.ts diff --git a/testCafe/preview/survey.ts b/functionalTests/preview/survey.ts similarity index 100% rename from testCafe/preview/survey.ts rename to functionalTests/preview/survey.ts diff --git a/testCafe/preview/theme-switcher.ts b/functionalTests/preview/theme-switcher.ts similarity index 100% rename from testCafe/preview/theme-switcher.ts rename to functionalTests/preview/theme-switcher.ts diff --git a/testCafe/preview/toolbar.ts b/functionalTests/preview/toolbar.ts similarity index 100% rename from testCafe/preview/toolbar.ts rename to functionalTests/preview/toolbar.ts diff --git a/testCafe/property-grid/choices.ts b/functionalTests/property-grid/choices.ts similarity index 100% rename from testCafe/property-grid/choices.ts rename to functionalTests/property-grid/choices.ts diff --git a/testCafe/property-grid/custom-questions.ts b/functionalTests/property-grid/custom-questions.ts similarity index 100% rename from testCafe/property-grid/custom-questions.ts rename to functionalTests/property-grid/custom-questions.ts diff --git a/testCafe/property-grid/data.ts b/functionalTests/property-grid/data.ts similarity index 100% rename from testCafe/property-grid/data.ts rename to functionalTests/property-grid/data.ts diff --git a/testCafe/property-grid/localization.ts b/functionalTests/property-grid/localization.ts similarity index 100% rename from testCafe/property-grid/localization.ts rename to functionalTests/property-grid/localization.ts diff --git a/testCafe/property-grid/panels.ts b/functionalTests/property-grid/panels.ts similarity index 100% rename from testCafe/property-grid/panels.ts rename to functionalTests/property-grid/panels.ts diff --git a/testCafe/property-grid/question.ts b/functionalTests/property-grid/question.ts similarity index 100% rename from testCafe/property-grid/question.ts rename to functionalTests/property-grid/question.ts diff --git a/testCafe/property-grid/spinedit.ts b/functionalTests/property-grid/spinedit.ts similarity index 100% rename from testCafe/property-grid/spinedit.ts rename to functionalTests/property-grid/spinedit.ts diff --git a/testCafe/property-grid/survey.ts b/functionalTests/property-grid/survey.ts similarity index 100% rename from testCafe/property-grid/survey.ts rename to functionalTests/property-grid/survey.ts diff --git a/testCafe/theme/theme.ts b/functionalTests/theme/theme.ts similarity index 100% rename from testCafe/theme/theme.ts rename to functionalTests/theme/theme.ts diff --git a/package.json b/package.json index f9bb85827c..5d61edbb18 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "version": "0.0.1", "scripts": { "dev": "concurrently \"npm run dev --prefix ../survey-library\" \"http-server -p 7777 --silent\" \"npm run watch:dev --prefix packages/survey-creator-core\" \"npm run watch:prod --prefix packages/survey-creator-core\" \"npm run watch:dev --prefix packages/survey-creator-knockout\" \"npm run watch:prod --prefix packages/survey-creator-knockout\" \"npm run watch:dev --prefix packages/survey-creator-react\" \"npm run watch:prod --prefix packages/survey-creator-react\" ", - "lint": "eslint ./packages --quiet && eslint ./testCafe --quiet && eslint ./visualRegressionTests --quiet", + "lint": "eslint ./packages --quiet && eslint ./functionalTests --quiet && eslint ./visualRegressionTests --quiet", "pre-push-check": "npm run lint", "prepare": "husky install" }, diff --git a/packages/survey-creator-angular/package.json b/packages/survey-creator-angular/package.json index 9dc5cdbe09..5350c88e11 100644 --- a/packages/survey-creator-angular/package.json +++ b/packages/survey-creator-angular/package.json @@ -72,8 +72,8 @@ "scripts": { "build": "ng build && node ./update-version.js", "serve:example": "ng serve", - "testcafe": "testcafe ../../testCafe/ --app \"http-server ./dist/angular-ui --proxy http://localhost:8080? -p 8080\" --selector-timeout 1500 --env=angular --config-file .testcaferc.dev.js", - "testcafe:ci": "testcafe ../../testCafe/ --app \"http-server ./dist/angular-ui --proxy http://localhost:8080? -p 8080\" --selector-timeout 1500 --reporter minimal --env=angular", + "testcafe": "testcafe ../../functionalTests/ --app \"http-server ./dist/angular-ui --proxy http://localhost:8080? -p 8080\" --selector-timeout 1500 --env=angular --config-file .testcaferc.dev.js", + "testcafe:ci": "testcafe ../../functionalTests/ --app \"http-server ./dist/angular-ui --proxy http://localhost:8080? -p 8080\" --selector-timeout 1500 --reporter minimal --env=angular", "serve:example:aot": "http-server ./dist/angular-ui --proxy http://localhost:8080? -p 8080", "build:example": "ng build angular-ui", "test": "ng test survey-creator-angular", @@ -82,4 +82,4 @@ "test:single": "ng test --watch=false --browsers=ChromeHeadless survey-creator-angular", "release": "standard-version --message \"Release: %s [azurepipelines skip]\" " } -} +} \ No newline at end of file diff --git a/packages/survey-creator-js/package.json b/packages/survey-creator-js/package.json index f8faad17ee..694bc2cea9 100644 --- a/packages/survey-creator-js/package.json +++ b/packages/survey-creator-js/package.json @@ -20,10 +20,10 @@ "test_debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand", "doc:gen": "node doc_generator/editor_docgenerator.js src/entries/index.ts", "doc:update": "chmod +x docupdate_npm.sh && ./docupdate_npm.sh", - "testcafe": "testcafe ../../testCafe/ --app \"http-server\" --selector-timeout 1500 --config-file .testcaferc.dev.js", - "testcafe:ci": "http-server --silent & testcafe ../../testCafe/ --selector-timeout 1500 --reporter minimal", - "testcafe:file": "concurrently \"http-server --silent\" \"testcafe ../../testCafe/designer/page-navigator.ts --reporter minimal --debug-mode --config-file .testcaferc.dev.js\"", - "testcafe:a11y": "concurrently \"http-server --silent\" \"testcafe ./testCafe/accessibility.js --selector-timeout 1500 --config-file .testcaferc.dev.js\"", + "testcafe": "testcafe ../../functionalTests/ --app \"http-server\" --selector-timeout 1500 --config-file .testcaferc.dev.js", + "testcafe:ci": "testcafe ../../functionalTests/ --app \"http-server --silent \" --selector-timeout 1500 --reporter minimal", + "testcafe:file": "testcafe ../../functionalTests/designer/page-navigator.ts --app \"http-server --silent \" --reporter minimal --debug-mode --config-file .testcaferc.dev.js", + "testcafe:a11y": "testcafe ./testCafe/accessibility.js --app \"http-server --silent \" --selector-timeout 1500 --config-file .testcaferc.dev.js", "testcafe:a11y:ci": "testcafe ./testCafe/accessibility.js --app \"http-server\" --selector-timeout 1500 --reporter minimal", "visual-regression-tests": "testcafe ../../visualRegressionTests/ --app \"http-server\" --screenshots ../../ --selector-timeout 1500 --reporter minimal --config-file .testcaferc.dev.js", "visual-regression-tests:ci": "testcafe ../../visualRegressionTests/ --app \"http-server\" --screenshots ../../ --selector-timeout 1500 --reporter minimal", @@ -89,4 +89,4 @@ "survey-creator-core": "../survey-creator-core/build", "survey-js-ui": "../../../survey-library/build/survey-js-ui" } -} +} \ No newline at end of file diff --git a/packages/survey-creator-knockout/package.json b/packages/survey-creator-knockout/package.json index ed870a9da6..f2bfc90502 100644 --- a/packages/survey-creator-knockout/package.json +++ b/packages/survey-creator-knockout/package.json @@ -19,11 +19,11 @@ "test_debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand", "doc:gen": "node doc_generator/editor_docgenerator.js src/entries/index.ts", "doc:update": "chmod +x docupdate_npm.sh && ./docupdate_npm.sh", - "testcafe": "concurrently \"http-server --silent\" \"testcafe ../../testCafe/ --selector-timeout 1500 --config-file .testcaferc.dev.js\"", - "testcafe:file": "concurrently \"http-server --silent\" \"testcafe ../../testCafe/designer/page-navigator.ts --reporter minimal --selector-timeout 1500 --debug-mode --config-file .testcaferc.dev.js\"", - "testcafe:a11y": "concurrently \"http-server --silent\" \"testcafe ./testCafe/accessibility.js --selector-timeout 1500 --config-file .testcaferc.dev.js\"", + "testcafe": "testcafe ../../functionalTests/ --app \"http-server\" --selector-timeout 1500 --config-file .testcaferc.dev.js", + "testcafe:file": "testcafe ../../functionalTests/designer/page-navigator.ts --app \"http-server --silent \" --reporter minimal --debug-mode --config-file .testcaferc.dev.js", + "testcafe:a11y": "testcafe ./testCafe/accessibility.js --app \"http-server --silent \" --selector-timeout 1500 --config-file .testcaferc.dev.js", "testcafe:a11y:ci": "testcafe ./testCafe/accessibility.js --app \"http-server\" --selector-timeout 1500 --reporter minimal", - "testcafe:ci": "http-server --silent & testcafe ../../testCafe/ --selector-timeout 1500 --reporter minimal", + "testcafe:ci": "testcafe ../../functionalTests/ --app \"http-server --silent \" --selector-timeout 1500 --reporter minimal", "visual-regression-tests": "testcafe ../../visualRegressionTests/ --app \"http-server\" --screenshots ../../ --selector-timeout 1500 --reporter minimal --config-file .testcaferc.dev.js", "visual-regression-tests:ci": "testcafe - ../../visualRegressionTests/ --app \"http-server\" --screenshots ../../ --selector-timeout 1500 --reporter minimal", "visual-regression-tests:file": "testcafe --app \"http-server\" ../../visualRegressionTests/tests/designer/pg-choices.ts --screenshots ../../ --reporter minimal --selector-timeout 1500 --config-file .testcaferc.dev.js", @@ -93,4 +93,4 @@ "tag": true } } -} +} \ No newline at end of file diff --git a/packages/survey-creator-react/package.json b/packages/survey-creator-react/package.json index 4306e0aa77..c2fa6d6271 100644 --- a/packages/survey-creator-react/package.json +++ b/packages/survey-creator-react/package.json @@ -19,10 +19,10 @@ "test_debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand", "doc:gen": "node doc_generator/editor_docgenerator.js src/entries/index.ts", "doc:update": "chmod +x docupdate_npm.sh && ./docupdate_npm.sh", - "testcafe": "concurrently \"http-server --silent\" \"testcafe ../../testCafe/ --selector-timeout 1500 --config-file .testcaferc.dev.js\"", - "testcafe:ci": "http-server --silent & testcafe ../../testCafe/ --selector-timeout 1500 --reporter minimal", - "testcafe:file": "concurrently \"http-server --silent\" \"testcafe ../../testCafe/designer/page-navigator.ts --reporter minimal --debug-mode --config-file .testcaferc.dev.js\"", - "testcafe:a11y": "concurrently \"http-server --silent\" \"testcafe ./testCafe/accessibility.js --selector-timeout 1500 --config-file .testcaferc.dev.js\"", + "testcafe": "testcafe ../../functionalTests/ --app \"http-server\" --selector-timeout 1500 --config-file .testcaferc.dev.js", + "testcafe:ci": "testcafe ../../functionalTests/ --app \"http-server --silent \" --selector-timeout 1500 --reporter minimal", + "testcafe:file": "testcafe ../../functionalTests/designer/page-navigator.ts --app \"http-server --silent \" --reporter minimal --debug-mode --config-file .testcaferc.dev.js", + "testcafe:a11y": "testcafe ./testCafe/accessibility.js --app \"http-server --silent\" --selector-timeout 1500 --config-file .testcaferc.dev.js", "testcafe:a11y:ci": "testcafe ./testCafe/accessibility.js --app \"http-server\" --selector-timeout 1500 --reporter minimal", "visual-regression-tests": "testcafe ../../visualRegressionTests/ --app \"http-server\" --screenshots ../../ --selector-timeout 1500 --reporter minimal --config-file .testcaferc.dev.js", "visual-regression-tests:ci": "testcafe ../../visualRegressionTests/ --app \"http-server\" --screenshots ../../ --selector-timeout 1500 --reporter minimal", @@ -97,4 +97,4 @@ "tag": true } } -} +} \ No newline at end of file diff --git a/packages/survey-creator-vue/package.json b/packages/survey-creator-vue/package.json index 77a6d5aad2..125b69c85a 100644 --- a/packages/survey-creator-vue/package.json +++ b/packages/survey-creator-vue/package.json @@ -21,8 +21,8 @@ "lint": "eslint ./src --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore", "visual-regression-tests:ci": "testcafe --disable-font-subpixel-positioning ../../visualRegressionTests/ --app \"npm run serve:example:prod\" --screenshots ../../ --selector-timeout 1500 --reporter minimal", "visual-regression-tests": "testcafe ../../visualRegressionTests/ --app \"npm run serve:example:prod\" --screenshots ../../ --selector-timeout 1500 --config-file .testcaferc.dev.js", - "testcafe:ci": "testcafe ../../testCafe/ --app \"npm run serve:example:prod\" --selector-timeout 1500 --reporter minimal", - "testcafe": "testcafe ../../testCafe/ --app \"npm run serve:example:prod\" --selector-timeout 1500 --config-file .testcaferc.dev.js" + "testcafe:ci": "testcafe ../../functionalTests/ --app \"npm run serve:example:prod\" --selector-timeout 1500 --reporter minimal", + "testcafe": "testcafe ../../functionalTests/ --app \"npm run serve:example:prod\" --selector-timeout 1500 --config-file .testcaferc.dev.js" }, "devDependencies": { "testcafe": "3.3.0", @@ -52,4 +52,4 @@ "vue-tsc": "^1.0.8", "puppeteer": "23.5.3" } -} +} \ No newline at end of file diff --git a/visualRegressionTests/helper.ts b/visualRegressionTests/helper.ts index fb6f21ea74..ae7fed2621 100644 --- a/visualRegressionTests/helper.ts +++ b/visualRegressionTests/helper.ts @@ -1,6 +1,6 @@ import { createScreenshotsComparer, ScreenshotsComparer } from "devextreme-screenshot-comparer"; import { ClientFunction, Selector } from "testcafe"; -export * from "../testCafe/helper"; +export * from "../functionalTests/helper"; export const getSurveyJSFramework = ClientFunction(() => { return window["surveyJSFramework"];