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
..
Apps	chore: unified way of writing messages in cypress (#33659)	2024-05-27 15:34:45 +02:00
ClientSide	test: fix failing gitsync tests (#34214)	2024-06-13 14:05:22 +05:30
Enterprise/AdminSettings	test: Updating the locator for upgrade button on admin settings (#33872)	2024-05-31 21:07:28 +05:30
ServerSide	test: ConnectionErrors_Spec.ts - created common error for connection failure (#34024)	2024-06-06 17:11:56 +05:30