chore: fix vscode-ui-e2e (nrwl#1374)

mandarini · Sep 29, 2022 · 21c5cc5 · 21c5cc5
1 parent 6ac520c
commit 21c5cc5
Show file tree

Hide file tree

Showing 83 changed files with 330 additions and 545 deletions.
diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml
@@ -21,7 +21,7 @@ jobs:
         yarn exec nx affected --target=lint --parallel=3 --configuration=ci
         yarn exec nx affected --target=test --parallel=3 --configuration=ci
         yarn exec nx affected --target=build --parallel=3 --configuration=ci
-        NX_RUN_GROUP=run-group-e2e-${{ github.run_id}}-${{ github.run_attempt }} yarn exec nx run vscode-e2e:e2e:ci
+        NX_RUN_GROUP=run-group-e2e-${{ github.run_id}}-${{ github.run_attempt }} yarn exec nx affected --target=e2e --parallel=3 --configuration=ci
       final-commands: |
         NX_RUN_GROUP=run-group-e2e-${{ github.run_id}}-${{ github.run_attempt }} npx nx-cloud stop-all-agents
 

diff --git a/.yarn/cache/@angular-cli-npm-14.1.3-62286d7637-ff2b279199.zip b/.yarn/cache/@angular-cli-npm-14.1.3-62286d7637-ff2b279199.zip
diff --git a/.yarn/cache/@cypress-listr-verbose-renderer-npm-0.4.1-87829e7b0f-0169c2b30f.zip b/.yarn/cache/@cypress-listr-verbose-renderer-npm-0.4.1-87829e7b0f-0169c2b30f.zip
diff --git a/.yarn/cache/@samverschueren-stream-to-observable-npm-0.3.1-aeb89f731e-8ec6d43370.zip b/.yarn/cache/@samverschueren-stream-to-observable-npm-0.3.1-aeb89f731e-8ec6d43370.zip
diff --git a/.yarn/cache/@types-node-npm-12.12.50-8ca8caf873-ae3b6ae1bf.zip b/.yarn/cache/@types-node-npm-12.12.50-8ca8caf873-ae3b6ae1bf.zip
diff --git a/.yarn/cache/@types-node-npm-14.18.31-4604e70753-df33021d67.zip b/.yarn/cache/@types-node-npm-14.18.31-4604e70753-df33021d67.zip
diff --git a/.yarn/cache/@types-sinonjs__fake-timers-npm-6.0.4-3cb530075c-200cb24235.zip b/.yarn/cache/@types-sinonjs__fake-timers-npm-6.0.4-3cb530075c-200cb24235.zip
diff --git a/.yarn/cache/@types-sinonjs__fake-timers-npm-8.1.1-95ac9b59b5-ca09d54d47.zip b/.yarn/cache/@types-sinonjs__fake-timers-npm-8.1.1-95ac9b59b5-ca09d54d47.zip
diff --git a/.yarn/cache/@yarnpkg-lockfile-npm-1.1.0-6e0da4acd2-05b881b486.zip b/.yarn/cache/@yarnpkg-lockfile-npm-1.1.0-6e0da4acd2-05b881b486.zip
diff --git a/.yarn/cache/ansi-escapes-npm-3.2.0-a9d573100e-0f94695b67.zip b/.yarn/cache/ansi-escapes-npm-3.2.0-a9d573100e-0f94695b67.zip
diff --git a/.yarn/cache/ansi-regex-npm-3.0.1-01f44078a3-09daf180c5.zip b/.yarn/cache/ansi-regex-npm-3.0.1-01f44078a3-09daf180c5.zip
diff --git a/.yarn/cache/any-observable-npm-0.3.0-4832f4f3ed-e715563ebb.zip b/.yarn/cache/any-observable-npm-0.3.0-4832f4f3ed-e715563ebb.zip
diff --git a/.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip b/.yarn/cache/astral-regex-npm-2.0.0-f30d866aab-876231688c.zip
diff --git a/.yarn/cache/cli-cursor-npm-1.0.2-180e5fc529-e3b4400d5e.zip b/.yarn/cache/cli-cursor-npm-1.0.2-180e5fc529-e3b4400d5e.zip
diff --git a/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip b/.yarn/cache/cli-cursor-npm-2.1.0-3920629c9c-d88e97bfda.zip
diff --git a/.yarn/cache/cli-truncate-npm-0.2.1-f053d59b0b-c2e4b8d952.zip b/.yarn/cache/cli-truncate-npm-0.2.1-f053d59b0b-c2e4b8d952.zip
diff --git a/.yarn/cache/cli-truncate-npm-2.1.0-72184d3467-bf1e4e6195.zip b/.yarn/cache/cli-truncate-npm-2.1.0-72184d3467-bf1e4e6195.zip
diff --git a/.yarn/cache/code-point-at-npm-1.1.0-37de5fe566-17d5666611.zip b/.yarn/cache/code-point-at-npm-1.1.0-37de5fe566-17d5666611.zip
diff --git a/.yarn/cache/cypress-npm-10.9.0-7807fe85fd-79e3dccbb8.zip b/.yarn/cache/cypress-npm-10.9.0-7807fe85fd-79e3dccbb8.zip
diff --git a/.yarn/cache/cypress-npm-6.5.0-99e7f9a559-621ce29a3b.zip b/.yarn/cache/cypress-npm-6.5.0-99e7f9a559-621ce29a3b.zip
diff --git a/.yarn/cache/date-fns-npm-1.30.1-b974a8f1e1-86b1f3269c.zip b/.yarn/cache/date-fns-npm-1.30.1-b974a8f1e1-86b1f3269c.zip
diff --git a/.yarn/cache/debug-npm-4.3.2-f0148b6afe-820ea160e2.zip b/.yarn/cache/debug-npm-4.3.2-f0148b6afe-820ea160e2.zip
diff --git a/.yarn/cache/elegant-spinner-npm-1.0.1-8b799f39a6-d6a773d950.zip b/.yarn/cache/elegant-spinner-npm-1.0.1-8b799f39a6-d6a773d950.zip
diff --git a/...tter2-npm-6.4.9-ba37798a18-be59577c1e.zip → ...tter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip b/...tter2-npm-6.4.9-ba37798a18-be59577c1e.zip → ...tter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip
diff --git a/.yarn/cache/exit-hook-npm-1.1.1-1b7c5d44e3-1b4f16da7c.zip b/.yarn/cache/exit-hook-npm-1.1.1-1b7c5d44e3-1b4f16da7c.zip
diff --git a/.yarn/cache/extract-zip-npm-1.7.0-1a60d4ee7c-011bab660d.zip b/.yarn/cache/extract-zip-npm-1.7.0-1a60d4ee7c-011bab660d.zip
diff --git a/.yarn/cache/figures-npm-1.7.0-1542644df9-d77206deba.zip b/.yarn/cache/figures-npm-1.7.0-1542644df9-d77206deba.zip
diff --git a/.yarn/cache/global-dirs-npm-3.0.0-45faebeb68-953c17cf14.zip b/.yarn/cache/global-dirs-npm-3.0.0-45faebeb68-953c17cf14.zip
diff --git a/.yarn/cache/ini-npm-2.0.0-28f7426761-e7aadc5fb2.zip b/.yarn/cache/ini-npm-2.0.0-28f7426761-e7aadc5fb2.zip
diff --git a/.yarn/cache/ini-npm-3.0.0-c2af955701-e92b6b0835.zip b/.yarn/cache/ini-npm-3.0.0-c2af955701-e92b6b0835.zip
diff --git a/.yarn/cache/is-ci-npm-3.0.1-d9aea361e1-192c66dc78.zip b/.yarn/cache/is-ci-npm-3.0.1-d9aea361e1-192c66dc78.zip
diff --git a/.yarn/cache/is-fullwidth-code-point-npm-1.0.0-0e436ba1ef-4d46a7465a.zip b/.yarn/cache/is-fullwidth-code-point-npm-1.0.0-0e436ba1ef-4d46a7465a.zip
diff --git a/.yarn/cache/is-fullwidth-code-point-npm-2.0.0-507f56ec71-eef9c6e15f.zip b/.yarn/cache/is-fullwidth-code-point-npm-2.0.0-507f56ec71-eef9c6e15f.zip
diff --git a/.yarn/cache/is-installed-globally-npm-0.4.0-a30dd056c7-3359840d59.zip b/.yarn/cache/is-installed-globally-npm-0.4.0-a30dd056c7-3359840d59.zip
diff --git a/.yarn/cache/is-observable-npm-1.1.0-fd19f68a6c-ab3d7e7409.zip b/.yarn/cache/is-observable-npm-1.1.0-fd19f68a6c-ab3d7e7409.zip
diff --git a/.yarn/cache/is-promise-npm-2.2.2-afbf94db67-18bf7d1c59.zip b/.yarn/cache/is-promise-npm-2.2.2-afbf94db67-18bf7d1c59.zip
diff --git a/.yarn/cache/listr-npm-0.14.3-f9030beb58-932d69430c.zip b/.yarn/cache/listr-npm-0.14.3-f9030beb58-932d69430c.zip
diff --git a/.yarn/cache/listr-silent-renderer-npm-1.1.1-01f9e73935-81982612e4.zip b/.yarn/cache/listr-silent-renderer-npm-1.1.1-01f9e73935-81982612e4.zip
diff --git a/.yarn/cache/listr-update-renderer-npm-0.5.0-3e539fc2df-2dddc76383.zip b/.yarn/cache/listr-update-renderer-npm-0.5.0-3e539fc2df-2dddc76383.zip
diff --git a/.yarn/cache/listr-verbose-renderer-npm-0.5.0-e15abcfcc9-3e504be729.zip b/.yarn/cache/listr-verbose-renderer-npm-0.5.0-e15abcfcc9-3e504be729.zip
diff --git a/.yarn/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip b/.yarn/cache/listr2-npm-3.14.0-446f504112-fdb8b2d6bd.zip
diff --git a/.yarn/cache/log-symbols-npm-1.0.2-2224ede6fd-5214ade938.zip b/.yarn/cache/log-symbols-npm-1.0.2-2224ede6fd-5214ade938.zip
diff --git a/.yarn/cache/log-update-npm-2.3.0-2ab0d1b479-84fd8e93bf.zip b/.yarn/cache/log-update-npm-2.3.0-2ab0d1b479-84fd8e93bf.zip
diff --git a/.yarn/cache/log-update-npm-4.0.0-9d0554261c-ae2f85bbab.zip b/.yarn/cache/log-update-npm-4.0.0-9d0554261c-ae2f85bbab.zip
diff --git a/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip b/.yarn/cache/mimic-fn-npm-1.2.0-960bf15ab7-69c0820515.zip
diff --git a/.yarn/cache/moment-npm-2.29.4-902943305d-0ec3f9c2bc.zip b/.yarn/cache/moment-npm-2.29.4-902943305d-0ec3f9c2bc.zip
diff --git a/.yarn/cache/npm-pick-manifest-npm-7.0.1-cd3bcc8dff-9a4a8e64d2.zip b/.yarn/cache/npm-pick-manifest-npm-7.0.1-cd3bcc8dff-9a4a8e64d2.zip
diff --git a/.yarn/cache/number-is-nan-npm-1.0.1-845325a0fe-13656bc9aa.zip b/.yarn/cache/number-is-nan-npm-1.0.1-845325a0fe-13656bc9aa.zip
diff --git a/.yarn/cache/onetime-npm-1.1.0-cd138fd743-4e9ab082ca.zip b/.yarn/cache/onetime-npm-1.1.0-cd138fd743-4e9ab082ca.zip
diff --git a/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip b/.yarn/cache/onetime-npm-2.0.1-6c39ecc911-bb44015ac7.zip
diff --git a/.yarn/cache/pacote-npm-13.6.1-5bb9ef467e-26cebb59ae.zip b/.yarn/cache/pacote-npm-13.6.1-5bb9ef467e-26cebb59ae.zip
diff --git a/.yarn/cache/proxy-from-env-npm-1.0.0-679b82b4ec-292e28d1de.zip b/.yarn/cache/proxy-from-env-npm-1.0.0-679b82b4ec-292e28d1de.zip
diff --git a/.yarn/cache/ramda-npm-0.26.1-2050f67102-19c2730e44.zip b/.yarn/cache/ramda-npm-0.26.1-2050f67102-19c2730e44.zip
diff --git a/.yarn/cache/restore-cursor-npm-1.0.1-a4b4ee9fa3-e40bd1a540.zip b/.yarn/cache/restore-cursor-npm-1.0.1-a4b4ee9fa3-e40bd1a540.zip
diff --git a/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip b/.yarn/cache/restore-cursor-npm-2.0.0-80278eb6b7-482e13d02d.zip
diff --git a/.yarn/cache/slice-ansi-npm-0.0.4-c4208829d1-481d969c6a.zip b/.yarn/cache/slice-ansi-npm-0.0.4-c4208829d1-481d969c6a.zip
diff --git a/.yarn/cache/slice-ansi-npm-3.0.0-d9999864af-5ec6d022d1.zip b/.yarn/cache/slice-ansi-npm-3.0.0-d9999864af-5ec6d022d1.zip
diff --git a/.yarn/cache/slice-ansi-npm-4.0.0-6eeca1d10e-4a82d7f085.zip b/.yarn/cache/slice-ansi-npm-4.0.0-6eeca1d10e-4a82d7f085.zip
diff --git a/.yarn/cache/string-width-npm-1.0.2-01031f9add-5c79439e95.zip b/.yarn/cache/string-width-npm-1.0.2-01031f9add-5c79439e95.zip
diff --git a/.yarn/cache/string-width-npm-2.1.1-0c2c6ae53f-d6173abe08.zip b/.yarn/cache/string-width-npm-2.1.1-0c2c6ae53f-d6173abe08.zip
diff --git a/.yarn/cache/strip-ansi-npm-4.0.0-d4de985014-d9186e6c0c.zip b/.yarn/cache/strip-ansi-npm-4.0.0-d4de985014-d9186e6c0c.zip
diff --git a/.yarn/cache/symbol-observable-npm-1.2.0-9e812a0a39-48ffbc22e3.zip b/.yarn/cache/symbol-observable-npm-1.2.0-9e812a0a39-48ffbc22e3.zip
diff --git a/.yarn/cache/symbol-observable-npm-4.0.0-5c36594410-212c7edce6.zip b/.yarn/cache/symbol-observable-npm-4.0.0-5c36594410-212c7edce6.zip
diff --git a/.yarn/cache/wrap-ansi-npm-3.0.1-876d294274-1ceed09986.zip b/.yarn/cache/wrap-ansi-npm-3.0.1-876d294274-1ceed09986.zip
diff --git a/.yarn/cache/wrap-ansi-npm-6.2.0-439a7246d8-6cd96a4101.zip b/.yarn/cache/wrap-ansi-npm-6.2.0-439a7246d8-6cd96a4101.zip
diff --git a/...re-task-execution-form-e2e/.eslintrc.json → apps/vscode-ui-e2e/.eslintrc.json b/...re-task-execution-form-e2e/.eslintrc.json → apps/vscode-ui-e2e/.eslintrc.json
diff --git a/apps/vscode-ui-e2e/cypress.config.ts b/apps/vscode-ui-e2e/cypress.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'cypress';
+import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+
+const cypressJsonConfig = {
+  fileServerFolder: '.',
+  video: true,
+  videosFolder: '../../dist/cypress/apps/vscode-ui-e2e/videos',
+  screenshotsFolder: '../../dist/cypress/apps/vscode-ui-e2e/screenshots',
+  chromeWebSecurity: false,
+  baseUrl: 'http://localhost:4400',
+  specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',
+  supportFile: 'src/support/e2e.ts',
+};
+export default defineConfig({
+  e2e: {
+    ...nxE2EPreset(__dirname),
+    ...cypressJsonConfig,
+  },
+});
diff --git a/...ture-task-execution-form-e2e/project.json → apps/vscode-ui-e2e/project.json b/...ture-task-execution-form-e2e/project.json → apps/vscode-ui-e2e/project.json
@@ -1,27 +1,29 @@
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/vscode-ui-feature-task-execution-form-e2e/src",
+  "sourceRoot": "apps/vscode-ui-e2e/src",
   "projectType": "application",
   "targets": {
     "e2e": {
       "executor": "@nrwl/cypress:cypress",
       "options": {
-        "cypressConfig": "apps/vscode-ui-feature-task-execution-form-e2e/cypress.json",
-        "tsConfig": "apps/vscode-ui-feature-task-execution-form-e2e/tsconfig.e2e.json",
-        "devServerTarget": "vscode-ui-feature-task-execution-form:storybook"
+        "cypressConfig": "apps/vscode-ui-e2e/cypress.config.ts",
+        "tsConfig": "apps/vscode-ui-e2e/tsconfig.e2e.json",
+        "devServerTarget": "vscode-ui-feature-task-execution-form:storybook",
+        "headed": true,
+        "testingType": "e2e"
       },
       "configurations": {
-        "production": {
-          "devServerTarget": "vscode-ui-feature-task-execution-form:serve:production"
+        "ci": {
+          "headed": false
         }
       }
     },
     "lint": {
       "executor": "@nrwl/linter:eslint",
       "options": {
         "lintFilePatterns": [
-          "apps/vscode-ui-feature-task-execution-form-e2e/src/**/*.ts",
-          "apps/vscode-ui-feature-task-execution-form-e2e/src/**/*.html"
+          "apps/vscode-ui-e2e/src/**/*.ts",
+          "apps/vscode-ui-e2e/src/**/*.html"
         ]
       }
     }

diff --git a/...c/integration/task-execution-form.spec.ts → ...-ui-e2e/src/e2e/task-execution-form.cy.ts b/...c/integration/task-execution-form.spec.ts → ...-ui-e2e/src/e2e/task-execution-form.cy.ts
diff --git a/...xecution-form-e2e/src/support/commands.ts → apps/vscode-ui-e2e/src/support/commands.ts b/...xecution-form-e2e/src/support/commands.ts → apps/vscode-ui-e2e/src/support/commands.ts
diff --git a/...k-execution-form-e2e/src/support/index.ts → apps/vscode-ui-e2e/src/support/e2e.ts b/...k-execution-form-e2e/src/support/index.ts → apps/vscode-ui-e2e/src/support/e2e.ts
diff --git a/...task-execution-form-e2e/tsconfig.e2e.json → apps/vscode-ui-e2e/tsconfig.e2e.json b/...task-execution-form-e2e/tsconfig.e2e.json → apps/vscode-ui-e2e/tsconfig.e2e.json
@@ -4,5 +4,5 @@
     "sourceMap": false,
     "outDir": "../../dist/out-tsc"
   },
-  "include": ["src/**/*.ts", "src/**/*.js"]
+  "include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"]
 }
