Yuki Takei 1 год назад
Родитель
Сommit
a9d3875890

+ 1 - 1
apps/app/src/components/Common/Dropdown/PageItemControl.spec.tsx

@@ -28,7 +28,7 @@ describe('PageItemControl.tsx', () => {
     render(<PageItemControl {...props} />);
     render(<PageItemControl {...props} />);
 
 
     // when
     // when
-    const openPageMoveRenameModalButton = screen.getByTestId('open-page-move-rename-modal-btn');
+    const openPageMoveRenameModalButton = screen.getByTestId('rename-page-btn');
     await waitFor(() => userEvent.click(openPageMoveRenameModalButton, { pointerEventsCheck: PointerEventsCheckLevel.Never }));
     await waitFor(() => userEvent.click(openPageMoveRenameModalButton, { pointerEventsCheck: PointerEventsCheckLevel.Never }));
 
 
     // then
     // then

+ 1 - 1
apps/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -180,7 +180,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
         { !forceHideMenuItems?.includes(MenuItemType.RENAME) && isEnableActions && !isReadOnlyUser && pageInfo.isMovable && (
         { !forceHideMenuItems?.includes(MenuItemType.RENAME) && isEnableActions && !isReadOnlyUser && pageInfo.isMovable && (
           <DropdownItem
           <DropdownItem
             onClick={renameItemClickedHandler}
             onClick={renameItemClickedHandler}
-            data-testid="open-page-move-rename-modal-btn"
+            data-testid="rename-page-btn"
             className="grw-page-control-dropdown-item"
             className="grw-page-control-dropdown-item"
           >
           >
             <span className="material-symbols-outlined me-1 grw-page-control-dropdown-icon">redo</span>
             <span className="material-symbols-outlined me-1 grw-page-control-dropdown-icon">redo</span>

+ 1 - 1
apps/app/src/components/Common/SubmittableInput/AutosizeSubmittableInput.tsx

@@ -25,6 +25,6 @@ export const AutosizeSubmittableInput = (props: SubmittableInputProps<AutosizeIn
   const submittableProps = useSubmittable(props);
   const submittableProps = useSubmittable(props);
 
 
   return (
   return (
-    <AutosizeInput {...submittableProps} />
+    <AutosizeInput {...submittableProps} data-testid="autosize-submittable-input" />
   );
   );
 };
 };

+ 1 - 1
apps/app/test/cypress/e2e/20-basic-features/20-basic-features--access-to-page.cy.ts

@@ -227,7 +227,7 @@ context('Access to Template Editing Mode', () => {
       });
       });
     });
     });
     cy.get('@pagetreeItem').within(() => {
     cy.get('@pagetreeItem').within(() => {
-      cy.getByTestid('closable-text-input').type(newPagePath).type('{enter}');
+      cy.getByTestid('autosize-submittable-input').type(newPagePath).type('{enter}');
     })
     })
 
 
     cy.visit(`/${parentPagePath}/${newPagePath}`);
     cy.visit(`/${parentPagePath}/${newPagePath}`);

+ 1 - 1
apps/app/test/cypress/e2e/20-basic-features/20-basic-features--use-tools.cy.ts

@@ -73,7 +73,7 @@ context('Modal for page operation', () => {
       return cy.getByTestid('page-item-control-menu').then($elem => $elem.is(':visible'))
       return cy.getByTestid('page-item-control-menu').then($elem => $elem.is(':visible'))
     });
     });
 
 
-    cy.getByTestid('open-page-move-rename-modal-btn').filter(':visible').click({force: true});
+    cy.getByTestid('rename-page-btn').filter(':visible').click({force: true});
     cy.getByTestid('grw-page-rename-button').should('be.disabled');
     cy.getByTestid('grw-page-rename-button').should('be.disabled');
 
 
     cy.getByTestid('page-rename-modal').should('be.visible').screenshot(`${ssPrefix}-rename-bootstrap5`);
     cy.getByTestid('page-rename-modal').should('be.visible').screenshot(`${ssPrefix}-rename-bootstrap5`);

+ 1 - 1
apps/app/test/cypress/e2e/30-search/30-search--search.cy.ts

