From c40b634185d3a552a86bf607f9665299fd47daaa Mon Sep 17 00:00:00 2001 From: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:12:09 +0530 Subject: [PATCH] fix: Fixing Anvil Section DnD Test cases. (#30995) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > Pull Request Template > > Use this template to quickly create a well written pull request. Delete all quotes before creating the pull request. > ## Description In this PR we are fixing the way events are dispatched and how position values are used to activate a section. This is still not set in stone as I need to write more utils based on alignment. but the current changes would be fail proof for the time being. #### PR fixes following issue(s) Fixes # (issue number) > if no issue exists, please create an issue and ask the maintainers about this first > > #### Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video > > #### Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] JUnit - [ ] Jest - [ ] Cypress > > #### Test Plan > Add Testsmith test cases links that relate to this PR > > #### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) > > > ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed ## Summary by CodeRabbit - **Refactor** - Improved app navigation settings and layout validation. - Enhanced widget placement accuracy on the ANVIL canvas. --- .../Anvil/AnvilAppNavigation_spec.ts | 49 ++++++------------- .../cypress/support/Pages/AnvilLayout.ts | 2 - 2 files changed, 14 insertions(+), 37 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts index 4ea0414f3c..ed3a2a4dad 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AnvilAppNavigation_spec.ts @@ -26,41 +26,20 @@ describe( agHelper.PressDelete(); }); it("1. Change App navigation settings and valdiate the layout settings", () => { - const mainCanvasId = `#${getAnvilCanvasId(MAIN_CONTAINER_WIDGET_ID)}`; - const paddingBetweenZoneAndMainCanvas = 35; - agHelper.AssertElementExist(mainCanvasId).then((mainCanvas) => { - const x = mainCanvas.position().left; - const y = mainCanvas.position().top; - anvilLayout.DragDropAnvilWidgetNVerify( - WIDGET.WDSINPUT, - x + 10, - y + paddingBetweenZoneAndMainCanvas, - { - skipWidgetSearch: true, - }, - ); - anvilLayout.DragDropAnvilWidgetNVerify( - WIDGET.WDSINPUT, - x + 10, - y + paddingBetweenZoneAndMainCanvas, - { - skipWidgetSearch: true, - dropTargetDetails: { - name: "Section1", - }, - }, - ); - anvilLayout.DragDropAnvilWidgetNVerify( - WIDGET.WDSBUTTON, - x + 10, - y + paddingBetweenZoneAndMainCanvas, - { - skipWidgetSearch: true, - dropTargetDetails: { - name: "Section1", - }, - }, - ); + anvilLayout.DragDropAnvilWidgetNVerify(WIDGET.WDSINPUT, 5, 20, { + skipWidgetSearch: true, + }); + anvilLayout.DragDropAnvilWidgetNVerify(WIDGET.WDSINPUT, 5, 20, { + skipWidgetSearch: true, + dropTargetDetails: { + name: "Zone1", + }, + }); + anvilLayout.DragDropAnvilWidgetNVerify(WIDGET.WDSBUTTON, 5, 20, { + skipWidgetSearch: true, + dropTargetDetails: { + name: "Zone1", + }, }); propPane.NavigateToPage("Page1", "onClick"); appSettings.OpenAppSettings(); diff --git a/app/client/cypress/support/Pages/AnvilLayout.ts b/app/client/cypress/support/Pages/AnvilLayout.ts index 4039395136..962d7e0826 100644 --- a/app/client/cypress/support/Pages/AnvilLayout.ts +++ b/app/client/cypress/support/Pages/AnvilLayout.ts @@ -55,8 +55,6 @@ export class AnvilLayout { // to activate ANVIL canvas .trigger("mousemove", left + xPos, top + yPos, { eventConstructor: "MouseEvent", - clientX: left + xPos, - clientY: top + yPos, force: true, }); this.agHelper.Sleep(200);