diff --git a/...ure-task-execution-form-e2e/tsconfig.json → apps/vscode-ui-e2e/tsconfig.json b/...ure-task-execution-form-e2e/tsconfig.json → apps/vscode-ui-e2e/tsconfig.json
diff --git a/apps/vscode-ui-feature-task-execution-form-e2e/cypress.json b/apps/vscode-ui-feature-task-execution-form-e2e/cypress.json
diff --git a/apps/vscode-ui-feature-task-execution-form-e2e/cypress/fixtures/example.json b/apps/vscode-ui-feature-task-execution-form-e2e/cypress/fixtures/example.json
diff --git a/apps/vscode-ui-feature-task-execution-form-e2e/cypress/plugins/index.js b/apps/vscode-ui-feature-task-execution-form-e2e/cypress/plugins/index.js
diff --git a/apps/vscode-ui-feature-task-execution-form-e2e/cypress/support/commands.js b/apps/vscode-ui-feature-task-execution-form-e2e/cypress/support/commands.js
diff --git a/apps/vscode-ui-feature-task-execution-form-e2e/cypress/support/index.js b/apps/vscode-ui-feature-task-execution-form-e2e/cypress/support/index.js
diff --git a/apps/vscode-ui-feature-task-execution-form-e2e/src/plugins/index.js b/apps/vscode-ui-feature-task-execution-form-e2e/src/plugins/index.js
diff --git a/libs/vscode-ui/feature-task-execution-form/project.json b/libs/vscode-ui/feature-task-execution-form/project.json
@@ -41,6 +41,9 @@
         "outputDir": "dist/storybook/vscode-ui-feature-task-execution-form",
         "configDir": "libs/vscode-ui/feature-task-execution-form/.storybook",
         "browserTarget": "vscode-ui-feature-task-execution-form:build-storybook",
