feat: add more tests to general data page and refactor existing ones

dhis2 · Jul 25, 2024 · d9426ea · d9426ea
1 parent a899bdf
commit d9426ea
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 103 deletions.
diff --git a/src/components/view/data-workspace/requests-navigation/requests-navigation.js b/src/components/view/data-workspace/requests-navigation/requests-navigation.js
@@ -4,7 +4,7 @@ import React from 'react'
 
 const RequestsNavigation = ({ requests, selected, onChange }) =>
     requests && requests?.length > 0 ? (
-        <TabBar>
+        <TabBar scrollable>
             {requests.map((request, index) => (
                 <Tab
                     key={request.name}

diff --git a/src/components/view/submit-modal/submit-modal.js b/src/components/view/submit-modal/submit-modal.js
@@ -89,7 +89,9 @@ const SuccessModalContent = ({ onClose, data, dataSubmitted }) => (
 
         <ModalActions>
             <ButtonStrip end>
-                <Button onClick={onClose}>{i18n.t('Close')}</Button>
+                <Button onClick={onClose} data-test="close-submission-button">
+                    {i18n.t('Close')}
+                </Button>
             </ButtonStrip>
         </ModalActions>
     </>
@@ -286,33 +288,35 @@ const SubmitModal = ({ open, onClose, setDataSubmitted }) => {
             position="middle"
             onClose={loading ? null : onClose}
         >
-            <ModalTitle>{i18n.t('Submitting data')}</ModalTitle>
-            {!called && !loading && !submitsAttempted && (
-                <ConfirmModalContent
-                    exchange={exchange}
-                    requests={requests}
-                    onClose={onClose}
-                    onSubmit={() => {
-                        setSubmitsAttempted(true)
-                        submitExchange()
-                    }}
-                />
-            )}
-            {error && submitsAttempted && (
-                <ErrorModalContent
-                    error={error}
-                    onRetry={submitExchange}
-                    onClose={onClose}
-                />
-            )}
-            {data && (
-                <SuccessModalContent
-                    data={data}
-                    dataSubmitted={dataSubmitted}
-                    onClose={onClose}
-                />
-            )}
-            {loading && <LoadingStateModalContent />}
+            <span data-test="submit-modal-content">
+                <ModalTitle>{i18n.t('Submitting data')}</ModalTitle>
+                {!called && !loading && !submitsAttempted && (
+                    <ConfirmModalContent
+                        exchange={exchange}
+                        requests={requests}
+                        onClose={onClose}
+                        onSubmit={() => {
+                            setSubmitsAttempted(true)
+                            submitExchange()
+                        }}
+                    />
+                )}
+                {error && submitsAttempted && (
+                    <ErrorModalContent
+                        error={error}
+                        onRetry={submitExchange}
+                        onClose={onClose}
+                    />
+                )}
+                {data && (
+                    <SuccessModalContent
+                        data={data}
+                        dataSubmitted={dataSubmitted}
+                        onClose={onClose}
+                    />
+                )}
+                {loading && <LoadingStateModalContent />}
+            </span>
         </Modal>
     )
 }

diff --git a/src/components/view/top-bar/top-bar.js b/src/components/view/top-bar/top-bar.js
@@ -13,7 +13,10 @@ const LinKToEditMode = () => {
         return null
     }
     return (
-        <div className={styles.additionalContentContainer}>
+        <div
+            className={styles.additionalContentContainer}
+            data-test={'configurations-button'}
+        >
             <Link to="/edit">
                 <Button small>{i18n.t('Configurations')}</Button>
             </Link>