CONSOLE-4912: update machine config tests #15759

yapei · 2025-11-24T08:46:44Z

Update machine-config.cy.ts to check exact content and more details

openshift-ci-robot · 2025-11-24T08:46:49Z

@yapei: This pull request references CONSOLE-4912 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the sub-task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Update machine-config.cy.ts to check exact content and more details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

coderabbitai · 2025-11-24T08:47:08Z

Walkthrough

Added a Cypress helper to validate machine-config file details, extended a test to fetch machine-config contents via an oc JSONPath query and verify them in the UI, added an afterEach error check, closed the guided tour in test setup, replaced a hardcoded Info ARIA label with a translated string, and moved the "Info" key in the English locale JSON.

Changes

Cohort / File(s)	Summary
Cypress test enhancements `frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts`	Added `checkMachineConfigDetails(mode, overwrite, content)` to open the info panel and assert `mode`, `overwrite`, and a decoded/truncated snippet of `content`; added test steps to run `oc get mc <MC_WITH_CONFIG_FILES> -o jsonpath='{.spec.config.storage.files[0]}'`, parse `source`, `mode`, `overwrite`, and pass them to the helper; invoked `guidedTour.close()` in setup; added `afterEach` to call `checkErrors()`.
UI i18n tweak `frontend/public/components/machine-config.tsx`	Replaced a hardcoded Info ARIA label with `t('public~Info')` using the existing `useTranslation` hook.
Locale ordering change `frontend/public/locales/en/public.json`	Moved the `"Info": "Info"` entry within the file (removed prior occurrence and added it after `"Overwrite"`), preserving the translation key but changing its position.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Verify the oc get ... -o jsonpath invocation and JSON parsing handle missing or differently-shaped spec.config.storage.files[0] payloads.
Confirm the decoding/truncation used by checkMachineConfigDetails() matches the UI rendering and encoding expectations.
Ensure the guided tour close and afterEach checkErrors() play correctly with other tests and cleanup behavior.

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between 409d0c4 and 681df50.

📒 Files selected for processing (1)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (2 hunks)

🧰 Additional context used

📓 Path-based instructions (1)

**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts

🔇 Additional comments (2)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (2)

3-3: LGTM: Guided tour cleanup import added.

The import is correctly used in the test setup to ensure guided tours don't interfere with test execution.

31-31: LGTM: Guided tour cleanup in test setup.

Properly dismissing the guided tour before test execution prevents potential interference with UI interactions.

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts

yapei · 2025-11-25T06:24:50Z

@rhamilto could you help give a review? Thanks!
e2e-gcp-console is failing at other tests, app/machine-config.cy.ts are passing though

logonoff · 2025-11-26T13:44:10Z

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts

 const MC_C2C = '.co-copy-to-clipboard__text';
