Skip to content

Commit

Permalink
Merge pull request #1838 from zowe/fix-everything
Browse files Browse the repository at this point in the history
Make Imperative version independent, revert major bump
  • Loading branch information
zFernand0 committed Oct 30, 2023
2 parents 29d0d7d + d59f04b commit 9b2deb4
Show file tree
Hide file tree
Showing 22 changed files with 207 additions and 271 deletions.
2 changes: 1 addition & 1 deletion __tests__/__packages__/cli-test-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to the Zowe CLI test utils package will be documented in this file.

## `7.18.9`
## Recent Changes

- Enhancement: Adds the `CLI_TEST_UTILS_USE_PROJECT_ROOT_DIR` environment variable to force the test utility to use the global project dir instead of workspace dirs if set.

Expand Down
4 changes: 2 additions & 2 deletions __tests__/__packages__/cli-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli-test-utils",
"version": "7.18.9",
"version": "7.18.8",
"description": "Test utilities package for Zowe CLI plug-ins",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -44,7 +44,7 @@
"@types/js-yaml": "^4.0.0",
"@types/node": "^14.18.28",
"@types/uuid": "^8.3.0",
"@zowe/imperative": "7.18.9",
"@zowe/imperative": "5.18.3",
"eslint": "^8.22.0",
"typescript": "^4.0.0"
},
Expand Down
11 changes: 11 additions & 0 deletions __tests__/__resources__/env/integration-main.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# environmental variable settings for integration tests

FORCE_COLOR=1
JEST_JUNIT_OUTPUT_DIR=__tests__/__results__/integration
JEST_JUNIT_OUTPUT_NAME=junit-main.xml
JEST_SUITE_NAME="Integration Tests"
JEST_JUNIT_ANCESTOR_SEPARATOR=" > "
JEST_JUNIT_CLASSNAME="Integration.{classname}"
JEST_JUNIT_TITLE="{title}"
JEST_STARE_RESULT_DIR=__tests__/__results__/integration/jest-stare
JEST_STARE_RESULT_HTML=index.html
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.18.9",
"version": "7.18.8",
"command": {
"publish": {
"ignoreChanges": [
Expand Down
Loading

0 comments on commit 9b2deb4

Please sign in to comment.