PromucFlow_constructor/app/client/cypress/e2e/Regression/ClientSide/Git
NandanAnantharamu 1a0889e035
test: fix failing gitsync tests (#34214)
RCA:
Test was failing because of hard wait
Also the dropdown element which was being clicked was failing

Solution:
Removed hard waits and replaced with intercept
Updated locator and better method to fix tests

EE PR: https://github.com/appsmithorg/appsmith-ee/pull/4413

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Updated the method for merging changes to the master branch in Git
sync tests for improved reliability.
  
- **Tests**
- Revised Cypress test configurations and spec names for better
organization and clarity.
- Enhanced the `CheckMergeConflicts` method to improve test accuracy and
reliability by including element visibility checks and network status
assertions.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2024-06-13 14:05:22 +05:30
..
ExistingApps/v1.9.24 fix: table version changed for crud (#29457) 2023-12-29 17:49:20 +05:30
GitDiscardChange chore: Make pages section into a dropdown (#32486) 2024-04-18 16:04:38 +05:30
GitImport test:PartialExport_Widgets spec file updated and import app method updated with validations (#33343) 2024-05-10 19:20:40 +05:30
GitSync test: fix failing gitsync tests (#34214) 2024-06-13 14:05:22 +05:30
GitWithAutoLayout chore: Make pages section into a dropdown (#32486) 2024-04-18 16:04:38 +05:30
GitWithJSLibrary test: Cypress - added @tag.excludeForAirgap, @tag.Templates tags (#29790) 2023-12-27 16:50:36 +05:30
GitWithTheming test: Some cleanup for Git Cypress tests (#32836) 2024-04-23 10:01:14 +05:30