@@ -349,7 +349,7 @@ context('Search and use', () => {
 
 
   it('Successfully open move/rename modal', () => {
   it('Successfully open move/rename modal', () => {
     cy.get('.dropdown-menu.show').should('be.visible').within(() => {
     cy.get('.dropdown-menu.show').should('be.visible').within(() => {
-      cy.getByTestid('open-page-move-rename-modal-btn').click({force: true});
+      cy.getByTestid('rename-page-btn').click({force: true});
     });
     });
     cy.getByTestid('page-rename-modal').should('be.visible').within(() => {
     cy.getByTestid('page-rename-modal').should('be.visible').within(() => {
       cy.screenshot(`${ssPrefix}4-move-rename-page`);
       cy.screenshot(`${ssPrefix}4-move-rename-page`);

+ 17 - 15
apps/app/test/cypress/e2e/50-sidebar/50-sidebar--access-to-side-bar.cy.ts

@@ -69,12 +69,12 @@ describe('Access to sidebar', () => {
           });
           });
         });
         });
 
 
-        it.only('Successfully click Add to Bookmarks button', () => {
+        it('Successfully click Add to Bookmarks button', () => {
           cy.waitUntil(() => {
           cy.waitUntil(() => {
             // do
             // do
             cy.getByTestid('grw-sidebar-contents').within(() => {
             cy.getByTestid('grw-sidebar-contents').within(() => {
-              cy.getByTestid('grw-pagetree-item-container').first().within(() => {
-                cy.get('li').first().realHover();
+              cy.getByTestid('grw-pagetree-item-container').eq(1).within(() => { // against the second element
+                cy.get('li').realHover();
                 cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
                 cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
               });
               });
             });
             });
@@ -92,8 +92,8 @@ describe('Access to sidebar', () => {
           cy.waitUntil(() => {
           cy.waitUntil(() => {
             // do
             // do
             cy.getByTestid('grw-sidebar-contents').within(() => {
             cy.getByTestid('grw-sidebar-contents').within(() => {
-              cy.getByTestid('grw-pagetree-item-container').first().within(() => {
-                cy.get('li').first().realHover();
+              cy.getByTestid('grw-pagetree-item-container').eq(1).within(() => { // against the second element
+                cy.get('li').realHover();
                 cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
                 cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
               });
               });
             });
             });
@@ -108,8 +108,9 @@ describe('Access to sidebar', () => {
           cy.waitUntil(() => {
           cy.waitUntil(() => {
             // do
             // do
             cy.getByTestid('grw-sidebar-contents').within(() => {
             cy.getByTestid('grw-sidebar-contents').within(() => {
-              cy.get('.grw-pagetree-item-children').first().as('pagetreeItem').within(() => {
-                cy.getByTestid('open-page-item-control-btn').find('button').first().invoke('css','display','block').click()
+              cy.getByTestid('grw-pagetree-item-container').eq(1).within(() => { // against the second element
+                cy.get('li').realHover();
+                cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
               });
               });
             });
             });
             // wait until
             // wait until
@@ -133,20 +134,20 @@ describe('Access to sidebar', () => {
           cy.waitUntil(() => {
           cy.waitUntil(() => {
             // do
             // do
             cy.getByTestid('grw-sidebar-contents').within(() => {
             cy.getByTestid('grw-sidebar-contents').within(() => {
-              cy.get('.grw-pagetree-item-children').first().as('pagetreeItem').within(() => {
-                cy.getByTestid('open-page-item-control-btn').find('button').first().invoke('css','display','block').click()
+              cy.getByTestid('grw-pagetree-item-container').eq(1).as('pagetreeItem').within(() => { // against the second element
+                cy.get('li').realHover();
+                cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
               });
               });
             });
             });
             // wait until
             // wait until
             return cy.get('.dropdown-menu.show').then($elem => $elem.is(':visible'));
             return cy.get('.dropdown-menu.show').then($elem => $elem.is(':visible'));
           });
           });
 
 
-          cy.get('.dropdown-menu.show').within(() => {
-            cy.getByTestid('open-page-move-rename-modal-btn').should('be.visible').click();
-          });
+          cy.getByTestid('page-item-control-menu').should('have.class', 'show')
+          cy.getByTestid('rename-page-btn').click();
 
 
           cy.get('@pagetreeItem').within(() => {
           cy.get('@pagetreeItem').within(() => {
-            cy.getByTestid('closable-text-input').type('_newname');
+            cy.getByTestid('autosize-submittable-input').type('_newname');
           })
           })
 
 
           cy.screenshot(`${ssPrefix}page-tree-6-rename-page`, { blackout: blackoutOverride });
           cy.screenshot(`${ssPrefix}page-tree-6-rename-page`, { blackout: blackoutOverride });
@@ -156,8 +157,9 @@ describe('Access to sidebar', () => {
           cy.waitUntil(() => {
           cy.waitUntil(() => {
             // do
             // do
             cy.getByTestid('grw-sidebar-contents').within(() => {
             cy.getByTestid('grw-sidebar-contents').within(() => {
-              cy.get('.grw-pagetree-item-children').first().as('pagetreeItem').within(() => {
-                cy.getByTestid('open-page-item-control-btn').find('button').first().invoke('css','display','block').click()
+              cy.getByTestid('grw-pagetree-item-container').eq(1).within(() => { // against the second element
+                cy.get('li').realHover();
+                cy.getByTestid('open-page-item-control-btn').find('button').first().realClick();
               });
               });
             });
             });
             // wait until
             // wait until