+const checkMachineConfigDetails = (mode, overwrite, content) => {
+  cy.byTestID(MC_CONFIG_FILE_PATH_ID).scrollIntoView();
+  cy.get('button[aria-label="public~Info"]').first().click();


the i18n namespace in the aria-label is a bug and should be fixed. it should be aria-label={t('public~Info')}. If that is not specific enough we can add a test id for this

thanks! wasn't aware that we have a bug here, will fix

coderabbitai

Actionable comments posted: 0

🧹 Nitpick comments (1)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (1)

11-26: Scope assertions to the config-file section to avoid accidental matches

checkMachineConfigDetails does the right logical checks, but the selectors are fairly broad:

cy.contains(mode) / cy.contains(overwrite.toString()) search the entire page, so another element showing the same text could make the test pass even if the popover content is wrong.

cy.get('code').first() will grab the first <code> element anywhere, not necessarily the one associated with MC_CONFIG_FILE_PATH_ID.

Consider scoping these assertions to the configuration-file row (for example by using cy.byTestID(MC_CONFIG_FILE_PATH_ID).parent().within(...) or a similar container) so the mode/overwrite and code checks are guaranteed to apply to the targeted file entry.

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between 65ed3b9 and 1427c04.

📒 Files selected for processing (3)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (2 hunks)
frontend/public/components/machine-config.tsx (1 hunks)
frontend/public/locales/en/public.json (1 hunks)

🧰 Additional context used

📓 Path-based instructions (1)

**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts
frontend/public/components/machine-config.tsx
frontend/public/locales/en/public.json

🧬 Code graph analysis (1)

frontend/public/components/machine-config.tsx (1)

frontend/__mocks__/i18next.ts (1)

t (8-14)

🔇 Additional comments (4)

frontend/public/components/machine-config.tsx (1)

80-107: Localized ARIA label correctly wired to i18n

Switching the Info button aria-label to t('public~Info') aligns with existing i18n usage and keeps the control accessible without changing behavior. Looks good.

frontend/public/locales/en/public.json (1)

724-736: Info translation entry is consistent with usage

Adding "Info": "Info" under the public namespace correctly supports t('public~Info') in the UI; no issues seen.

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (2)

3-37: Guided tour cleanup and global error check improve test stability

Closing the guided tour in before and running checkErrors() in afterEach should reduce flakiness from overlays and surface console issues early. This setup looks solid.

46-59: Server-side file data verification is wired correctly

Using oc get mc ... -o jsonpath='{.spec.config.storage.files[0]}', parsing the result, asserting presence of contents, mode, and overwrite, then delegating to checkMachineConfigDetails gives a good end-to-end check that the UI reflects the MachineConfig’s underlying data. This looks good and fits the PR’s goal of checking more details.

yapei · 2025-11-27T12:08:14Z

@logonoff comments resolved ~ PTAL, thanks!

logonoff

/lgtm

yapei · 2025-11-28T01:56:42Z

flaky test

Enable dev perspective: P-01-TC04: Enable dev perspective Enable dev perspective: P-01-TC04

/retest-required

yapei · 2025-12-01T01:03:57Z

/retest-required

yapei · 2025-12-01T01:16:12Z

/verified by CI

openshift-ci-robot · 2025-12-01T01:16:23Z

@yapei: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

yapei · 2025-12-03T01:54:03Z

/retest-required

yapei · 2025-12-05T01:01:27Z

/retest-required

yapei · 2025-12-08T00:59:26Z

/label acknowledge-critical-fixes-only
/label docs-apporved

openshift-ci · 2025-12-08T00:59:30Z

@yapei: The label(s) /label docs-apporved cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, run-integration-tests, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, ok-to-test, plugin-api-approved, plugin-api-changed, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label acknowledge-critical-fixes-only
/label docs-apporved

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

logonoff · 2025-12-08T01:08:39Z

/label px-approved
/label docs-approved

openshift-ci-robot · 2025-12-08T05:15:30Z

/retest-required

Remaining retests: 0 against base HEAD 370e6b0 and 2 for PR HEAD 1427c04 in total

yapei · 2025-12-09T02:05:22Z

/retest-required

openshift-ci-robot · 2025-12-09T10:05:50Z

/retest-required

Remaining retests: 0 against base HEAD 2db4d62 and 1 for PR HEAD 1427c04 in total

openshift-ci-robot · 2025-12-09T18:05:37Z

/retest-required

Remaining retests: 0 against base HEAD d93076f and 0 for PR HEAD 1427c04 in total

openshift-ci-robot · 2025-12-09T22:05:34Z

/hold

Revision 1427c04 was retested 3 times: holding

yapei · 2025-12-15T01:18:15Z

/retest-required

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts

coderabbitai

Actionable comments posted: 0

🧹 Nitpick comments (2)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (2)
10-25: Good improvement on content verification; consider optional enhancements.

The increase from 5 to 30 characters (line 22) improves test reliability. For even stronger verification, consider increasing to 50-100 characters as suggested in the previous review.

Additionally, the hardcoded aria-label="Info" selector (line 12) may be brittle if the component's localization changes. Consider using a data-test-id instead for more stable test selection.

Optional: increase content verification length:
         decodeURIComponent(content)
           .replace(/^(data:,)/, '')
-          .slice(0, 30),
+          .slice(0, 50),
Optional: use data-test-id for Info button (requires corresponding component change):
-  cy.get('button[aria-label="Info"]').first().click();
+  cy.byTestID('machine-config-info-button').first().click();
44-57: Good addition of property validation; optional error handling remains.

The property checks (lines 47-49) improve test reliability by validating the expected JSON structure. This partially addresses the previous review feedback.

For even more robust error handling, consider adding:

Validation of result.code and result.stderr from the cy.exec call

Try-catch around JSON.parse with a descriptive error message

However, since Cypress will fail the test on errors anyway, these are optional enhancements rather than critical issues.

Optional: add comprehensive error handling:
     cy.exec(`oc get mc ${MC_WITH_CONFIG_FILES} -o jsonpath='{.spec.config.storage.files[0]}'`).then(
       (result) => {
+        expect(result.code, 'oc command should succeed').to.equal(0);
+        expect(result.stderr, 'oc command should not error').to.be.empty;
+        let mcContents;
+        try {
+          mcContents = JSON.parse(result.stdout);
+        } catch (e) {
+          throw new Error(`Failed to parse oc output: ${result.stdout}`);
+        }
-        const mcContents = JSON.parse(result.stdout);
         expect(mcContents).to.have.property('contents');

📜 Review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between 1427c04 and 48380cd.

📒 Files selected for processing (1)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (2 hunks)

🧰 Additional context used

📓 Path-based instructions (1)

**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts

🔇 Additional comments (1)

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts (1)

33-35: LGTM!

Adding the afterEach hook with checkErrors() improves test reliability by catching console errors and failures after each test execution. This is a good testing practice.

logonoff · 2025-12-17T01:56:30Z

/lgtm

openshift-ci · 2025-12-17T01:56:48Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: logonoff, yapei

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~frontend/OWNERS~~ [logonoff]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

yapei · 2025-12-17T07:02:56Z

/retest-required

yapei · 2025-12-17T07:04:32Z

/verified by CI

openshift-ci-robot · 2025-12-17T07:04:43Z

@yapei: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

yapei · 2025-12-18T01:19:41Z

/test okd-scos-images

yapei · 2025-12-30T03:54:12Z

/test okd-scos-images

logonoff · 2026-01-11T21:41:06Z

/unhold
/retest

openshift-ci · 2026-01-12T16:54:26Z

@yapei: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 24, 2025

openshift-ci bot requested review from cajieh and rhamilto November 24, 2025 08:47

openshift-ci bot added the kind/cypress Related to Cypress e2e integration testing label Nov 24, 2025

coderabbitai bot reviewed Nov 24, 2025

View reviewed changes

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts Show resolved Hide resolved

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts Show resolved Hide resolved

yapei force-pushed the app-tests branch from 681df50 to 65ed3b9 Compare November 25, 2025 02:18

logonoff reviewed Nov 26, 2025

View reviewed changes

yapei force-pushed the app-tests branch from 65ed3b9 to 1427c04 Compare November 27, 2025 02:54

openshift-ci bot added component/core Related to console core functionality kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated labels Nov 27, 2025

coderabbitai bot reviewed Nov 27, 2025

View reviewed changes

logonoff approved these changes Nov 27, 2025

View reviewed changes

openshift-ci bot assigned logonoff Nov 27, 2025

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 27, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 1, 2025

openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Dec 8, 2025

openshift-ci bot added px-approved Signifies that Product Support has signed off on this PR docs-approved Signifies that Docs has signed off on this PR labels Dec 8, 2025

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 9, 2025

logonoff reviewed Dec 16, 2025

View reviewed changes

frontend/packages/integration-tests-cypress/tests/app/machine-config.cy.ts Outdated Show resolved Hide resolved

CONSOLE-4912: update machine config tests

48380cd

yapei force-pushed the app-tests branch from 1427c04 to 48380cd Compare December 17, 2025 01:46

openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Dec 17, 2025

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2025

coderabbitai bot reviewed Dec 17, 2025

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 17, 2025

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2026

openshift-merge-bot bot merged commit 54bb8be into openshift:main Jan 12, 2026
8 checks passed

CONSOLE-4912: update machine config tests #15759

CONSOLE-4912: update machine config tests #15759

Uh oh!

Conversation

yapei commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot commented Nov 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

yapei commented Nov 25, 2025

Uh oh!

logonoff Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

yapei Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

yapei commented Nov 27, 2025

Uh oh!

logonoff left a comment

Choose a reason for hiding this comment

Uh oh!

yapei commented Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yapei commented Dec 1, 2025

Uh oh!

yapei commented Dec 1, 2025

Uh oh!

openshift-ci-robot commented Dec 1, 2025

Uh oh!

yapei commented Dec 3, 2025

Uh oh!

yapei commented Dec 5, 2025

Uh oh!

yapei commented Dec 8, 2025

Uh oh!

openshift-ci bot commented Dec 8, 2025

Uh oh!

logonoff commented Dec 8, 2025

Uh oh!

openshift-ci-robot commented Dec 8, 2025

Uh oh!

yapei commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

yapei commented Dec 15, 2025

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

logonoff commented Dec 17, 2025

Uh oh!

openshift-ci bot commented Dec 17, 2025

Uh oh!

yapei commented Dec 17, 2025

Uh oh!

yapei commented Dec 17, 2025

Uh oh!

openshift-ci-robot commented Dec 17, 2025

openshift-ci-robot commented Nov 24, 2025 •

edited by openshift-ci bot

Loading

coderabbitai bot commented Nov 24, 2025 •

edited

Loading

yapei commented Nov 28, 2025 •

edited

Loading