Merge pull request #178 from bible-technology/exportArchiveTest

export and archive test
bible-technology · Oct 12, 2023 · 4040017 · 4040017
2 parents 8ac1b8a + 6f8a104
commit 4040017
Show file tree

Hide file tree

Showing 12 changed files with 435 additions and 119 deletions.
diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
diff --git a/e2e-tests/myFixtures.ts b/e2e-tests/myFixtures.ts
@@ -1,32 +1,32 @@
-import {test as myTest} from "@playwright/test"
+import { test as myTest } from "@playwright/test"
 
 type myFixture = {
-    userName: string
-    textProject: string,
-    obsProject: string,
-    audioProject: string,
-    syncName:string,
-    doorUser:string,
-    doorPassword:string,
-    flavorText:string,
-    flavorObs:string
-    textUnderscore:string,
-    obsUnderscore:string,
-    obsUrduProject:string,
+  userName: string
+  textProject: string,
+  obsProject: string,
+  audioProject: string,
+  syncName: string,
+  doorUser: string,
+  doorPassword: string,
+  flavorText: string,
+  flavorObs: string
+  textUnderscore: string,
+  obsUnderscore: string,
+  obsUrduProject: string,
 }
 const myFixtureTest = myTest.extend<myFixture>({
-    userName : "Playwright user",
-    textProject: "Translation test project",
-    obsProject: "Obs test project",
-    textUnderscore: "Translation_test_project",
-    obsUnderscore: "Obs_test_project",
-    audioProject: "Audio test project",
-    syncName:"Sync_Collab_Test",
-    doorUser:"bobby",
-    doorPassword:"Bobby@123",
-    flavorText: "textTranslation",
-    flavorObs: "textStories",
-    obsUrduProject: "Obs urdu project",
+  userName: "Playwright user",
+  textProject: "Translation test project",
+  obsProject: "Obs test project",
+  textUnderscore: "Translation_test_project",
+  obsUnderscore: "Obs_test_project",
+  audioProject: "Audio test project",
+  syncName: "Sync_Collab_Test",
+  doorUser: "bobby",
+  doorPassword: "Bobby@123",
+  flavorText: "textTranslation",
+  flavorObs: "textStories",
+  obsUrduProject: "Obs urdu project",
 })
 
 export const test = myFixtureTest;

