Refactor wait logic in assertCodePaneLineCount

seek-oss · May 22, 2024 · a176e49 · a176e49
1 parent ea02d95
commit a176e49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/cypress/e2e/snippets.cy.ts b/cypress/e2e/snippets.cy.ts
@@ -72,7 +72,7 @@ describe('Snippets', () => {
     assertSnippetsSearchFieldIsVisible();
     assertCodePaneLineCount(8);
     filterSnippets('{esc}');
-    assertCodePaneLineCount(1, 500);
+    assertCodePaneLineCount(1, true);
     typeCode(`${isMac() ? '{cmd}' : '{ctrl}'}k`);
     assertSnippetsSearchFieldIsVisible();
     assertCodePaneLineCount(8);
@@ -89,7 +89,7 @@ describe('Snippets', () => {
     // Close without persisting
     filterSnippets('{esc}');
     assertCodePaneContains('<div>Initial <span>code</span></div>');
-    assertCodePaneLineCount(1, 500);
+    assertCodePaneLineCount(1, true);
 
     // Re-open and persist
     typeCode(`${isMac() ? '{cmd}' : '{ctrl}'}k`);

diff --git a/cypress/support/utils.ts b/cypress/support/utils.ts
@@ -6,6 +6,8 @@ import { createUrl } from '../../utils';
 import { isMac } from '../../src/utils/formatting';
 import type { Direction } from '../../src/Playroom/CodeEditor/keymaps/types';
 
+const CYPRESS_DEFAULT_WAIT_TIME = 500;
+
 export const cmdPlus = (keyCombo: string) => {
   const platformSpecificKey = isMac() ? 'cmd' : 'ctrl';
   return `${platformSpecificKey}+${keyCombo}`;
@@ -133,14 +135,17 @@ export const assertCodePaneContains = (text: string) => {
   });
 };
 
-export const assertCodePaneLineCount = (lines: number, wait?: number) => {
+export const assertCodePaneLineCount = (
+  lines: number,
+  wait: boolean = false
+) => {
   getCodeEditor().within(() =>
     cy.get('.CodeMirror-line').should('have.length', lines)
   );
 
   // Wait after check to ensure original focus is restored
   if (wait) {
-    cy.wait(wait);
+    cy.wait(CYPRESS_DEFAULT_WAIT_TIME); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
   }
 };
 
@@ -179,15 +184,15 @@ const typeInSearchField = (text: string) =>
 
 export const findInCode = (term: string) => {
   // Wait necessary to ensure code pane is focussed
-  cy.wait(500); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
+  cy.wait(CYPRESS_DEFAULT_WAIT_TIME); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
   typeCode(`{${cmdPlus('f')}}`);
 
   typeInSearchField(`${term}{enter}`);
 };
 
 export const replaceInCode = (term: string, replaceWith?: string) => {
   // Wait necessary to ensure code pane is focussed
-  cy.wait(500); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
+  cy.wait(CYPRESS_DEFAULT_WAIT_TIME); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
   typeCode(`{${cmdPlus('alt+f')}}`);
   typeInSearchField(`${term}{enter}`);
   if (replaceWith) {
@@ -197,7 +202,7 @@ export const replaceInCode = (term: string, replaceWith?: string) => {
 
 export const jumpToLine = (line: number | string) => {
   // Wait necessary to ensure code pane is focussed
-  cy.wait(500); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
+  cy.wait(CYPRESS_DEFAULT_WAIT_TIME); // eslint-disable-line @finsit/cypress/no-unnecessary-waiting
   typeCode(`{${cmdPlus('g')}}`);
   typeCode(`${line}{enter}`);
 };