From e450b7d88b48045f27fed2fadffbc8fe514e4e1c Mon Sep 17 00:00:00 2001 From: liuying Date: Thu, 9 Mar 2023 14:38:21 +0800 Subject: [PATCH] fix: backup create cluster Signed-off-by: liuying --- cypress/e2e/pages/cluster/backup.cy.js | 2 +- cypress/support/commands.js | 3 +++ cypress/support/form-commands.js | 6 ++++-- cypress/support/resource.js | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cypress/e2e/pages/cluster/backup.cy.js b/cypress/e2e/pages/cluster/backup.cy.js index 1b3b1019..d3c6dc54 100644 --- a/cypress/e2e/pages/cluster/backup.cy.js +++ b/cypress/e2e/pages/cluster/backup.cy.js @@ -21,7 +21,7 @@ const clusterName = `e2e.cluster.name.${uuid}`; before(() => { cy.login(); - cy.createClusterQuick(clusterName); + cy.createClusterQuick(clusterName, 'last'); }); after(() => { diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 8618010e..0d811a16 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -108,8 +108,11 @@ Cypress.Commands.add('login', (visitUrl = '') => { .loginFormSubmit(); // cy.visitPage(visitUrl || '/cluster', isTable); // cy.visit(visitUrl || '/cluster'); + cy.screenshot(); cy.wait(2000); visitUrl && cy.visit(visitUrl); + cy.screenshot(); + cy.wait(2000); }); diff --git a/cypress/support/form-commands.js b/cypress/support/form-commands.js index b3facf56..c588151a 100644 --- a/cypress/support/form-commands.js +++ b/cypress/support/form-commands.js @@ -15,7 +15,7 @@ */ import getTitle from './common'; -import { isArray } from 'lodash'; +import { isArray, isString } from 'lodash'; function getId(formItemName) { return `#form-item-col-${formItemName}`; @@ -247,7 +247,9 @@ Cypress.Commands.add( .find('.ant-checkbox-wrapper') .as('leftCheckbox'); - if (!leftIndex) { + if (isString(leftIndex)) { + cy.get('@leftCheckbox').last().click(); + } else if (!leftIndex) { cy.get('@leftCheckbox').first().click(); } else if (isArray(leftIndex)) { leftIndex.forEach((index) => { diff --git a/cypress/support/resource.js b/cypress/support/resource.js index 90e55ac4..fb72ecfb 100644 --- a/cypress/support/resource.js +++ b/cypress/support/resource.js @@ -15,7 +15,7 @@ */ // 快速创建集群 -Cypress.Commands.add('createClusterQuick', (clusterName) => { +Cypress.Commands.add('createClusterQuick', (clusterName, nodeIndex) => { cy.visitPage('/cluster'); cy.clickHeaderButton(0); @@ -28,7 +28,7 @@ Cypress.Commands.add('createClusterQuick', (clusterName) => { cy.formSelect('region', 'default'); // select node cy.waitTransferList(); - cy.formMultiTransfer('nodes', 0); + cy.formMultiTransfer('nodes', nodeIndex); // next step cy.clickStepActionNextButton('step-next');