From 35cd104f80fc61f51ab11a831f8dd11639f190c3 Mon Sep 17 00:00:00 2001 From: spaenleh Date: Fri, 26 Jan 2024 13:27:20 +0100 Subject: [PATCH] fix: remove waits --- cypress/e2e/item/create/createShortcut.cy.ts | 1 - cypress/e2e/item/delete/gridRecycleItem.cy.ts | 1 - cypress/e2e/item/delete/listDeleteItem.cy.ts | 1 - cypress/e2e/item/delete/listDeleteItems.cy.ts | 1 - cypress/e2e/item/delete/listRecycleItem.cy.ts | 2 -- .../e2e/item/delete/listRecycleItems.cy.ts | 2 -- cypress/e2e/item/edit/editFolder.cy.ts | 8 +------- cypress/e2e/item/favorite/favoriteItem.cy.ts | 5 +---- cypress/e2e/item/home/home.cy.ts | 20 ++++++++----------- cypress/e2e/item/move/listMoveItem.cy.ts | 5 +---- cypress/e2e/item/move/listMoveMultiple.cy.ts | 3 --- cypress/e2e/item/pin/pinItem.cy.ts | 5 +---- cypress/support/commands/navigation.ts | 7 +------ cypress/support/constants.ts | 1 - cypress/support/editUtils.ts | 5 +---- 15 files changed, 14 insertions(+), 53 deletions(-) diff --git a/cypress/e2e/item/create/createShortcut.cy.ts b/cypress/e2e/item/create/createShortcut.cy.ts index 11c4c0c11..e2212f1f0 100644 --- a/cypress/e2e/item/create/createShortcut.cy.ts +++ b/cypress/e2e/item/create/createShortcut.cy.ts @@ -43,7 +43,6 @@ const createShortcutInList = ({ id: string; toItemPath?: string; }) => { - // cy.wait(TABLE_ITEM_RENDER_TIME); const menuSelector = `#${buildItemMenuButtonId(id)}`; cy.get(menuSelector).click(); createShortcut({ id, toItemPath }); diff --git a/cypress/e2e/item/delete/gridRecycleItem.cy.ts b/cypress/e2e/item/delete/gridRecycleItem.cy.ts index de4c46e46..cad6bbe70 100644 --- a/cypress/e2e/item/delete/gridRecycleItem.cy.ts +++ b/cypress/e2e/item/delete/gridRecycleItem.cy.ts @@ -9,7 +9,6 @@ import { SAMPLE_ITEMS } from '../../../fixtures/items'; const recycleItem = (id: string) => { const menuSelector = `#${buildItemMenuButtonId(id)}`; - // cy.wait(TABLE_ITEM_RENDER_TIME); cy.get(menuSelector).click(); cy.get(`#${buildItemMenu(id)} .${ITEM_MENU_RECYCLE_BUTTON_CLASS}`).click(); }; diff --git a/cypress/e2e/item/delete/listDeleteItem.cy.ts b/cypress/e2e/item/delete/listDeleteItem.cy.ts index ed72b0d00..ea0e814a8 100644 --- a/cypress/e2e/item/delete/listDeleteItem.cy.ts +++ b/cypress/e2e/item/delete/listDeleteItem.cy.ts @@ -8,7 +8,6 @@ import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { RECYCLED_ITEM_DATA, SAMPLE_ITEMS } from '../../../fixtures/items'; const deleteItem = (id: string) => { - // cy.wait(TABLE_ITEM_RENDER_TIME); cy.get( `${buildItemsTableRowIdAttribute(id)} .${ITEM_DELETE_BUTTON_CLASS}`, ).click(); diff --git a/cypress/e2e/item/delete/listDeleteItems.cy.ts b/cypress/e2e/item/delete/listDeleteItems.cy.ts index 5b88f928c..38607729d 100644 --- a/cypress/e2e/item/delete/listDeleteItems.cy.ts +++ b/cypress/e2e/item/delete/listDeleteItems.cy.ts @@ -10,7 +10,6 @@ import { RECYCLED_ITEM_DATA, SAMPLE_ITEMS } from '../../../fixtures/items'; const deleteItems = (itemIds: string[]) => { // check selected ids itemIds.forEach((id) => { - // cy.wait(TABLE_ITEM_RENDER_TIME); cy.get(`${buildItemsTableRowIdAttribute(id)} .ag-checkbox-input`).click(); }); diff --git a/cypress/e2e/item/delete/listRecycleItem.cy.ts b/cypress/e2e/item/delete/listRecycleItem.cy.ts index 7ee4d71a2..74e24ce72 100644 --- a/cypress/e2e/item/delete/listRecycleItem.cy.ts +++ b/cypress/e2e/item/delete/listRecycleItem.cy.ts @@ -6,11 +6,9 @@ import { } from '../../../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { SAMPLE_ITEMS } from '../../../fixtures/items'; -import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants'; const recycleItem = (id: string) => { const menuSelector = `#${buildItemMenuButtonId(id)}`; - cy.wait(TABLE_ITEM_RENDER_TIME); cy.get(menuSelector).click(); cy.get(`#${buildItemMenu(id)} .${ITEM_MENU_RECYCLE_BUTTON_CLASS}`).click(); }; diff --git a/cypress/e2e/item/delete/listRecycleItems.cy.ts b/cypress/e2e/item/delete/listRecycleItems.cy.ts index d9e220c65..17e8ee0a5 100644 --- a/cypress/e2e/item/delete/listRecycleItems.cy.ts +++ b/cypress/e2e/item/delete/listRecycleItems.cy.ts @@ -5,12 +5,10 @@ import { } from '../../../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { SAMPLE_ITEMS } from '../../../fixtures/items'; -import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants'; const recycleItems = (itemIds: string[]) => { // check selected ids itemIds.forEach((id) => { - cy.wait(TABLE_ITEM_RENDER_TIME); cy.get(`${buildItemsTableRowIdAttribute(id)} .ag-checkbox-input`).click(); }); diff --git a/cypress/e2e/item/edit/editFolder.cy.ts b/cypress/e2e/item/edit/editFolder.cy.ts index 7db603046..2765dd190 100644 --- a/cypress/e2e/item/edit/editFolder.cy.ts +++ b/cypress/e2e/item/edit/editFolder.cy.ts @@ -5,10 +5,7 @@ import { } from '../../../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { EDITED_FIELDS, SAMPLE_ITEMS } from '../../../fixtures/items'; -import { - EDIT_ITEM_PAUSE, - TABLE_ITEM_RENDER_TIME, -} from '../../../support/constants'; +import { EDIT_ITEM_PAUSE } from '../../../support/constants'; import { editItem } from '../../../support/editUtils'; describe('Edit Folder', () => { @@ -35,9 +32,6 @@ describe('Edit Folder', () => { cy.setUpApi(SAMPLE_ITEMS); cy.visit(HOME_PATH); - // wait for the render - cy.wait(TABLE_ITEM_RENDER_TIME); - // click edit button const itemId = SAMPLE_ITEMS.items[0].id; cy.get(`#${buildEditButtonId(itemId)}`).click(); diff --git a/cypress/e2e/item/favorite/favoriteItem.cy.ts b/cypress/e2e/item/favorite/favoriteItem.cy.ts index 20fe27d34..9d745b473 100644 --- a/cypress/e2e/item/favorite/favoriteItem.cy.ts +++ b/cypress/e2e/item/favorite/favoriteItem.cy.ts @@ -10,12 +10,9 @@ import { } from '../../../../src/config/selectors'; import { SAMPLE_FAVORITE, SAMPLE_ITEMS } from '../../../fixtures/items'; import { CURRENT_USER } from '../../../fixtures/members'; -import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants'; const toggleFavoriteButton = (itemId: string) => { - cy.wait(TABLE_ITEM_RENDER_TIME); - const menuSelector = `#${buildItemMenuButtonId(itemId)}`; - cy.get(menuSelector).click(); + cy.get(`#${buildItemMenuButtonId(itemId)}`).click(); cy.get(`#${buildItemMenu(itemId)} .${FAVORITE_ITEM_BUTTON_CLASS}`).click(); }; diff --git a/cypress/e2e/item/home/home.cy.ts b/cypress/e2e/item/home/home.cy.ts index 84ba3cb59..1cea9e343 100644 --- a/cypress/e2e/item/home/home.cy.ts +++ b/cypress/e2e/item/home/home.cy.ts @@ -16,10 +16,7 @@ import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { BUILDER } from '../../../../src/langs/constants'; import { SAMPLE_ITEMS, generateOwnItems } from '../../../fixtures/items'; import { CURRENT_USER } from '../../../fixtures/members'; -import { - NAVIGATION_LOAD_PAUSE, - TABLE_ITEM_RENDER_TIME, -} from '../../../support/constants'; +import { NAVIGATION_LOAD_PAUSE } from '../../../support/constants'; import { ItemForTest } from '../../../support/types'; const translateBuilder = (key: string) => @@ -82,6 +79,7 @@ describe('Home', () => { cy.wait('@getAccessibleItems') .its('request.url') .should('contain', 'page=1'); + cy.get(`#${buildItemCard(sampleItems[0].id)}`).should('be.visible'); cy.wait('@getAccessibleItems') .its('request.url') .should('contain', searchText); @@ -150,14 +148,12 @@ describe('Home', () => { cy.goToItemInGrid(childId); // should get children - cy.wait('@getChildren', { timeout: TABLE_ITEM_RENDER_TIME }).then( - ({ response: { body } }) => { - // check item is created and displayed - for (const item of body) { - cy.get(`#${buildItemCard(item.id)}`).should('exist'); - } - }, - ); + cy.wait('@getChildren').then(({ response: { body } }) => { + // check item is created and displayed + for (const item of body) { + cy.get(`#${buildItemCard(item.id)}`).should('exist'); + } + }); // root title cy.get(`#${NAVIGATION_ROOT_ID}`).contains( diff --git a/cypress/e2e/item/move/listMoveItem.cy.ts b/cypress/e2e/item/move/listMoveItem.cy.ts index 46f48a4e1..7c9198613 100644 --- a/cypress/e2e/item/move/listMoveItem.cy.ts +++ b/cypress/e2e/item/move/listMoveItem.cy.ts @@ -8,12 +8,9 @@ import { } from '../../../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { SAMPLE_ITEMS } from '../../../fixtures/items'; -import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants'; const openMoveModal = ({ id: movedItemId }: { id: string }) => { - const menuSelector = `#${buildItemMenuButtonId(movedItemId)}`; - cy.wait(TABLE_ITEM_RENDER_TIME); - cy.get(menuSelector).click(); + cy.get(`#${buildItemMenuButtonId(movedItemId)}`).click(); cy.get( `#${buildItemMenu(movedItemId)} .${ITEM_MENU_MOVE_BUTTON_CLASS}`, ).click(); diff --git a/cypress/e2e/item/move/listMoveMultiple.cy.ts b/cypress/e2e/item/move/listMoveMultiple.cy.ts index 89672cd7f..1d96e6f21 100644 --- a/cypress/e2e/item/move/listMoveMultiple.cy.ts +++ b/cypress/e2e/item/move/listMoveMultiple.cy.ts @@ -5,7 +5,6 @@ import { } from '../../../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { SAMPLE_ITEMS } from '../../../fixtures/items'; -import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants'; const moveItems = ({ itemIds, @@ -16,11 +15,9 @@ const moveItems = ({ }) => { // check selected ids itemIds.forEach((id) => { - cy.wait(TABLE_ITEM_RENDER_TIME); cy.get(`${buildItemsTableRowIdAttribute(id)} input`).click(); }); - cy.wait(TABLE_ITEM_RENDER_TIME); cy.get(`#${ITEMS_TABLE_MOVE_SELECTED_ITEMS_ID}`).click(); cy.handleTreeMenu(toItemPath); }; diff --git a/cypress/e2e/item/pin/pinItem.cy.ts b/cypress/e2e/item/pin/pinItem.cy.ts index 37ccf0156..fb144f498 100644 --- a/cypress/e2e/item/pin/pinItem.cy.ts +++ b/cypress/e2e/item/pin/pinItem.cy.ts @@ -6,12 +6,9 @@ import { } from '../../../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../../../src/enums'; import { ITEMS_SETTINGS, PINNED_ITEM } from '../../../fixtures/items'; -import { TABLE_ITEM_RENDER_TIME } from '../../../support/constants'; const togglePinButton = (itemId: string) => { - cy.wait(TABLE_ITEM_RENDER_TIME); - const menuSelector = `#${buildItemMenuButtonId(itemId)}`; - cy.get(menuSelector).click(); + cy.get(`#${buildItemMenuButtonId(itemId)}`).click(); cy.get(`#${buildItemMenu(itemId)} .${PIN_ITEM_BUTTON_CLASS}`).click(); }; diff --git a/cypress/support/commands/navigation.ts b/cypress/support/commands/navigation.ts index fcfeb6eb6..828804aae 100644 --- a/cypress/support/commands/navigation.ts +++ b/cypress/support/commands/navigation.ts @@ -4,11 +4,7 @@ import { buildItemLink, buildItemsTableRowIdAttribute, } from '../../../src/config/selectors'; -import { - NAVIGATE_PAUSE, - TABLE_ITEM_RENDER_TIME, - WAIT_FOR_ITEM_TABLE_ROW_TIME, -} from '../constants'; +import { NAVIGATE_PAUSE, WAIT_FOR_ITEM_TABLE_ROW_TIME } from '../constants'; Cypress.Commands.add('goToItemInGrid', (id) => { cy.wait(NAVIGATE_PAUSE); @@ -30,5 +26,4 @@ Cypress.Commands.add('goToHome', () => { Cypress.Commands.add('goToItemWithNavigation', (id) => { cy.wait(NAVIGATE_PAUSE); cy.get(`[href="${buildItemPath(id)}"]`).click(); - cy.wait(TABLE_ITEM_RENDER_TIME); }); diff --git a/cypress/support/constants.ts b/cypress/support/constants.ts index 6e8d5e1f6..1f000b1a0 100644 --- a/cypress/support/constants.ts +++ b/cypress/support/constants.ts @@ -20,7 +20,6 @@ export const REDIRECTION_TIME = 500; export const CAPTION_EDIT_PAUSE = 2000; export const ROW_HEIGHT = 48; -export const TABLE_ITEM_RENDER_TIME = 7000; export const TABLE_MEMBERSHIP_RENDER_TIME = 3000; export const FIXTURES_THUMBNAILS_FOLDER = './thumbnails'; export const CHATBOX_LOADING_TIME = 5000; diff --git a/cypress/support/editUtils.ts b/cypress/support/editUtils.ts index aa9823bff..1a6cf9fc6 100644 --- a/cypress/support/editUtils.ts +++ b/cypress/support/editUtils.ts @@ -8,7 +8,7 @@ import { buildEditButtonId, } from '../../src/config/selectors'; import { ITEM_LAYOUT_MODES } from '../../src/enums'; -import { CAPTION_EDIT_PAUSE, TABLE_ITEM_RENDER_TIME } from './constants'; +import { CAPTION_EDIT_PAUSE } from './constants'; // eslint-disable-next-line import/prefer-default-export // bug: use string for type to fit usage @@ -21,9 +21,6 @@ export const editItem = ( }, mode = DEFAULT_ITEM_LAYOUT_MODE, ): void => { - if (DEFAULT_ITEM_LAYOUT_MODE === ITEM_LAYOUT_MODES.LIST) { - cy.wait(TABLE_ITEM_RENDER_TIME); - } const { id, type } = payload; switch (mode) { case ITEM_LAYOUT_MODES.GRID: {