From 07a92665837198b7bc0122d7c8939323cc153ab1 Mon Sep 17 00:00:00 2001
From: Phillip Rhodes <pcbailey@users.noreply.github.com>
Date: Mon, 12 Jan 2026 06:34:51 -0500
Subject: [PATCH] Fix broken NNCP wizard tests

---
 cypress/e2e/NewPolicy.spec.cy.ts              | 29 ++++++++++++-------
 .../steps/ReviewStep/ReviewStep.tsx           |  2 ++
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/cypress/e2e/NewPolicy.spec.cy.ts b/cypress/e2e/NewPolicy.spec.cy.ts
index dd86b13..6d0fc43 100644
--- a/cypress/e2e/NewPolicy.spec.cy.ts
+++ b/cypress/e2e/NewPolicy.spec.cy.ts
@@ -1,5 +1,3 @@
-import { SKIP_WELCOME_BANNER_TEST_ID } from '../support/selectors';
-
 const deletePolicyFromDetailsPage = (policyName: string) => {
   cy.contains('button', 'Actions', { matchCase: false }).click();
   cy.contains('button', 'Delete').click();
@@ -13,27 +11,38 @@ const deletePolicyFromDetailsPage = (policyName: string) => {
   cy.contains('h1', 'NodeNetworkConfigurationPolicy');
 };
 
-describe.skip('Create new policy with form', () => {
+describe('Create new policy with form', () => {
   beforeEach(() => {
     cy.login();
   });
 
-  it('with bridge interface', () => {
+  it('with default node network', () => {
     const testPolicyName = 'test-bridge-policy-name';
+    const testDescription = 'Test description';
+
     cy.visit('/k8s/cluster/nmstate.io~v1~NodeNetworkConfigurationPolicy');
-    cy.byTestID(SKIP_WELCOME_BANNER_TEST_ID).click();
     cy.byTestID('item-create').click();
 
     cy.contains('button', 'From Form').click();
 
-    cy.get('input[name="policy-name"]').clear().type(`${testPolicyName}`);
+    // Network identity step
+    cy.get('input[name="physical-network-name"]').clear().type(`${testPolicyName}`);
+    cy.contains('button', 'Next').click();
 
-    cy.get('input[name="policy-description"]').clear().type('test-policy-description');
+    // Nodes configuration step
+    cy.get('input[name="policy-name"]').clear().type(`${testPolicyName}`);
+    cy.get('input[name="policy-description"]').clear().type(`${testDescription}`);
+    cy.contains('button', 'Next').click();
 
-    cy.contains('button', 'Bridging').click();
-    cy.get(`button#add-bridging-interface-button`).click();
+    // Uplink connection step - 'Default node network' selected by default
     cy.contains('button', 'Next').click();
-    cy.contains('button', 'Create policy').click();
+
+    // Settings step is skipped because 'Default node network' is selected
+
+    // Review and Create step
+    cy.byLegacyTestID('review-physical-network-name').should('have.text', testPolicyName);
+    cy.byLegacyTestID('review-network-description').should('have.text', testDescription);
+    cy.contains('button', 'Create network').click();
 
     cy.contains('h1', testPolicyName);
 
diff --git a/src/utils/components/PolicyForm/PolicyWizard/steps/ReviewStep/ReviewStep.tsx b/src/utils/components/PolicyForm/PolicyWizard/steps/ReviewStep/ReviewStep.tsx
index afcbc5a..54a9587 100644
--- a/src/utils/components/PolicyForm/PolicyWizard/steps/ReviewStep/ReviewStep.tsx
+++ b/src/utils/components/PolicyForm/PolicyWizard/steps/ReviewStep/ReviewStep.tsx
@@ -103,6 +103,7 @@ const ReviewStep: FC<ReviewStepProps> = ({ policy, creationError, setPolicy }) =
               <DetailItem
                 header={t('Physical network name')}
                 description={getOVNLocalnet(policy) || NO_DATA_DASH}
+                testId="review-physical-network-name"
               />
               <DetailItem
                 header={t('Node network configuration name')}
@@ -111,6 +112,7 @@ const ReviewStep: FC<ReviewStepProps> = ({ policy, creationError, setPolicy }) =
               <DetailItem
                 header={t('Network description')}
                 description={getDescription(policy) || NO_DATA_DASH}
+                testId="review-network-description"
               />
               <DetailItem
                 header={t('Uplink connection')}