Просмотр исходного кода

Merge pull request #6978 from weseek/support/normalize-brt-109445

support: Normalize VRT 109445
Yohei Shiina 3 лет назад
Родитель
Сommit
ea2c049ade

+ 3 - 3
packages/app/src/components/Navbar/PersonalDropdown.jsx

@@ -39,7 +39,7 @@ const PersonalDropdown = () => {
       </button>
       </button>
 
 
       {/* Menu */}
       {/* Menu */}
-      <div className="dropdown-menu dropdown-menu-right">
+      <div className="dropdown-menu dropdown-menu-right" data-testid="personal-dropdown-menu">
 
 
         <div className="px-4 pt-3 pb-2 text-center">
         <div className="px-4 pt-3 pb-2 text-center">
           <UserPicture user={user} size="lg" noLink noTooltip />
           <UserPicture user={user} size="lg" noLink noTooltip />
@@ -55,12 +55,12 @@ const PersonalDropdown = () => {
 
 
           <div className="btn-group btn-block mt-2" role="group">
           <div className="btn-group btn-block mt-2" role="group">
             <Link href={`/user/${user.username}`}>
             <Link href={`/user/${user.username}`}>
-              <a className="btn btn-sm btn-outline-secondary col">
+              <a className="btn btn-sm btn-outline-secondary col" data-testid="grw-personal-dropdown-menu-user-home">
                 <i className="icon-fw icon-home"></i>{t('personal_dropdown.home')}
                 <i className="icon-fw icon-home"></i>{t('personal_dropdown.home')}
               </a>
               </a>
             </Link>
             </Link>
             <Link href="/me">
             <Link href="/me">
-              <a className="btn btn-sm btn-outline-secondary col">
+              <a className="btn btn-sm btn-outline-secondary col" data-testid="grw-personal-dropdown-menu-user-settings">
                 <i className="icon-fw icon-wrench"></i>{t('personal_dropdown.settings')}
                 <i className="icon-fw icon-wrench"></i>{t('personal_dropdown.settings')}
               </a>
               </a>
             </Link>
             </Link>

+ 8 - 4
packages/app/test/cypress/integration/60-home/home.spec.ts

@@ -12,15 +12,19 @@ context('Access Home', () => {
 
 
   it('Visit home', () => {
   it('Visit home', () => {
     cy.visit('/dummy');
     cy.visit('/dummy');
-    cy.getByTestid('grw-personal-dropdown').click();
-    cy.getByTestid('grw-personal-dropdown').find('.dropdown-menu .btn-group > .btn-outline-secondary:eq(0)').click();
+    cy.waitUntilSkeletonDisappear();
+    cy.get('.grw-personal-dropdown').as('dropdown').should('be.visible').click()
+    cy.get('@dropdown').within(()=>{
+      cy.getByTestid('personal-dropdown-menu').should('have.css', 'display', 'block');
+    });
+    cy.getByTestid('grw-personal-dropdown-menu-user-home').should('be.visible').click();
+    cy.waitUntilSkeletonDisappear();
 
 
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000); // wait for calcViewHeight and rendering
     cy.wait(2000); // wait for calcViewHeight and rendering
 
 
-    cy.waitUntilSkeletonDisappear();
     // for check download toc data
     // for check download toc data
-    cy.get('.toc-link').should('be.visible');
+    cy.get('.toc-link', { timeout: 60000 }).should('be.visible');
 
 
     // same screenshot is taken in access-to-page.spec
     // same screenshot is taken in access-to-page.spec
     cy.screenshot(`${ssPrefix}-visit-home`);
     cy.screenshot(`${ssPrefix}-visit-home`);