Skip to content

Commit dfe272e

Browse files
committed
top level e2e script, remove duplicate VSC download/install
Signed-off-by: Andrew Twydell <[email protected]>
1 parent c0bbe24 commit dfe272e

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"test": "npm run test --workspaces",
1717
"test:system": "npm run test:system --workspaces",
1818
"test:unit": "npm run test:unit --workspaces",
19+
"test:e2e": "npm run test:e2e --workspaces",
1920
"lint": "npm run lint --workspaces",
2021
"lintErrors": "npm run lintErrors --workspaces",
2122
"prepare": "husky install",
@@ -66,4 +67,4 @@
6667
"typescript": "^5.3.3",
6768
"uuid": "^9.0.0"
6869
}
69-
}
70+
}

packages/cli/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"test": "npm run test:unit && npm run test:system",
4242
"test:system": "jest --config system.jest_config.ts",
4343
"test:unit": "jest --config unit.jest_config.ts",
44+
"test:e2e": "echo 'Nothing to e2e test'",
4445
"installPlugin": "npm install && npm run clean && npm run build && zowe plugins install .",
4546
"preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js",
4647
"typedoc": "typedoc --out ./docs/typedoc/ ./src/ --disableOutputCheck",

packages/sdk/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"test": "npm run test:unit && npm run test:system",
4040
"test:system": "jest --config system.jest_config.ts",
4141
"test:unit": "jest --config unit.jest_config.ts",
42+
"test:e2e": "echo 'Nothing to e2e test'",
4243
"installPlugin": "npm install && npm run clean && npm run build && zowe plugins install .",
4344
"typedoc": "typedoc --out ./docs/typedoc/ ./src/ --disableOutputCheck",
4445
"pretty": "prettier --write \"src/**/*.ts\" \"__tests__/**/*.ts\""

packages/vsce/package.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -866,11 +866,9 @@
866866
"tsupDep": "node ./scripts/tsup-deps.js",
867867
"getPrebuilds": "node ./scripts/getSecretsPrebuilds.js",
868868
"package": "vsce package --dependencies --allow-star-activation && node ../../scripts/mv-pack.js cics-extension-for-zowe vsix",
869-
"test:e2e:prepare": "extest get-vscode -s .cics && extest get-chromedriver -s .cics",
870-
"test:e2e:install": "[ -f ../../dist/cics-extension*.vsix ] && extest install-vsix -f ../../dist/cics-extension*.vsix -s .cics -e .cics || { echo \"npm run package to build vsix first\"; exit 1; }",
871-
"test:e2e:infra:setup": "echo \"Using global config home: $ZOWE_CLI_HOME\" && rm -rf $ZOWE_CLI_HOME && mkdir -p $ZOWE_CLI_HOME",
872-
"test:e2e:run": "extest setup-and-run '__tests__/lib/*.test.js' -s .cics -e .cics --code_version max --code_settings __tests__/__e2e__/settings.json && tsc --project __tests__/test-tsconfig.json",
873-
"test:e2e": "export ZOWE_CLI_HOME=`pwd`/.e2e-global-settings && npm run test:e2e:infra:setup && npm run test:e2e:prepare && npm run test:e2e:install && npm run test:e2e:run",
869+
"test:e2e:setup": "echo \"Using global config home: $ZOWE_CLI_HOME\" && rm -rf $ZOWE_CLI_HOME && mkdir -p $ZOWE_CLI_HOME",
870+
"test:e2e:run": "tsc --project __tests__/test-tsconfig.json && extest setup-and-run '__tests__/lib/*.test.js' -s .cics -e .cics -c max -o __tests__/__e2e__/settings.json -i",
871+
"test:e2e": "export ZOWE_CLI_HOME=`pwd`/.e2e-global-settings && npm run test:e2e:setup && npm run test:e2e:run",
874872
"pretty": "prettier --write \"src/**/*.ts\" \"__tests__/**/*.ts\""
875873
},
876874
"devDependencies": {

0 commit comments

Comments
 (0)