Skip to content

Commit

Permalink
Test(e2e): Create test for opened Modal components
Browse files Browse the repository at this point in the history
- solves DS-1247
  • Loading branch information
pavelklibani committed Jul 18, 2024
1 parent f0d30cf commit 9cff822
Show file tree
Hide file tree
Showing 31 changed files with 239 additions and 70 deletions.
1 change: 1 addition & 0 deletions packages/web-react/scripts/entryPoints.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const entryPoints = [
{ dirs: ['components', 'UNSTABLE_PartnerLogo'] },
{ dirs: ['components', 'UNSTABLE_ProductLogo'] },
{ dirs: ['components', 'UNSTABLE_Slider'] },
{ dirs: ['components', 'UNSTABLE_Truncate'] },
{ dirs: ['components', 'VisuallyHidden'] },
];

Expand Down
14 changes: 10 additions & 4 deletions packages/web-react/src/components/Modal/demo/ModalDefault.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const ModalDefault = () => {
const [footerAlign, setFooterAlign] = useState<AlignmentXDictionaryType>(AlignmentX.RIGHT);
const [isDockedOnMobile, setIsDockedOnMobile] = useState(false);
const [isDropdownOpen, setIsDropdownOpen] = useState(false);
const [isExpandedOnMobile, setIsExpandedOnMobile] = useState(false);
const [isExpandedOnMobile, setIsExpandedOnMobile] = useState(true);
const [isScrollable, setIsScrollable] = useState(false);

const toggleModalBasic = () => setModalBasicOpen(!isModalBasicOpen);
Expand Down Expand Up @@ -53,7 +53,9 @@ const ModalDefault = () => {

return (
<>
<Button onClick={toggleModalBasic}>Open Modal</Button>
<Button onClick={toggleModalBasic} data-test-id="modal-basic">
Open Modal
</Button>

<Modal alignmentY={modalAlign} id="example-basic" isOpen={isModalBasicOpen} onClose={handleModalBasicClose}>
<ModalDialog
Expand Down Expand Up @@ -171,7 +173,9 @@ const ModalDefault = () => {
</ModalDialog>
</Modal>

<Button onClick={toggleModalForm}>Open Modal with Form</Button>
<Button onClick={toggleModalForm} data-test-id="modal-with-form">
Open Modal with Form
</Button>

<Modal id="example-form" isOpen={isModalFormOpen} onClose={handleModalFormClose}>
<ModalDialog elementType="form" method="dialog">
Expand All @@ -192,7 +196,9 @@ const ModalDefault = () => {
</ModalDialog>
</Modal>

<Button onClick={toggleModalWithDropdown}>Open Modal with Dropdown</Button>
<Button onClick={toggleModalWithDropdown} data-test-id="modal-with-dropdown">
Open Modal with Dropdown
</Button>

<Modal id="example-dropdown" isOpen={isModalWithDropdownOpen} onClose={handleModalWithDropdownClose}>
<ModalDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ const ModalDisabledBackdropClick = () => {

return (
<>
<Button onClick={toggleModal}>Open Modal</Button>
<Button onClick={toggleModal} data-test-id="modal-with-disabled-backdrop-click">
Open Modal
</Button>

<Modal id="example-disabled-backdrop-click" isOpen={isOpen} onClose={handleClose} closeOnBackdropClick={false}>
<ModalDialog>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ const ModalHiddenCloseButton = () => {

return (
<>
<Button onClick={isOpenToggle}>Open Modal</Button>
<Button onClick={isOpenToggle} data-test-id="modal-with-hidden-close-button">
Open Modal
</Button>

<Modal
id="example-hidden-close-button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ const ModalScrollingLongContent = () => {

return (
<>
<Button onClick={toggleModalLongContent}>Open Modal with Long Content</Button>
<Button onClick={toggleModalLongContent} data-test-id="modal-with-long-content">
Open Modal with Long Content
</Button>

<Modal id="example-long-content" isOpen={isModalLongContentOpen} onClose={handleModalLongContentClose}>
<ModalDialog>
Expand Down Expand Up @@ -126,7 +128,9 @@ const ModalScrollingLongContent = () => {
</ModalDialog>
</Modal>

<Button onClick={toggleModalScrollingInside}>Open Modal with Scrolling Inside</Button>
<Button onClick={toggleModalScrollingInside} data-test-id="modal-with-scrolling-inside">
Open Modal with Scrolling Inside
</Button>

<Modal id="example-scrolling-modal" isOpen={isModalScrollingInsideOpen} onClose={handleModalScrollingInsideClose}>
<ModalDialog isScrollable>
Expand Down Expand Up @@ -165,7 +169,9 @@ const ModalScrollingLongContent = () => {
</ModalDialog>
</Modal>

<Button onClick={toggleModalScrollView}>Open Modal with ScrollView</Button>
<Button onClick={toggleModalScrollView} data-test-id="modal-with-scrollview">
Open Modal with ScrollView
</Button>

<Modal id="example-scroll-view" isOpen={isModalScrollViewOpen} onClose={handleModalScrollViewClose}>
<ModalDialog isScrollable>
Expand Down Expand Up @@ -194,7 +200,9 @@ const ModalScrollingLongContent = () => {
</ModalDialog>
</Modal>

<Button onClick={toggleModalCustomHeight}>Open Modal with Custom Height</Button>
<Button onClick={toggleModalCustomHeight} data-test-id="modal-with-custom-height">
Open Modal with Custom Height
</Button>

<Modal id="example-custom-height" isOpen={isModalCustomHeightOpen} onClose={handleModalCustomHeightClose}>
<ModalDialog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ const ModalStacking = () => {

return (
<>
<Button onClick={toggleFirstModal}>Open Modal</Button>
<Button onClick={toggleFirstModal} data-test-id="modal-stacking">
Open Modal
</Button>

<Modal id="example-stacking-parent" isOpen={isFirstOpen} onClose={handleFirstClose}>
<ModalDialog>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Button data-spirit-toggle="modal" data-spirit-target="#example-basic">
<Button data-spirit-toggle="modal" data-spirit-target="#example-basic" data-test-id="modal-basic">
Open Modal
</Button>

Expand Down Expand Up @@ -63,7 +63,7 @@
</ModalDialog>
</Modal>

<Button data-spirit-toggle="modal" data-spirit-target="#example-form">
<Button data-spirit-toggle="modal" data-spirit-target="#example-form" data-test-id="modal-with-form">
Open Modal with Form
</Button>

Expand Down Expand Up @@ -97,7 +97,7 @@
</ModalDialog>
</Modal>

<Button data-spirit-toggle="modal" data-spirit-target="#example-dropdown">
<Button data-spirit-toggle="modal" data-spirit-target="#example-dropdown" data-test-id="modal-with-dropdown">
Open Modal with Dropdown
</Button>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Button data-spirit-toggle="modal" data-spirit-target="#example-disabled-backdrop-click">
<Button data-spirit-toggle="modal" data-spirit-target="#example-disabled-backdrop-click" data-test-id="modal-with-disabled-backdrop-click">
Open Modal
</Button>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Button data-spirit-toggle="modal" data-spirit-target="#example-hidden-close-button">
<Button data-spirit-toggle="modal" data-spirit-target="#example-hidden-close-button" data-test-id="modal-with-hidden-close-button">
Open Modal
</Button>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Button data-spirit-toggle="modal" data-spirit-target="#example-long-content">
<Button data-spirit-toggle="modal" data-spirit-target="#example-long-content" data-test-id="modal-with-long-content">
Open Modal with Long Content
</Button>

Expand Down Expand Up @@ -38,7 +38,7 @@
</ModalDialog>
</Modal>

<Button data-spirit-toggle="modal" data-spirit-target="#example-scrolling-modal">
<Button data-spirit-toggle="modal" data-spirit-target="#example-scrolling-modal" data-test-id="modal-with-scrolling-inside">
Open Modal with Scrolling Inside
</Button>

Expand Down Expand Up @@ -92,7 +92,7 @@
</ModalDialog>
</Modal>

<Button data-spirit-toggle="modal" data-spirit-target="#example-scroll-view">
<Button data-spirit-toggle="modal" data-spirit-target="#example-scroll-view" data-test-id="modal-with-scrollview">
Open Modal with ScrollView
</Button>

Expand Down Expand Up @@ -167,7 +167,7 @@
</ModalDialog>
</Modal>

<Button data-spirit-toggle="modal" data-spirit-target="#example-custom-height">
<Button data-spirit-toggle="modal" data-spirit-target="#example-custom-height" data-test-id="modal-with-custom-height">
Open Modal with Custom Height
</Button>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Button data-spirit-toggle="modal" data-spirit-target="#example-stacking-parent">
<Button data-spirit-toggle="modal" data-spirit-target="#example-stacking-parent" data-test-id="modal-stacking">
Open Modal
</Button>

Expand Down
14 changes: 12 additions & 2 deletions packages/web/src/scss/components/Modal/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ <h2 class="docs-Heading">Modal</h2>
data-spirit-target="#example-basic"
aria-controls="example-basic"
aria-expanded="false"
data-test-id="modal-basic"
>
Open Modal
</button>
Expand Down Expand Up @@ -191,6 +192,7 @@ <h2 id="example-basic-title" class="ModalHeader__title">Modal Title</h2>
data-spirit-target="#example-form"
aria-controls="example-form"
aria-expanded="false"
data-test-id="modal-with-form"
>
Open Modal with Form
</button>
Expand Down Expand Up @@ -265,6 +267,7 @@ <h2 id="example-form-title" class="ModalHeader__title">Modal with a Form</h2>
data-spirit-target="#example-dropdown"
aria-controls="example-dropdown"
aria-expanded="false"
data-test-id="modal-with-dropdown"
>
Open Modal with Dropdown
</button>
Expand Down Expand Up @@ -302,7 +305,7 @@ <h2 id="example-dropdown-title" class="ModalHeader__title">Modal Title</h2>
perferendis reprehenderit, voluptate. Cum delectus dicta ducimus eligendi excepturi natus perferendis
provident unde. Eveniet, iste, molestiae?
</p>
<div class="DropdownWrapper">
<div class="Dropdown">
<button
type="button"
data-spirit-toggle="dropdown"
Expand All @@ -313,7 +316,7 @@ <h2 id="example-dropdown-title" class="ModalHeader__title">Modal Title</h2>
>
Dropdown
</button>
<div class="Dropdown" data-spirit-placement="bottom-start" id="dropdown-in-modal">
<div class="DropdownPopover" data-spirit-placement="bottom-start" id="dropdown-in-modal">
<a href="#" class="Item">
<span class="Item__label">Action</span>
</a>
Expand Down Expand Up @@ -377,6 +380,7 @@ <h2 class="docs-Heading">Scrolling Long Content</h2>
data-spirit-target="#example-long-content"
aria-controls="example-long-content"
aria-expanded="false"
data-test-id="modal-with-long-content"
>
Open Modal with Long Content
</button>
Expand Down Expand Up @@ -461,6 +465,7 @@ <h2 id="example-long-content-title" class="ModalHeader__title">
data-spirit-target="#example-scrolling-modal"
aria-controls="example-scrolling-modal"
aria-expanded="false"
data-test-id="modal-with-scrolling-inside"
>
Open Modal with Scrolling Inside
</button>
Expand Down Expand Up @@ -555,6 +560,7 @@ <h2 id="example-scrolling-modal-title" class="ModalHeader__title">
data-spirit-target="#example-scroll-view"
aria-controls="example-scroll-view"
aria-expanded="false"
data-test-id="modal-with-scrollview"
>
Open Modal with ScrollView
</button>
Expand Down Expand Up @@ -680,6 +686,7 @@ <h2 id="example-scroll-view-title" class="ModalHeader__title">
data-spirit-target="#example-custom-height"
aria-controls="example-custom-height"
aria-expanded="false"
data-test-id="modal-with-custom-height"
>
Open Modal with Custom Height
</button>
Expand Down Expand Up @@ -986,6 +993,7 @@ <h2 class="docs-Heading">Stacking Modals</h2>
data-spirit-target="#example-stacking-parent"
aria-controls="example-stacking-parent"
aria-expanded="false"
data-test-id="modal-stacking"
>
Open Modal
</button>
Expand Down Expand Up @@ -1135,6 +1143,7 @@ <h2 class="docs-Heading">Disabled Backdrop Click</h2>
data-spirit-target="#example-disabled-backdrop-click"
aria-controls="example-disabled-backdrop-click"
aria-expanded="false"
data-test-id="modal-with-disabled-backdrop-click"
>
Open Modal
</button>
Expand Down Expand Up @@ -1209,6 +1218,7 @@ <h2 class="docs-Heading">Hidden Close Button and Disabled Escape Key</h2>
data-spirit-target="#example-hide-close-button"
aria-controls="example-hide-close-button"
aria-expanded="false"
data-test-id="modal-with-hidden-close-button"
>
Open Modal
</button>
Expand Down
Loading

0 comments on commit 9cff822

Please sign in to comment.