rebase and test fixes

Author: katieperry4

packages/cypress/cypress/support/commands/odh.ts

@@ -1166,11 +1166,6 @@ declare global {
           type: 'GET /maas/api/v1/subscriptions',
           response: { data: UserSubscription[] },
         ) => Cypress.Chainable<null>) &
-        ((
-          type: 'GET /api/secrets/:name',
-          options: { path: { name: string } },
-          response: OdhResponse<SecretKind>,
-        ) => Cypress.Chainable<null>) &
         ((
           type: 'POST /maas/api/v1/maasmodel',
           response: OdhResponse<MaaSModelRef>,

packages/cypress/cypress/tests/mocked/modelsAsAService/maasDeploymentWizard.cy.ts

@@ -361,7 +361,7 @@ describe('MaaS Deployment Wizard', () => {
     cy.wait('@createMaaSModelRefDryRun');
     // Wizard stayed open and shows the error
     modelServingWizard.findErrorMessageAlert().should('be.visible').contains('Error');
-    // no LLMInferenceService should be created
-    cy.get('@createLLMInferenceService.all').should('have.length', 0);
+    // no LLMInferenceService should be created but the LLMInferenceService dry run should have been called
+    cy.get('@createLLMInferenceService.all').should('have.length', 1);
   });
 });