From 52b1868a68970687e1adc88fddf267c6ee72f24f Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Mon, 5 Aug 2024 17:17:12 +0100 Subject: [PATCH 1/6] fix test cases --- .../Widgets/TableV2/Inline_editing_2_spec.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js index ea8fc6ab0eaf..6131a348b6e2 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js @@ -26,8 +26,6 @@ describe( agHelper.AddDsl("Table/InlineEditingDSL"); }); - let propPaneBack = "[data-testid='t--property-pane-back-btn']"; - it("1. should check that onDiscard event is working", () => { cy.openPropertyPane("tablewidgetv2"); table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); @@ -51,7 +49,7 @@ describe( it("2. should check that inline editing works with text wrapping disabled", () => { agHelper.AddDsl("Table/InlineEditingDSL"); cy.openPropertyPane("tablewidgetv2"); - table.toggleColumnEditableViaColSettingsPane("step", "v2", false, true); + table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); cy.editTableCell(0, 0); cy.get( "[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input", @@ -71,13 +69,16 @@ describe( ).should("not.be.disabled"); }); - it("4. should check that doesn't grow taller when text wrapping is disabled", () => { + it("4. should check that cell column height doesn't grow taller when text wrapping is disabled", () => { + const DEFAULT_NON_WRAP_CELL_COLUMN_HEIGHT = 29; EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - table.EnableEditableOfColumn("step"); + table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); table.EditTableCell(0, 0, "", false); agHelper.GetHeight(table._editCellEditor); cy.get("@eleHeight").then(($initiaHeight) => { - expect(Number($initiaHeight)).to.eq(28); + expect(Number($initiaHeight.toFixed())).to.eq( + DEFAULT_NON_WRAP_CELL_COLUMN_HEIGHT, + ); table.EditTableCell( 1, 0, @@ -91,9 +92,10 @@ describe( }); }); - it("5. should check that grows taller when text wrapping is enabled", () => { + it("5. should check that cell column height grows taller when text wrapping is enabled", () => { + const MIN_WRAP_CELL_COLUMN_HEIGHT = 34; EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - table.EnableEditableOfColumn("step"); + table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); table.EditColumn("step"); propPane.TogglePropertyState("Cell Wrapping", "On"); table.EditTableCell( @@ -104,7 +106,9 @@ describe( ); agHelper.GetHeight(table._editCellEditor); cy.get("@eleHeight").then(($newHeight) => { - expect(Number($newHeight)).to.be.greaterThan(34); + expect(Number($newHeight)).to.be.greaterThan( + MIN_WRAP_CELL_COLUMN_HEIGHT, + ); }); }); @@ -130,7 +134,7 @@ describe( cy.openPropertyPane("tablewidgetv2"); - table.toggleColumnEditableViaColSettingsPane("step", "v2", false, true); + table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); cy.wait(1000); // case 2: check if updatedRowIndex is 0, when cell at row 0 is updated. @@ -175,7 +179,7 @@ describe( ); EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - table.EnableEditableOfColumn("step"); + table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); agHelper.GetNClick(table._updateMode("Multi"), 0, false, 1000); // case 1: check if updatedRowIndex is 0, when cell at row 0 is updated. From 71adba8d4298a54c447e76626713b438a3d73e9e Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Mon, 5 Aug 2024 17:23:22 +0100 Subject: [PATCH 2/6] add Inline_editing_2_spec.js to limited-tests --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index 31c0c0253fef..a13fe3e3f662 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js +cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* From 41cd2e74c5788e1917f0d33263dc575649b288e7 Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Mon, 5 Aug 2024 18:31:07 +0100 Subject: [PATCH 3/6] update DEFAULT_NON_WRAP_CELL_COLUMN_HEIGHT value --- .../ClientSide/Widgets/TableV2/Inline_editing_2_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js index 6131a348b6e2..bf7f181b9bda 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js @@ -70,7 +70,7 @@ describe( }); it("4. should check that cell column height doesn't grow taller when text wrapping is disabled", () => { - const DEFAULT_NON_WRAP_CELL_COLUMN_HEIGHT = 29; + const DEFAULT_NON_WRAP_CELL_COLUMN_HEIGHT = 28; EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); table.EditTableCell(0, 0, "", false); From ccf6b958f0583bc838e14006ea83735ff75f87ed Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Tue, 6 Aug 2024 11:54:51 +0100 Subject: [PATCH 4/6] revert limited-tests.txt change --- app/client/cypress/limited-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/client/cypress/limited-tests.txt b/app/client/cypress/limited-tests.txt index a13fe3e3f662..31c0c0253fef 100644 --- a/app/client/cypress/limited-tests.txt +++ b/app/client/cypress/limited-tests.txt @@ -1,5 +1,5 @@ # To run only limited tests - give the spec names in below format: -cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js +cypress/e2e/Regression/ClientSide/Templates/Fork_Template_spec.js # For running all specs - uncomment below: #cypress/e2e/**/**/* From 83caf578f5b2aa3f2d36921ee2d40316715e883e Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Tue, 6 Aug 2024 18:32:19 +0100 Subject: [PATCH 5/6] remove redundant cy.wait --- .../ClientSide/Widgets/TableV2/Inline_editing_2_spec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js index bf7f181b9bda..89d02428d171 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js @@ -135,7 +135,6 @@ describe( cy.openPropertyPane("tablewidgetv2"); table.toggleColumnEditableViaColSettingsPane("step", "v2", true, true); - cy.wait(1000); // case 2: check if updatedRowIndex is 0, when cell at row 0 is updated. cy.editTableCell(0, 0); @@ -153,7 +152,6 @@ describe( cy.get(commonlocators.textWidgetContainer).should("contain.text", -1); // case 5: check if the updatedRowIndex changes to -1 when the table data changes. - cy.wait(1000); cy.editTableCell(0, 2); cy.enterTableCellValue(0, 2, "#14").type("{enter}"); cy.openPropertyPane("tablewidgetv2"); @@ -194,7 +192,6 @@ describe( cy.get(commonlocators.textWidgetContainer).should("contain.text", -1); // case 3: check if the updatedRowIndex changes to -1 when the table data changes. - cy.wait(1000); table.EditTableCell(2, 0, "#14"); cy.get(commonlocators.textWidgetContainer).should("contain.text", 2); cy.openPropertyPane("tablewidgetv2"); From 83116d9c64f95946ab0ba7399c7e1c491f2d2851 Mon Sep 17 00:00:00 2001 From: Jacques Ikot Date: Fri, 9 Aug 2024 12:00:42 +0100 Subject: [PATCH 6/6] swap DragDropNVerify for dragAndDropToCanvas in 7 test case --- .../ClientSide/Widgets/TableV2/Inline_editing_2_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js index 89d02428d171..b8ab5ef942ee 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Inline_editing_2_spec.js @@ -161,13 +161,13 @@ describe( }); it("7. should check if updatedRowIndex is getting updated for multi row update mode", () => { - entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 400, 400); + cy.dragAndDropToCanvas("textwidget", { x: 400, y: 400 }); cy.get(".t--widget-textwidget").should("exist"); cy.updateCodeInput( ".t--property-control-text", `{{Table1.updatedRowIndex}}`, ); - entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 300, 300); + cy.dragAndDropToCanvas("buttonwidget", { x: 300, y: 300 }); cy.get(".t--widget-buttonwidget").should("exist"); cy.get(PROPERTY_SELECTOR.onClick).find(".t--js-toggle").click(); cy.updateCodeInput(".t--property-control-label", "Reset");