Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port #3440 to release/3.1 #3465

Merged
merged 3 commits into from
Feb 18, 2025
Merged

Port #3440 to release/3.1 #3465

merged 3 commits into from
Feb 18, 2025

Conversation

JWaters02
Copy link
Member

Proposed changes

Ports #3440 to the release/3.1 branch in preparation for a 3.1.2 patch release.

Release Notes

Milestone: 3.1.2

Changelog: Fixed an issue where cancelling Unix, MVS or TSO command still submits the command.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (non-breaking change which adds or improves functionality)
  • Breaking change (a change that would cause existing functionality to not work as expected)
  • Documentation (Markdown, README updates)
  • Other (please specify above in "Proposed changes" section)

Checklist

General

  • I have read the CONTRIBUTOR GUIDANCE wiki
  • All PR dependencies have been merged and published (if applicable)
  • A GIF or screenshot is included in the PR for visual changes
  • The pre-publish command has been executed:
    • v2 and below: yarn workspace vscode-extension-for-zowe vscode:prepublish
    • v3: pnpm --filter vscode-extension-for-zowe vscode:prepublish

Code coverage

  • There is coverage for the code that I have added
  • I have added new test cases and they are passing
  • I have manually tested the changes

Deployment

  • I have added developer documentation (if applicable)
  • Documentation should be added to Zowe Docs
    • If you're an outside contributor, please post in the #zowe-doc Slack channel to coordinate documentation.
    • Otherwise, please check with the rest of the squad about any needed documentation before merging.
  • These changes may need ported to the appropriate branches (list here):

Further comments

* Fix zowe#3422

Signed-off-by: JWaters02 <[email protected]>

chore: changelog

Signed-off-by: JWaters02 <[email protected]>

Fix failing tests

This is due to adding a new message box to say that operation was cancelled, and tests were still expecting no message

Signed-off-by: JWaters02 <[email protected]>

* Fix that integrated terminals were not opening

Signed-off-by: JWaters02 <[email protected]>

---------

Signed-off-by: JWaters02 <[email protected]>
Signed-off-by: Fernando Rijo Cedeno <[email protected]>
Co-authored-by: Fernando Rijo Cedeno <[email protected]>
Co-authored-by: Billie Simmons <[email protected]>
@JWaters02 JWaters02 self-assigned this Feb 17, 2025
@JWaters02 JWaters02 added this to the v3.1.2 milestone Feb 17, 2025
@JWaters02 JWaters02 changed the title Fix cancelling MVS/TSO command causing error (#3440) Port #3440 to release/3.1 Feb 17, 2025
Copy link

codecov bot commented Feb 17, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.21%. Comparing base (7a6bdb2) to head (e9191d6).
Report is 1 commits behind head on release/3.1.

Additional details and impacted files
@@             Coverage Diff              @@
##           release/3.1    #3465   +/-   ##
============================================
  Coverage        93.21%   93.21%           
============================================
  Files              120      120           
  Lines            12521    12524    +3     
  Branches          2831     2772   -59     
============================================
+ Hits             11671    11674    +3     
  Misses             849      849           
  Partials             1        1           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

JillieBeanSim
JillieBeanSim previously approved these changes Feb 18, 2025
Copy link
Contributor

@JillieBeanSim JillieBeanSim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! thanks for porting the fix @JWaters02

Signed-off-by: Fernando Rijo Cedeno <[email protected]>
Copy link
Member

@zFernand0 zFernand0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 😋

Thanks for porting! 🙏


Hey @JWaters02, as a reminder... you should be able to work out of direct branches instead of a fork 🙏

@zFernand0 zFernand0 requested a review from t1m0thyj February 18, 2025 14:42
Comment on lines +112 to +113
const showInformationMessage = jest.fn();
Object.defineProperty(vscode.window, "showInformationMessage", { value: showInformationMessage });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't catch this in the original PR - but when possible, please use jest.replaceProperty or jest.spyOn to avoid re-defining the property for other test suites 😋 this can be kept as-is since we (unfortunately) already do this in several places

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch 🙏

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Trae I'll bear it in mind.

Currently working on a random side project using Jest to teach me about it, as even just trying to understand it by looking at examples and reading some docs is proving difficult. So hopefully my ability to work on the tests in the future will be much better - trying to write new test suite for new feature is basically impossible task for me right now 😅

@zFernand0 zFernand0 merged commit 94e87a5 into zowe:release/3.1 Feb 18, 2025
16 checks passed
@zFernand0
Copy link
Member

I didn't catch this in the original PR - but when possible, please use jest.replaceProperty or jest.spyOn to avoid re-defining the property for other test suites 😋 this can be kept as-is since we (unfortunately) already do this in several places

Something to keep in mind 🙏
Thank you Trae! 🙏

@JWaters02 JWaters02 deleted the port-3440 branch February 18, 2025 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

4 participants