Shun Miyazawa 4 years ago
parent
commit
b83334aefb

+ 2 - 5
packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -53,7 +53,6 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
   const { t } = useTranslation('');
 
   const {
-    dataTestId,
     pageId, isLoading,
     pageInfo, isEnableActions, forceHideMenuItems,
     onClickBookmarkMenuItem, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem, onClickRevertMenuItem,
@@ -189,7 +188,6 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
 
   return (
     <DropdownMenu
-      data-testid={dataTestId || ''}
       positionFixed
       modifiers={{ preventOverflow: { boundariesElement: undefined } }}
     >
@@ -209,7 +207,7 @@ export const PageItemControlSubstance = (props: PageItemControlSubstanceProps):
 
   const {
     pageId, pageInfo: presetPageInfo, fetchOnInit,
-    children,
+    children, dataTestId,
     onClickBookmarkMenuItem, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem,
   } = props;
 
@@ -255,8 +253,7 @@ export const PageItemControlSubstance = (props: PageItemControlSubstanceProps):
   }, [onClickDeleteMenuItem, pageId, fetchedPageInfo, presetPageInfo]);
 
   return (
-    <Dropdown isOpen={isOpen} toggle={() => setIsOpen(!isOpen)}>
-
+    <Dropdown isOpen={isOpen} toggle={() => setIsOpen(!isOpen)} data-testid={dataTestId || ''}>
       { children ?? (
         <DropdownToggle color="transparent" className="border-0 rounded btn-page-item-control">
           <i className="icon-options text-muted"></i>

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

@@ -22,8 +22,8 @@ context('Open presentation modal', () => {
 
   it('Successfully loaded the presentation modal in /.', () => {
     cy.visit('/');
-    cy.getByTestid('sub-nav-buttons-page-item-control').click();
-    cy.getByTestid('open-presentation-modal-btn').click();
+    cy.getByTestid('sub-nav-buttons-page-item-control').first().click();
+    cy.getByTestid('open-presentation-modal-btn').first().click();
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(1500);
     cy.screenshot(`${ssPrefix}-sandbox-headers`, { capture: 'viewport' });