jam411 пре 3 година
родитељ
комит
91810e177f

+ 1 - 1
packages/app/src/components/Navbar/GrowiNavbar.tsx

@@ -66,7 +66,7 @@ const NavbarRight = memo((): JSX.Element => {
           <AppearanceModeDropdown isAuthenticated={isAuthenticated} />
         </li>
 
-        <li className="grw-personal-dropdown nav-item dropdown dropdown-toggle dropdown-toggle-no-caret">
+        <li className="grw-personal-dropdown nav-item dropdown dropdown-toggle dropdown-toggle-no-caret" data-testid="grw-personal-dropdown">
           <PersonalDropdown />
         </li>
       </>

+ 1 - 1
packages/app/src/components/TrashPageList.tsx

@@ -75,7 +75,7 @@ export const TrashPageList: FC = () => {
   }, [t]);
 
   return (
-    <div id="trash-page-list" className="mt-5 d-edit-none">
+    <div data-testid="trash-page-list" className="mt-5 d-edit-none">
       <CustomNavAndContents navTabMapping={navTabMapping} navRightElement={emptyTrashButton} />
     </div>
   );

+ 1 - 1
packages/app/src/pages/tags.page.tsx

@@ -63,7 +63,7 @@ const TagPage: NextPage<CommonProps> = (props: Props) => {
       <Head>
       </Head>
       <BasicLayout title={useCustomTitle(props, 'GROWI')} className={classNames.join(' ')}>
-        <div className="grw-container-convertible mb-5 pb-5" id="tags-page">
+        <div className="grw-container-convertible mb-5 pb-5" data-testid="tags-page">
           <h2 className="my-3">{`${t('Tags')}(${totalCount})`}</h2>
           <div className="px-3 mb-5 text-center">
             <TagCloudBox tags={tagData} minSize={20} />

+ 2 - 2
packages/app/test/cypress/integration/20-basic-features/access-to-page.spec.ts

@@ -93,7 +93,7 @@ context('Access to special pages', () => {
 
   it('/trash is successfully loaded', () => {
     cy.visit('/trash', {  });
-    cy.get('#trash-page-list').should('be.visible');
+    cy.getByTestid('trash-page-list', { timeout: 10000 }).should('be.visible');
     cy.screenshot(`${ssPrefix}-trash`);
   });
 
@@ -109,7 +109,7 @@ context('Access to special pages', () => {
     cy.getByTestid('grw-tags-list').should('be.visible');
     cy.getByTestid('grw-tags-list').contains('You have no tag, You can set tags on pages');
 
-    cy.get('#tags-page').should('be.visible');
+    cy.getByTestid('tags-page', { timeout: 10000 }).should('be.visible');
     cy.screenshot(`${ssPrefix}-tags`);
   });
 

+ 7 - 9
packages/app/test/cypress/integration/21-basic-features-for-guest/access-to-page.spec.ts

@@ -11,8 +11,8 @@ context('Access to page by guest', () => {
     cy.visit('/Sandbox#Headers');
     cy.collapseSidebar(true, true);
 
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(500);
+    // // eslint-disable-next-line cypress/no-unnecessary-waiting
+    // cy.wait(500);
 
     // hide fab // disable fab for sticky-events warning
     // cy.getByTestid('grw-fab-container').invoke('attr', 'style', 'display: none');
@@ -24,14 +24,12 @@ context('Access to page by guest', () => {
     cy.visit('/Sandbox/Math');
     cy.collapseSidebar(true, true);
 
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(2000); // wait for 2 seconds for renderer
+    // // eslint-disable-next-line cypress/no-unnecessary-waiting
+    // cy.wait(2000); // wait for 2 seconds for renderer
 
-    cy.get('.wiki').within(() => {
+    cy.get('.wiki', { timeout: 2000 }).within(() => {
       cy.get('.math').should('be.visible');
     }).screenshot(`${ssPrefix}-sandbox-math`);
-    // cy.get('.math').should('be.visible');
-    // cy.get('.katex-html').should('be.visible');
   });
 
   it('/Sandbox with edit is successfully loaded', () => {
@@ -69,7 +67,7 @@ context('Access to special pages by guest', () => {
   it('/trash is successfully loaded', () => {
     cy.visit('/trash', {  });
     cy.collapseSidebar(true, true);
-    cy.get('#trash-page-list').should('be.visible');
+    cy.getByTestid('trash-page-list', { timeout: 10000 }).should('be.visible');
     cy.screenshot(`${ssPrefix}-trash`);
   });
 
@@ -84,7 +82,7 @@ context('Access to special pages by guest', () => {
     cy.getByTestid('grw-tags-list').should('be.visible');
     cy.getByTestid('grw-tags-list').contains('You have no tag, You can set tags on pages');
 
-    cy.get('#tags-page').should('be.visible');
+    cy.getByTestid('tags-page', { timeout: 10000 }).should('be.visible');
     cy.screenshot(`${ssPrefix}-tags`);
   });