Merge remote-tracking branch 'origin/dev' into dev

src/app/(main)/settings/websites/WebsiteAddButton.tsx

@@ -15,7 +15,7 @@ export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?:
 
   return (
     <ModalTrigger>
-      <Button data-cy="button-website-add" variant="primary">
+      <Button data-test="button-website-add" variant="primary">
         <Icon>
           <Icons.Plus />
         </Icon>

src/app/(main)/settings/websites/WebsiteAddForm.tsx

@@ -39,7 +39,7 @@ export function WebsiteAddForm({
     <Form onSubmit={handleSubmit} error={error}>
       <FormRow label={formatMessage(labels.name)}>
         <FormInput
-          data-cy="input-name"
+          data-test="input-name"
           name="name"
           rules={{ required: formatMessage(labels.required) }}
         >
@@ -48,7 +48,7 @@ export function WebsiteAddForm({
       </FormRow>
       <FormRow label={formatMessage(labels.domain)}>
         <FormInput
-          data-cy="input-domain"
+          data-test="input-domain"
           name="domain"
           rules={{
             required: formatMessage(labels.required),
@@ -59,7 +59,7 @@ export function WebsiteAddForm({
         </FormInput>
       </FormRow>
       <FormButtons flex>
-        <SubmitButton data-cy="button-submit" variant="primary" disabled={false}>
+        <SubmitButton data-test="button-submit" variant="primary" disabled={false}>
           {formatMessage(labels.save)}
         </SubmitButton>
         {onClose && (

src/app/(main)/settings/websites/WebsitesTable.tsx

@@ -36,7 +36,7 @@ export function WebsitesTable({
               <>
                 {allowEdit && (
                   <LinkButton href={renderTeamUrl(`/settings/websites/${websiteId}`)}>
-                    <Icon data-cy="link-button-edit">
+                    <Icon data-test="link-button-edit">
                       <Icons.Edit />
                     </Icon>
                     <Text>{formatMessage(labels.edit)}</Text>

src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx

@@ -66,7 +66,9 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
         description={formatMessage(messages.deleteWebsiteWarning)}
       >
         <ModalTrigger>
-          <Button variant="danger">{formatMessage(labels.delete)}</Button>
+          <Button data-test="button-delete" variant="danger">
+            {formatMessage(labels.delete)}
+          </Button>
           <Modal title={formatMessage(labels.deleteWebsite)}>
             {(close: () => void) => (
               <WebsiteDeleteForm websiteId={websiteId} onSave={handleSave} onClose={close} />

src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx

@@ -27,15 +27,20 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa
   return (
     <Form ref={ref} onSubmit={handleSubmit} error={error} values={website}>
       <FormRow label={formatMessage(labels.websiteId)}>
-        <TextField value={website?.id} readOnly allowCopy />
+        <TextField data-test="text-field-websiteId" value={website?.id} readOnly allowCopy />
       </FormRow>
       <FormRow label={formatMessage(labels.name)}>
-        <FormInput name="name" rules={{ required: formatMessage(labels.required) }}>
+        <FormInput
+          data-test="input-name"
+          name="name"
+          rules={{ required: formatMessage(labels.required) }}
+        >
           <TextField />
         </FormInput>
       </FormRow>
       <FormRow label={formatMessage(labels.domain)}>
         <FormInput
+          data-test="input-domain"
           name="domain"
           rules={{
             required: formatMessage(labels.required),
@@ -49,7 +54,9 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa
         </FormInput>
       </FormRow>
       <FormButtons>
-        <SubmitButton variant="primary">{formatMessage(labels.save)}</SubmitButton>
+        <SubmitButton data-test="button-submit" variant="primary">
+          {formatMessage(labels.save)}
+        </SubmitButton>
       </FormButtons>
     </Form>
   );

src/app/login/LoginForm.tsx

@@ -43,7 +43,7 @@ export function LoginForm() {
       <Form className={styles.form} onSubmit={handleSubmit} error={getMessage(error)}>
         <FormRow label={formatMessage(labels.username)}>
           <FormInput
-            data-cy="input-username"
+            data-test="input-username"
             name="username"
             rules={{ required: formatMessage(labels.required) }}
           >
@@ -52,7 +52,7 @@ export function LoginForm() {
         </FormRow>
         <FormRow label={formatMessage(labels.password)}>
           <FormInput
-            data-cy="input-password"
+            data-test="input-password"
             name="password"
             rules={{ required: formatMessage(labels.required) }}
           >
@@ -61,7 +61,7 @@ export function LoginForm() {
         </FormRow>
         <FormButtons>
           <SubmitButton
-            data-cy="button-submit"
+            data-test="button-submit"
             className={styles.button}
             variant="primary"
             disabled={isPending}

src/components/input/ProfileButton.tsx

@@ -25,7 +25,7 @@ export function ProfileButton() {
 
   return (
     <PopupTrigger>
-      <Button data-cy="button-profile" variant="quiet">
+      <Button data-test="button-profile" variant="quiet">
         <Icon>
           <Icons.Profile />
         </Icon>
@@ -41,7 +41,7 @@ export function ProfileButton() {
               <Text>{formatMessage(labels.profile)}</Text>
             </Item>
             {!cloudMode && (
-              <Item data-cy="item-logout" key="logout" className={styles.item}>
+              <Item data-test="item-logout" key="logout" className={styles.item}>
                 <Icon>
                   <Icons.Logout />
                 </Icon>