diff --git a/jsconfig.json b/jsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "resolveJsonModule": true,
     "baseUrl": ".",
     "paths": {
       "@/icons/*": [

diff --git a/renderer/src/components/Profile/UserProfile.js b/renderer/src/components/Profile/UserProfile.js
@@ -50,7 +50,7 @@ const UserProfile = () => {
           <>
             <div>
               <Menu.Button
-                id="user-profile"
+                id="user-profile-image"
                 className="max-w-xs bg-gray-800 border-4 border-white rounded-full flex items-center text-sm
                 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-gray-700"
               >

diff --git a/renderer/src/components/Projects/ProjectList.js b/renderer/src/components/Projects/ProjectList.js
@@ -82,7 +82,7 @@ export default function ProjectList() {
                 <div className="-my-2 sm:-mx-6 lg:-mx-8">
                   <div className="align-middle inline-block min-w-full sm:px-6 lg:px-8">
                     <div className="shadow border-b border-gray-200 sm:rounded-lg">
-                      <table data-testid="tablelayout" className="min-w-full divide-y divide-gray-200 mb-9">
+                      <table data-testid="tablelayout" id="projects-list" className="min-w-full divide-y divide-gray-200 mb-9">
                         <EnhancedTableHead
                           order={order}
                           orderBy={orderBy}

diff --git a/renderer/src/components/Projects/ProjectRow.js b/renderer/src/components/Projects/ProjectRow.js
@@ -54,7 +54,7 @@ const ProjectRow = ({
     return 0;
   }
   return (
-    <tbody className="bg-white divide-y divide-gray-200">
+    <tbody className="bg-white divide-y divide-gray-200" id="projects-list-body">
       {projects && (stableSort(
         projects,
         getComparator(order, orderBy),
@@ -167,6 +167,7 @@ const ProjectRow = ({
                               {({ active }) => (
                                 <button
                                   type="button"
+                                  aria-label="export-project"
                                   className={`${active ? 'bg-primary text-white' : 'text-gray-900'
                                     } group rounded-md items-center w-full px-2 py-2 text-sm ${project.isArchived ? 'hidden' : 'flex'}`}
                                   onClick={() => openExportPopUp(project)}
@@ -179,6 +180,7 @@ const ProjectRow = ({
                               {({ active }) => (
                                 <button
                                   type="button"
+                                  aria-label="archive-restore-project"
                                   className={`${active ? 'bg-primary text-white' : 'text-gray-900'
                                     } group flex rounded-md items-center w-full px-2 py-2 text-sm`}
                                   onClick={() => {

diff --git a/renderer/src/components/ProjectsPage/CreateProject/AdvancedSettingsDropdown.js b/renderer/src/components/ProjectsPage/CreateProject/AdvancedSettingsDropdown.js
@@ -284,6 +284,7 @@ export default function AdvancedSettingsDropdown({ call, project, projectType })
                       className={canonSpecification.title === 'Old Testament (OT)' ? 'bg-primary hover:bg-secondary text-white px-3 py-1 rounded-full cursor-pointer whitespace-nowrap' : 'bg-gray-200 hover:bg-primary hover:text-white px-3 py-1 rounded-full cursor-pointer whitespace-nowrap'}
                       onClick={() => selectCanon(canonList[1])}
                       role="button"
+                      aria-label="old-testament"
                       tabIndex="0"
                     >
                       {`${t('label-old-testament')} (OT)`}

diff --git a/renderer/src/components/Resources/ResourceUtils/CustomMultiComboBox.js b/renderer/src/components/Resources/ResourceUtils/CustomMultiComboBox.js
@@ -33,6 +33,7 @@ function CustomMultiComboBox({
                   // displayValue={(language) => language?.ang}
                   displayValue={(selectedList) => `${selectedList.length > 0 ? `${selectedList[0][filterParams]}${multiSelect ? '... click for more' : '' }` : ''}`}
                   placeholder="Select Language"
+                  aria-label="custom-dropdown"
                   onFocus={() => !open && setIsActive(true)}
                   onBlur={() => setIsActive(false)}
                   onChange={(event) => setQuery(event.target.value)}
@@ -54,7 +55,7 @@ function CustomMultiComboBox({
                     {filteredData.length > 0
                     ? filteredData.map((data) => (
                       // <Combobox.Option key={data?.id || data?.pk} className={`${selectedList.includes(data) ? 'bg-gray-400' : ''} hover:bg-gray-300 p-1`} value={data}>
-                      <Combobox.Option key={data?.id || data?.pk} className=" hover:bg-gray-300 p-1" value={data}>
+                      <Combobox.Option key={data?.id || data?.pk} className=" hover:bg-gray-300 p-1" value={data} aria-label={data[filterParams]}>
                         {data[filterParams] }
                         {' '}
                         {showLangCode.show && (

diff --git a/renderer/src/components/SnackBar/SnackBar.js b/renderer/src/components/SnackBar/SnackBar.js
@@ -66,7 +66,7 @@ const SnackBar = ({
             >
               <XMarkIcon />
             </button>
-            <p>
+            <p aria-label="snack-text">
               {snackText}
             </p>
           </div>

diff --git a/renderer/src/layouts/projects/Layout.js b/renderer/src/layouts/projects/Layout.js
@@ -103,12 +103,12 @@ export default function ProjectsLayout(props) {
                           {showArchived ? (
                             <>
                               <ComputerDesktopIcon className="h-4 mr-2 text-white" />
-                              <span>{t('label-active')}</span>
+                              <span aria-label="active-projects">{t('label-active')}</span>
                             </>
                           ) : (
                             <>
                               <ArchiveBoxIcon className="h-4 mr-2 text-white" />
-                              <span>{t('label-archived')}</span>
+                              <span aria-label="archived-projects">{t('label-archived')}</span>
                             </>
                           )}
                         </button>

diff --git a/renderer/src/modules/projects/Profile.js b/renderer/src/modules/projects/Profile.js
@@ -326,6 +326,7 @@ export default function UserProfile() {
 
               <button
                 type="submit"
+                id="save-profile"
                 className=" w-20 h-9 bg-success  shadow-md font-light text-white border-none text-xs leading-5 rounded uppercase mb-5"
               >
                 {t('btn-save')}