From 46437dc4cee08b330b0614221e48b7542c567cdc Mon Sep 17 00:00:00 2001 From: Maryna Dolhalova <72726250+nallikaea@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:55:06 +0200 Subject: [PATCH] Revert "create new automated test for verification of the Workspace using parent (#22506)" This reverts commit 8a0bacc6a16529122e027d3008294d06cba24bf6. --- tests/e2e/package-lock.json | 374 ++++++++++++------ tests/e2e/package.json | 119 +++--- .../miscellaneous/WorkpaseUsingParent.spec.ts | 99 ----- .../e2e/tests-library/ProjectAndFileTests.ts | 19 - 4 files changed, 321 insertions(+), 290 deletions(-) delete mode 100644 tests/e2e/specs/miscellaneous/WorkpaseUsingParent.spec.ts diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json index dfe194182f9..baf6ebb1681 100644 --- a/tests/e2e/package-lock.json +++ b/tests/e2e/package-lock.json @@ -36,14 +36,14 @@ "eslint-plugin-prettier": "^5.0.0", "husky": "^8.0.3", "mocha": "^9.1.3", - "monaco-page-objects": "3.9.1", + "monaco-page-objects": "3.1.0", "prettier": "^3.0.2", "rimraf": "2.6.2", - "selenium-webdriver": "4.6.1", + "selenium-webdriver": "4.4.0", "shelljs": "^0.8.5", "ts-node": "^10.9.1", "typescript": "4.9.4", - "vscode-extension-tester-locators": "3.7.1", + "vscode-extension-tester-locators": "3.1.0", "yaml": "^2.2.2" } }, @@ -1725,20 +1725,17 @@ } }, "node_modules/clipboardy": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-3.0.0.tgz", - "integrity": "sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", + "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==", "dev": true, "dependencies": { - "arch": "^2.2.0", - "execa": "^5.1.1", - "is-wsl": "^2.2.0" + "arch": "^2.1.1", + "execa": "^1.0.0", + "is-wsl": "^2.1.1" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=8" } }, "node_modules/cliui": { @@ -2372,80 +2369,100 @@ } }, "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "engines": { - "node": ">=10" + "node": ">=6" + } + }, + "node_modules/execa/node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" + "engines": { + "node": ">=4.8" } }, "node_modules/execa/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, - "engines": { - "node": ">=10" + "dependencies": { + "pump": "^3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=6" } }, - "node_modules/execa/node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "node_modules/execa/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", "dev": true, "engines": { - "node": ">=10.17.0" + "node": ">=4" } }, - "node_modules/execa/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "node_modules/execa/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, - "engines": { - "node": ">=6" + "bin": { + "semver": "bin/semver" } }, - "node_modules/execa/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "node_modules/execa/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", "dev": true, "dependencies": { - "mimic-fn": "^2.1.0" + "shebang-regex": "^1.0.0" }, "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=0.10.0" } }, - "node_modules/execa/node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "node_modules/execa/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", "dev": true, "engines": { - "node": ">=6" + "node": ">=0.10.0" + } + }, + "node_modules/execa/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" } }, "node_modules/extend": { @@ -3245,15 +3262,12 @@ } }, "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", "dev": true, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=0.10.0" } }, "node_modules/is-typedarray": { @@ -3760,34 +3774,48 @@ } }, "node_modules/monaco-page-objects": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/monaco-page-objects/-/monaco-page-objects-3.9.1.tgz", - "integrity": "sha512-Y/haEkl0U5MPH2krk6hyOpSqUdzqY9VIW4NPz48i6QHP1hSCInW2ffXl1zisStv0vBWBrDr8hu5n6Q1i7z99PQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/monaco-page-objects/-/monaco-page-objects-3.1.0.tgz", + "integrity": "sha512-B0ylDy9UcCeOkYHoWziimJDcBzgWPJHBrjYzKtBMjEw++Oo3eFJ00RN1XDjgzW6o7+wlG25M/atJ9010QfLoFw==", "dev": true, "dependencies": { - "clipboardy": "^3.0.0", + "clipboardy": "^2.3.0", "clone-deep": "^4.0.1", - "compare-versions": "^6.1.0", - "fs-extra": "^11.1.1", - "ts-essentials": "^9.3.2" + "compare-versions": "^3.5.1", + "fs-extra": "^10.0.0", + "ts-essentials": "^8.0.0" }, "peerDependencies": { - "selenium-webdriver": "^4.6.1", - "typescript": ">=4.6.2" + "selenium-webdriver": "^4.2.0" } }, - "node_modules/monaco-page-objects/node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "node_modules/monaco-page-objects/node_modules/compare-versions": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", + "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", + "dev": true + }, + "node_modules/monaco-page-objects/node_modules/ts-essentials": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-8.1.0.tgz", + "integrity": "sha512-34xALeQADWRYq9kbtprP4KdpTQ3v3BBIs/U4SpaP+C4++B8ijXY5NnILRJLchQVMzw7YBzKuGMUMrI9uT+ALVw==", "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" + "peerDependencies": { + "typescript": ">=4.0.0" + } + }, + "node_modules/monaco-page-objects/node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "dev": true, + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.14" + "node": ">=14.17" } }, "node_modules/ms": { @@ -3814,6 +3842,12 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -3824,15 +3858,24 @@ } }, "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", "dev": true, "dependencies": { - "path-key": "^3.0.0" + "path-key": "^2.0.0" }, "engines": { - "node": ">=8" + "node": ">=4" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "dev": true, + "engines": { + "node": ">=4" } }, "node_modules/oauth-sign": { @@ -3921,6 +3964,15 @@ "node": ">=0.10.0" } }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -4366,6 +4418,107 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/run-applescript/node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/run-applescript/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/run-applescript/node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/run-applescript/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/run-applescript/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/run-applescript/node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/run-applescript/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/run-applescript/node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4416,9 +4569,9 @@ "dev": true }, "node_modules/selenium-webdriver": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.6.1.tgz", - "integrity": "sha512-FT8Dw0tbzaTp8YYLuwhaCnve/nw03HKrOJrA3aUmTKmxaIFSP4kT2R5fN3K0RpV5kbR0ZnM4FGVI2vANBvekaA==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.4.0.tgz", + "integrity": "sha512-Du+/xfpvNi9zHAeYgXhOWN9yH0hph+cuX+hHDBr7d+SbtQVcfNJwBzLsbdHrB1Wh7MHXFuIkSG88A9TRRQUx3g==", "dev": true, "dependencies": { "jszip": "^3.10.0", @@ -4426,7 +4579,7 @@ "ws": ">=8.7.0" }, "engines": { - "node": ">= 14.20.0" + "node": ">= 10.15.0" } }, "node_modules/semver": { @@ -4637,6 +4790,15 @@ "node": ">=8" } }, + "node_modules/strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/strip-final-newline": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", @@ -4816,20 +4978,6 @@ "node": ">=0.10.0" } }, - "node_modules/ts-essentials": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-9.4.0.tgz", - "integrity": "sha512-s4BzWZmTh926caZO7XF7MMbwCn1BioT3s3r9hT8ARnwW//30OD0XioEsMyq3ORAHP/deN4Zkst2ZvxXmL+tG6g==", - "dev": true, - "peerDependencies": { - "typescript": ">=4.1.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/ts-node": { "version": "10.9.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", @@ -5213,13 +5361,13 @@ "dev": true }, "node_modules/vscode-extension-tester-locators": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/vscode-extension-tester-locators/-/vscode-extension-tester-locators-3.7.1.tgz", - "integrity": "sha512-My+ZTH2PM0g9JwWw49E+SfBMFLSjBdv6YpjekUFpzhCWK0mH+BjRC0gtINr+x2+KuVZVhsO82oSivBa1d7ZJvg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-extension-tester-locators/-/vscode-extension-tester-locators-3.1.0.tgz", + "integrity": "sha512-Q4gfJHnA1Kf6W0UOSE16jvPB+hk0aQ1r9b9bjM311r30hsdHkzBpAYw58YS8ZfzB7AgA4Jum/SM9q4WM2fwedg==", "dev": true, "peerDependencies": { - "monaco-page-objects": "^3.9.1", - "selenium-webdriver": "^4.6.1" + "monaco-page-objects": "^3.1.0", + "selenium-webdriver": "^4.2.0" } }, "node_modules/which": { diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 100d8ee89ae..cdaf154e15b 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -1,61 +1,62 @@ { - "name": "@eclipse-che/che-e2e", - "version": "7.73.0-SNAPSHOT", - "description": "", - "main": "dist/index.js", - "scripts": { - "lint": "eslint --fix .", - "prettier": "prettier --config .prettierrc.json . --write", - "tsc": "rm -rf ./dist && ./configs/sh-scripts/generateIndex.sh && tsc -p .", - "test": "./configs/sh-scripts/initDefaultValues.sh npm run lint && npm run tsc && export USERSTORY=$USERSTORY && mocha --config dist/configs/mocharc.js", - "driver-less-test": "export TS_USE_WEB_DRIVER_FOR_TEST=false && npm run test", - "cleanup-docker": "if [ $(docker ps -a | grep -c selenium-e2e) -gt 0 ]; then docker rm -f $(docker ps --filter \"name=selenium-e2e\" -aq); fi;", - "test-docker": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL eclipse/che-e2e:nightly", - "test-docker-mount-e2e": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL -v $(pwd):/tmp/e2e:Z eclipse/che-e2e:nightly", - "test-all-devfiles": " ./configs/sh-scripts/initDefaultValues.sh && ./configs/sh-scripts/initDevfileTests.sh", - "devfile-acceptance-test-suite": "./configs/sh-scripts/initDefaultValues.sh npm run lint && npm run tsc && export TS_USE_WEB_DRIVER_FOR_TEST=false && mocha 'dist/specs/api/*.js' --config dist/configs/mocharc.js --delay --grep 'Devfile acceptance test suite'" - }, - "author": "Ihor Okhrimenko (iokhrime@redhat.com)", - "license": "ISC", - "devDependencies": { - "@eclipse-che/che-devworkspace-generator": "next", - "@types/chai": "^4.3.4", - "@types/clone-deep": "^4.0.1", - "@types/mocha": "5.2.6", - "@types/node": "11.13.4", - "@types/rimraf": "2.0.2", - "@types/selenium-webdriver": "4.1.3", - "@types/shelljs": "^0.8.11", - "@typescript-eslint/eslint-plugin": "^6.4.1", - "@typescript-eslint/eslint-plugin-tslint": "^6.1.0", - "@typescript-eslint/parser": "^6.1.0", - "axios": "^0.25.0", - "chai": "^4.3.4", - "chromedriver": "^114.0.2", - "clone-deep": "^4.0.1", - "eslint": "^8.45.0", - "eslint-config-prettier": "^8.10.0", - "eslint-plugin-header": "^3.1.1", - "eslint-plugin-jsdoc": "^46.5.0", - "eslint-plugin-prettier": "^5.0.0", - "husky": "^8.0.3", - "mocha": "^9.1.3", - "monaco-page-objects": "3.9.1", - "prettier": "^3.0.2", - "rimraf": "2.6.2", - "selenium-webdriver": "4.6.1", - "shelljs": "^0.8.5", - "ts-node": "^10.9.1", - "typescript": "4.9.4", - "vscode-extension-tester-locators": "3.7.1", - "yaml": "^2.2.2" - }, - "dependencies": { - "@eclipse-che/api": "latest", - "inversify": "6.0.1", - "reflect-metadata": "0.1.13" - }, - "resolutions": { - "minimist": "^1.2.5" - } + "name": "@eclipse-che/che-e2e", + "version": "7.75.0-SNAPSHOT", + "description": "", + "main": "dist/index.js", + "scripts": { + "lint": "eslint --fix .", + "prettier": "prettier --config .prettierrc.json . --write", + "tsc": "rm -rf ./dist && ./configs/sh-scripts/generateIndex.sh && tsc -p .", + "test": "./configs/sh-scripts/initDefaultValues.sh npm run lint && npm run tsc && export USERSTORY=$USERSTORY && mocha --config dist/configs/mocharc.js", + "driver-less-test": "export TS_USE_WEB_DRIVER_FOR_TEST=false && npm run test", + "cleanup-docker": "if [ $(docker ps -a | grep -c selenium-e2e) -gt 0 ]; then docker rm -f $(docker ps --filter \"name=selenium-e2e\" -aq); fi;", + "test-docker": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL eclipse/che-e2e:nightly", + "test-docker-mount-e2e": "npm run cleanup-docker && docker run -it --shm-size=2g -p 5920:5920 --name selenium-e2e -e TS_SELENIUM_BASE_URL=$TS_SELENIUM_BASE_URL -v $(pwd):/tmp/e2e:Z eclipse/che-e2e:nightly", + "test-all-devfiles": " ./configs/sh-scripts/initDefaultValues.sh && ./configs/sh-scripts/initDevfileTests.sh", + "devfile-acceptance-test-suite": "./configs/sh-scripts/initDefaultValues.sh npm run lint && npm run tsc && export TS_USE_WEB_DRIVER_FOR_TEST=false && mocha 'dist/specs/api/*.js' --config dist/configs/mocharc.js --delay --grep 'Devfile acceptance test suite'" + }, + "author": "Ihor Okhrimenko (iokhrime@redhat.com)", + "license": "ISC", + "devDependencies": { + "@eclipse-che/che-devworkspace-generator": "next", + "@types/chai": "^4.3.4", + "@types/clone-deep": "^4.0.1", + "@types/mocha": "5.2.6", + "@types/node": "11.13.4", + "@types/rimraf": "2.0.2", + "@types/selenium-webdriver": "4.1.3", + "@types/shelljs": "^0.8.11", + "@typescript-eslint/eslint-plugin": "^6.4.1", + "@typescript-eslint/eslint-plugin-tslint": "^6.1.0", + "@typescript-eslint/parser": "^6.1.0", + "axios": "^0.25.0", + "chai": "^4.3.4", + "chromedriver": "^114.0.2", + "clone-deep": "^4.0.1", + "eslint": "^8.45.0", + "eslint-config-prettier": "^8.10.0", + "eslint-plugin-header": "^3.1.1", + "eslint-plugin-jsdoc": "^46.5.0", + "eslint-plugin-prettier": "^5.0.0", + "husky": "^8.0.3", + "mocha": "^9.1.3", + "monaco-page-objects": "3.1.0", + "prettier": "^3.0.2", + "rimraf": "2.6.2", + "selenium-webdriver": "4.4.0", + "shelljs": "^0.8.5", + "ts-node": "^10.9.1", + "typescript": "4.9.4", + "vscode-extension-tester-locators": "3.1.0", + "yaml": "^2.2.2" + }, + "dependencies": { + "@eclipse-che/api": "latest", + "inversify": "6.0.1", + "reflect-metadata": "0.1.13", + "@eclipse-che/che-devworkspace-generator": "7.75.0-SNAPSHOT" + }, + "resolutions": { + "minimist": "^1.2.5" + } } diff --git a/tests/e2e/specs/miscellaneous/WorkpaseUsingParent.spec.ts b/tests/e2e/specs/miscellaneous/WorkpaseUsingParent.spec.ts deleted file mode 100644 index 5b034919afd..00000000000 --- a/tests/e2e/specs/miscellaneous/WorkpaseUsingParent.spec.ts +++ /dev/null @@ -1,99 +0,0 @@ -/** ******************************************************************* - * copyright (c) 2023 Red Hat, Inc. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - **********************************************************************/ -import { e2eContainer } from '../../configs/inversify.config'; -import { ShellExecutor } from '../../utils/ShellExecutor'; -import { InputBox, QuickOpenBox, QuickPickItem, SideBarView, ViewItem, ViewSection, Workbench } from 'monaco-page-objects'; -import { CLASSES } from '../../configs/inversify.types'; -import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests'; -import { LoginTests } from '../../tests-library/LoginTests'; -import { Dashboard } from '../../pageobjects/dashboard/Dashboard'; -import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil'; -import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS'; -import { assert, expect } from 'chai'; -import { API_TEST_CONSTANTS } from '../../constants/API_TEST_CONSTANTS'; -import { ShellString } from 'shelljs'; -import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests'; -import { registerRunningWorkspace } from '../MochaHooks'; -const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests); -const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests); -const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil); -const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard); -const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor); -const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests); -function executeArbitraryShellScript(command: string): string { - const output: ShellString = shellExecutor.executeCommand(command); - if (output.stderr.length > 0) { - assert.fail(output.stderr); - } - return output.stdout; -} -suite('Workspace using a parent test suite', function (): void { - loginTests.loginIntoChe(); - let podName: string = ''; - - test('Create a workspace using a parent', async function (): Promise { - const factoryUrl: string = `${BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/dashboard/#https://github.com/testsfactory/parentDevfile`; - await dashboard.waitPage(); - await browserTabsUtil.navigateTo(factoryUrl); - await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage(); - registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName()); - await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor(); - // sometimes the trust dialog does not appear at first time, for avoiding this problem we send click event for activating - await new Workbench().click(); - await projectAndFileTests.performTrustAuthorDialog(); - }); - - test('Check cloning of the test project', async function (): Promise { - const expectedProjectItems: string[] = ['.devfile.yaml', 'parent.yaml', 'README.md']; - const visibleContent: ViewSection = await new SideBarView().getContent().getSection('parentdevfile'); - - for (const expectedProjectItem of expectedProjectItems) { - const visibleItem: ViewItem | undefined = await visibleContent.findItem(expectedProjectItem); - expect(visibleItem).not.equal(undefined); - } - }); - - test('Check devfile VS Code tasks ', async function (): Promise { - const input: QuickOpenBox | InputBox = await new Workbench().openCommandPrompt(); - await input.setText('>Tasks: Run Task'); - const runTaskItem: QuickPickItem | undefined = await input.findQuickPick('Tasks: Run Task'); - await runTaskItem?.click(); - const devFileTask: QuickPickItem | undefined = await input.findQuickPick('devfile'); - await devFileTask?.click(); - const firstExpectedQuickPick: QuickPickItem | undefined = await input.findQuickPick('1. This command from the devfile'); - const secondExpectedQuickPick: QuickPickItem | undefined = await input.findQuickPick('2. This command from the parent'); - expect(firstExpectedQuickPick).not.eqls(undefined); - expect(secondExpectedQuickPick).not.eqls(undefined); - }); - - test('Check expected containers in the parent POD', function (): void { - const getPodNameCommand: string = `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`; - - podName = executeArbitraryShellScript(getPodNameCommand); - const containerNames: string = executeArbitraryShellScript( - `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'` - ); - expect(containerNames).contain('tools'); - expect(containerNames).contains('che-gateway'); - - const initContainerName: string = executeArbitraryShellScript( - `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'` - ); - expect(initContainerName).contain('che-code-injector'); - }); - - test('Check expected environment variables', function (): void { - const envList: string = executeArbitraryShellScript( - `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env` - ); - expect(envList).contain('DEVFILE_ENV_VAR=true'); - expect(envList).contain('PARENT_ENV_VAR=true'); - }); -}); diff --git a/tests/e2e/tests-library/ProjectAndFileTests.ts b/tests/e2e/tests-library/ProjectAndFileTests.ts index 15cfb72f8db..18a911fbd4c 100644 --- a/tests/e2e/tests-library/ProjectAndFileTests.ts +++ b/tests/e2e/tests-library/ProjectAndFileTests.ts @@ -15,10 +15,6 @@ import { DriverHelper } from '../utils/DriverHelper'; import { CLASSES } from '../configs/inversify.types'; import { Logger } from '../utils/Logger'; import { TIMEOUT_CONSTANTS } from '../constants/TIMEOUT_CONSTANTS'; -import { Locators, ModalDialog } from 'monaco-page-objects'; -import { CheCodeLocatorLoader } from '../pageobjects/ide/CheCodeLocatorLoader'; - -const webCheCodeLocators: Locators = new CheCodeLocatorLoader().webCheCodeLocators; @injectable() export class ProjectAndFileTests { @@ -41,19 +37,4 @@ export class ProjectAndFileTests { throw err; } } - - async performTrustAuthorDialog(): Promise { - try { - const buttonYesITrustTheAuthors: string = 'Yes, I trust the authors'; - await this.driverHelper.waitVisibility( - webCheCodeLocators.WelcomeContent.button, - TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT - ); - const trustedProjectDialog: ModalDialog = new ModalDialog(); - Logger.debug(`trustedProjectDialog.pushButton: "${buttonYesITrustTheAuthors}"`); - await trustedProjectDialog.pushButton(buttonYesITrustTheAuthors); - } catch (e) { - Logger.debug(`Welcome modal dialog was not shown: ${e}`); - } - } }