+        "stylePreprocessorOptions": {
+          "includePaths": ["libs/vscode-ui/styles/src/lib"]
+        },
         "compodoc": false
       },
       "configurations": {

diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "@angular-eslint/eslint-plugin-template": "14.0.0",
     "@angular-eslint/template-parser": "14.0.0",
     "@angular/cdk": "14.1.3",
+    "@angular/cli": "14.1.3",
     "@angular/common": "14.1.3",
     "@angular/compiler": "14.1.3",
     "@angular/compiler-cli": "14.1.3",
@@ -83,7 +84,7 @@
     "@wdio/mocha-framework": "^7.24.0",
     "@wdio/spec-reporter": "^7.24.0",
     "@yarnpkg/pnp": "^3.1.1-rc.12",
-    "cypress": "6.5.0",
+    "cypress": "^10.2.0",
     "esbuild": "^0.14.54",
     "esbuild-copy-files-plugin": "^1.1.0",
     "eslint": "8.15.0",

diff --git a/workspace.json b/workspace.json
@@ -30,8 +30,8 @@
     "vscode-ui": "apps/vscode-ui",
     "vscode-ui-argument-list": "libs/vscode-ui/argument-list",
     "vscode-ui-components": "libs/vscode-ui/components",
+    "vscode-ui-e2e": "apps/vscode-ui-e2e",
     "vscode-ui-feature-task-execution-form": "libs/vscode-ui/feature-task-execution-form",
-    "vscode-ui-feature-task-execution-form-e2e": "apps/vscode-ui-feature-task-execution-form-e2e",
     "vscode-ui-styles": "libs/vscode-ui/styles",
     "vscode-utils": "libs/vscode/utils",
     "vscode-verify": "libs/vscode/verify",