add test ids

deepfence · Sep 13, 2024 · e766395 · e766395
1 parent ef9bb22
commit e766395
Show file tree

Hide file tree

Showing 33 changed files with 249 additions and 44 deletions.
diff --git a/deepfence_frontend/apps/dashboard/src/components/UserInfoGuard.tsx b/deepfence_frontend/apps/dashboard/src/components/UserInfoGuard.tsx
@@ -328,6 +328,7 @@ const UserInfoModalContent = ({
             className="p-0 tracking-normal"
             type="submit"
             variant="flat"
+            data-testid="resendButton"
             disabled={
               fetcher.state !== 'idle' &&
               fetcher.formData?.get('resendIntent') === SEND_EMAIL
@@ -350,6 +351,7 @@ const UserInfoModalContent = ({
           size="md"
           variant="outline"
           type="button"
+          data-testid="cancelButton"
           onClick={() => {
             closeModal(false);
           }}
@@ -362,6 +364,7 @@ const UserInfoModalContent = ({
             <Button
               size="md"
               type="submit"
+              data-testid="registerButton"
               disabled={
                 fetcher.state !== 'idle' &&
                 fetcher.formData?.get('intent') === SAVE_LICENSE &&
@@ -387,6 +390,7 @@ const UserInfoModalContent = ({
               type="submit"
               disabled={fetcher.state !== 'idle'}
               loading={fetcher.state !== 'idle'}
+              data-testid="getLicenseKeyButton"
             >
               Get license key
             </Button>

diff --git a/...ce_frontend/apps/dashboard/src/components/registries-connector/AmazonECRConnectorForm.tsx b/...ce_frontend/apps/dashboard/src/components/registries-connector/AmazonECRConnectorForm.tsx
@@ -185,7 +185,11 @@ export const AmazonECRConnectorForm = ({
             )}
           </div>
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/...ence_frontend/apps/dashboard/src/components/registries-connector/AzureCRConnectorForm.tsx b/...ence_frontend/apps/dashboard/src/components/registries-connector/AzureCRConnectorForm.tsx
@@ -79,7 +79,11 @@ export const AzureCRConnectorForm = ({
             required
           />
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/...fence_frontend/apps/dashboard/src/components/registries-connector/DockerConnectorForm.tsx b/...fence_frontend/apps/dashboard/src/components/registries-connector/DockerConnectorForm.tsx
@@ -99,7 +99,11 @@ export const DockerConnectorForm = ({ errorMessage, fieldErrors }: RegistryFormP
             Supported Versions: API version v2
           </div>
         </div>
-        {errorMessage && <p className="text-status-error text-p7a">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="text-status-error text-p7a" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/...rontend/apps/dashboard/src/components/registries-connector/DockerPrivateConnectorForm.tsx b/...rontend/apps/dashboard/src/components/registries-connector/DockerPrivateConnectorForm.tsx
@@ -104,7 +104,11 @@ export const DockerPriavateConnectorForm = ({
             Supported Versions: API version v2
           </div>
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/...fence_frontend/apps/dashboard/src/components/registries-connector/GitLabConnectorForm.tsx b/...fence_frontend/apps/dashboard/src/components/registries-connector/GitLabConnectorForm.tsx
@@ -99,7 +99,11 @@ export const GitLabConnectorForm = ({ errorMessage, fieldErrors }: RegistryFormP
             Supported Versions: 11.8 and above
           </div>
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/...nce_frontend/apps/dashboard/src/components/registries-connector/GoogleCRConnectorForm.tsx b/...nce_frontend/apps/dashboard/src/components/registries-connector/GoogleCRConnectorForm.tsx
@@ -64,7 +64,11 @@ export const GoogleCRConnectorForm = ({
             helperText={fieldErrors?.['service_account_json']}
           />
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/...fence_frontend/apps/dashboard/src/components/registries-connector/HarborConnectorForm.tsx b/...fence_frontend/apps/dashboard/src/components/registries-connector/HarborConnectorForm.tsx
@@ -109,7 +109,11 @@ export const HarborConnectorForm = ({ errorMessage, fieldErrors }: RegistryFormP
             Supported Versions: 1.8.2 and above
           </div>
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/deepfence_frontend/apps/dashboard/src/components/registries-connector/JfrogConnectorForm.tsx b/deepfence_frontend/apps/dashboard/src/components/registries-connector/JfrogConnectorForm.tsx
@@ -111,7 +111,11 @@ export const JfrogConnectorForm = ({ errorMessage, fieldErrors }: RegistryFormPr
             Supported Versions: 6.19.1 and above
           </div>
         </div>
-        {errorMessage && <p className="mt-2 text-status-error text-p7">{errorMessage}</p>}
+        {errorMessage && (
+          <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+            {errorMessage}
+          </p>
+        )}
       </Card>
     </>
   );

diff --git a/deepfence_frontend/apps/dashboard/src/components/registries-connector/QuayConnectorForm.tsx b/deepfence_frontend/apps/dashboard/src/components/registries-connector/QuayConnectorForm.tsx
@@ -97,7 +97,9 @@ export const QuayConnectorForm = ({ errorMessage, fieldErrors }: RegistryFormPro
           )}
 
           {errorMessage && (
-            <p className="mt-2 text-status-error text-p7">{errorMessage}</p>
+            <p className="mt-2 text-status-error text-p7" data-testid="errorMessage">
+              {errorMessage}
+            </p>
           )}
         </div>
       </Card>

diff --git a/deepfence_frontend/apps/dashboard/src/components/remediation/RemediationError.tsx b/deepfence_frontend/apps/dashboard/src/components/remediation/RemediationError.tsx
@@ -15,7 +15,9 @@ export const RemediationError = ({
       <div className="h-10 w-10 mx-auto">
         <ErrorStandardLineIcon />
       </div>
-      <div className="text-center text-xl mt-4">{errorMessage}</div>
+      <div className="text-center text-xl mt-4" data-testid="errorMessage">
+        {errorMessage}
+      </div>
       {onBackButtonClick && (
         <div className="flex justify-center mt-4">
           <Button

diff --git a/deepfence_frontend/apps/dashboard/src/components/remediation/RemediationNoIntegration.tsx b/deepfence_frontend/apps/dashboard/src/components/remediation/RemediationNoIntegration.tsx
@@ -31,6 +31,7 @@ export const RemediationNoIntegration = ({
           permission to Amazon Bedrock, please{' '}
           <button
             type="button"
+            data-testid="addAutoIntegrationButton"
             className="text-text-link hover:underline focus:underline"
             onClick={(e) => {
               e.preventDefault();
@@ -61,6 +62,7 @@ export const RemediationNoIntegration = ({
           <Button
             variant="outline"
             size="sm"
+            data-testid="goBackButton"
             startIcon={
               <div className="-rotate-90">
                 <ArrowLine />

diff --git a/...ontend/apps/dashboard/src/components/scan-configure-forms/ComplianceScanConfigureForm.tsx b/...ontend/apps/dashboard/src/components/scan-configure-forms/ComplianceScanConfigureForm.tsx
@@ -610,17 +610,25 @@ export const ComplianceScanConfigureForm = ({
             loading={state !== 'idle'}
             size="sm"
             type="submit"
+            data-testid="startScanButton"
           >
             Start Scan
           </Button>
           {onCancel ? (
-            <Button type="button" variant="outline" onClick={() => onCancel?.()}>
+            <Button
+              type="button"
+              variant="outline"
+              onClick={() => onCancel?.()}
+              data-testid="cancelButton"
+            >
               Cancel
             </Button>
           ) : null}
         </div>
         {fetcherData?.message && (
-          <p className="text-status-error text-p7a py-3">{fetcherData.message}</p>
+          <p className="text-status-error text-p7a py-3" data-testid="errorMessage">
+            {fetcherData.message}
+          </p>
         )}
       </fetcher.Form>
     </>

diff --git a/..._frontend/apps/dashboard/src/components/scan-configure-forms/MalwareScanConfigureForm.tsx b/..._frontend/apps/dashboard/src/components/scan-configure-forms/MalwareScanConfigureForm.tsx
@@ -377,15 +377,27 @@ export const MalwareScanConfigureForm = ({
       {showScheduleScanOptions && <ScheduleScanForm />}
       {wantDeepfenceSystem(data) ? <ScanDeepfenceSystem /> : null}
       {fetcherData?.message && (
-        <p className="text-status-error text-p7 mt-4">{fetcherData.message}</p>
+        <p className="text-status-error text-p7 mt-4" data-testid="errorMessage">
+          {fetcherData.message}
+        </p>
       )}
 
       <div className="flex gap-3 mt-14">
-        <Button disabled={state !== 'idle'} loading={state !== 'idle'} type="submit">
+        <Button
+          disabled={state !== 'idle'}
+          loading={state !== 'idle'}
+          type="submit"
+          data-testid="startScanButton"
+        >
           Start Scan
         </Button>
         {onCancel ? (
-          <Button type="button" variant="outline" onClick={() => onCancel?.()}>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => onCancel?.()}
+            data-testid="cancelButton"
+          >
             Cancel
           </Button>
         ) : null}

diff --git a/...e_frontend/apps/dashboard/src/components/scan-configure-forms/SecretScanConfigureForm.tsx b/...e_frontend/apps/dashboard/src/components/scan-configure-forms/SecretScanConfigureForm.tsx
@@ -376,15 +376,27 @@ export const SecretScanConfigureForm = ({
       {wantDeepfenceSystem(data) ? <ScanDeepfenceSystem /> : null}
 
       {fetcherData?.message && (
-        <p className="text-status-error text-p7 mt-4">{fetcherData.message}</p>
+        <p className="text-status-error text-p7 mt-4" data-testid="errorMessage">
+          {fetcherData.message}
+        </p>
       )}
 
       <div className="flex gap-3 mt-14">
-        <Button disabled={state !== 'idle'} loading={state !== 'idle'} type="submit">
+        <Button
+          disabled={state !== 'idle'}
+          loading={state !== 'idle'}
+          type="submit"
+          data-testid="startScanButton"
+        >
           Start Scan
         </Button>
         {onCancel ? (
-          <Button type="button" variant="outline" onClick={() => onCancel?.()}>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => onCancel?.()}
+            data-testid="cancelButton"
+          >
             Cancel
           </Button>
         ) : null}

diff --git a/deepfence_frontend/apps/dashboard/src/components/scan-configure-forms/StopScanForm.tsx b/deepfence_frontend/apps/dashboard/src/components/scan-configure-forms/StopScanForm.tsx
@@ -127,13 +127,15 @@ export const StopScanForm = ({
               onClick={() => closeModal(false)}
               type="button"
               variant="outline"
+              data-testid="cancelButton"
             >
               Cancel
             </Button>
             <Button
               size="md"
               loading={fetcher.state === 'submitting'}
               disabled={fetcher.state === 'submitting'}
+              data-testid="cancelScanButton"
               onClick={(e) => {
                 e.preventDefault();
                 const formData = new FormData();
@@ -160,7 +162,9 @@ export const StopScanForm = ({
           <br />
           <span>Are you sure you want to cancel?</span>
           {fetcher.data?.message && (
-            <p className="mt-2 text-p7 text-status-error">{fetcher.data?.message}</p>
+            <p className="mt-2 text-p7 text-status-error" data-testid="errorMessage">
+              {fetcher.data?.message}
+            </p>
           )}
         </div>
       ) : (

diff --git a/...end/apps/dashboard/src/components/scan-configure-forms/VulnerabilityScanConfigureForm.tsx b/...end/apps/dashboard/src/components/scan-configure-forms/VulnerabilityScanConfigureForm.tsx
@@ -584,15 +584,27 @@ export const VulnerabilityScanConfigureForm = ({
       )}
 
       {fetcherData?.message && (
-        <p className="mt-4 text-status-error text-p7">{fetcherData.message}</p>
+        <p className="mt-4 text-status-error text-p7" data-testid="errorMessage">
+          {fetcherData.message}
+        </p>
       )}
 
       <div className="flex gap-3 mt-14">
-        <Button disabled={state !== 'idle'} loading={state !== 'idle'} type="submit">
+        <Button
+          disabled={state !== 'idle'}
+          loading={state !== 'idle'}
+          type="submit"
+          data-testid="startScanButton"
+        >
           Start Scan
         </Button>
         {onCancel ? (
-          <Button type="button" variant="outline" onClick={() => onCancel?.()}>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => onCancel?.()}
+            data-testid="cancelButton"
+          >
             Cancel
           </Button>
         ) : null}

diff --git a/deepfence_frontend/apps/dashboard/src/features/auth/pages/ForgotPassword.tsx b/deepfence_frontend/apps/dashboard/src/features/auth/pages/ForgotPassword.tsx
@@ -77,7 +77,10 @@ export const ForgotPassword = () => {
           helperText={data?.fieldErrors?.email}
         />
         {data?.message && (
-          <p className={`my-1.5 text-p7 text-center text-status-success`}>
+          <p
+            className={`my-1.5 text-p7 text-center text-status-success`}
+            data-testid="message"
+          >
             {data.message}
           </p>
         )}
@@ -88,13 +91,15 @@ export const ForgotPassword = () => {
             loading={state === 'submitting'}
             disabled={state === 'submitting'}
             type="submit"
+            data-testid="sendLinkButton"
           >
             Send Link
           </Button>
           <DFLink
             to="/auth/login"
             className="mt-4 text-p4 underline text-accent-accent text-center"
             unstyled
+            data-testid="backToLoginButton"
           >
             Back to login
           </DFLink>

diff --git a/deepfence_frontend/apps/dashboard/src/features/auth/pages/Login.tsx b/deepfence_frontend/apps/dashboard/src/features/auth/pages/Login.tsx
@@ -46,7 +46,10 @@ export const Login = () => {
           </DFLink>
         </div>
         {data?.error && (
-          <div className={`text-center m-1.5 text-p7 text-status-error`}>
+          <div
+            className={`text-center m-1.5 text-p7 text-status-error`}
+            data-testid="errorMessage"
+          >
             {data.error}
           </div>
         )}
@@ -56,13 +59,19 @@ export const Login = () => {
           type="submit"
           disabled={state !== 'idle'}
           loading={state !== 'idle'}
+          data-testid="signInButton"
         >
           Sign In
         </Button>
 
         <p className="mt-4 text-p4 text-text-text-and-icon">
           Don&apos;t have account yet?{' '}
-          <DFLink to="/auth/register" className="text-accent-accent underline" unstyled>
+          <DFLink
+            to="/auth/register"
+            className="text-accent-accent underline"
+            unstyled
+            data-testid="registerButton"
+          >
             Register now
           </DFLink>
         </p>