From 45c20ca4dee76e6187c4cee14aba39668f52cf23 Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Thu, 16 Nov 2023 15:22:45 +0530
Subject: [PATCH 01/10] added 2 test for adding and removing reference panel

---
 e2e-tests/base.test.ts                        | 28 ++++++++++++++++++-
 e2e-tests/common.js                           | 19 +++++++++++--
 .../Sync/Gitea/EditorSync/EditorSync.js       |  2 +-
 .../src/layouts/editor/ConfirmationModal.js   |  3 +-
 renderer/src/layouts/editor/EditorSection.js  |  8 ++++--
 .../src/layouts/editor/SectionPlaceholder1.js |  2 ++
 .../src/layouts/editor/SectionPlaceholder2.js |  2 ++
 7 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index 9d122cea9..c83b5b442 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -11,7 +11,7 @@ import {
   exportAudioProject, updateDescriptionAbbriviation, changeLicense,
   customAddEditLanguage, customProjectTargetLanguage, starUnstar,
   clickUserImageToLogout, confirmBookInEditor, checkingUpdatedLicense,
-  createUser, projectPageExpect
+  createUser, projectPageExpect, removeResource
 } from './common';
 
 const fs = require('fs');
@@ -277,6 +277,32 @@ test('Add content in verses 1 and 2 in the obs story 1 editor', async () => {
   expect(verse3).toBe('Story content added in verse 3');
 });
 
+test('Adding panels', async () => {
+  const addPanel = await window.locator('//*[@aria-label="add-panels"]');
+  await addPanel.click()
+  let title = await window.innerText('//*[@aria-label="number-of-panels"]');
+  expect(title).toBe('2');
+  await addPanel.click()
+  title = await window.innerText('//*[@aria-label="number-of-panels"]');
+  expect(title).toBe('3');
+  await addPanel.click()
+  title = await window.innerText('//*[@aria-label="number-of-panels"]');
+  expect(title).toBe('1');
+});
+
+test("Adding 2 panels and removing from the editor", async () => {
+  await window.waitForSelector('//*[@aria-label="add-panels"]')
+  const addPanel = await window.locator('//*[@aria-label="add-panels"]')
+  await addPanel.click()
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
+  await addPanel.click()
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('3')
+  await removeResource(window, expect, 1, "confirm-remove")
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
+  await removeResource(window, expect, 3, "confirm-remove")
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('1')
+})
+
 test('Increase the font size in the obs editor', async () => {
   await window.waitForSelector('//*[@aria-label="increase-font"]', { timeout: 5000 });
   await window.locator('//*[@aria-label="increase-font"]').click();
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index f73aa697b..1176a7b73 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -38,6 +38,7 @@ export const clickUserImageToLogout = async (window, expect, userName, path, fs,
   //  constructs the path to a folder/directory name
   const folder = await userFolder(window, userName, packageInfo, path)
   // Check if user profile image is visible
+  await window.waitForSelector('//*[@id="user-profile-image"]')
   const userProfileImage = window.locator('//*[@id="user-profile-image"]');
   expect(await userProfileImage.isVisible()).toBeTruthy();
   await userProfileImage.click();
@@ -78,8 +79,10 @@ export const projectPageExpect = async (window, expect) => {
 
 export const clickUserImage = async (window, expect, itemClick) => {
   // Ensure the user profile image is visible and click on it.
-  expect(await window.locator('//*[@id="user-profile-image"]')).toBeVisible();
-  await window.locator('//*[@id="user-profile-image"]').click();
+  await window.waitForSelector('//*[@id="user-profile-image"]')
+  const imageClick = await window.locator('//*[@id="user-profile-image"]')
+  expect(await imageClick).toBeVisible();
+  await imageClick.click();
   // Verify that the user profile is visible and click on it.
   await window.waitForSelector(`//*[@aria-label="${itemClick}"]`)
   expect(await window.locator(`//*[@aria-label="${itemClick}"]`)).toBeVisible();
@@ -221,6 +224,18 @@ export const checkProjectName = async (window, expect, name) => {
   await expect(projectname).toBe(name);
 }
 
+// removing resource
+export const removeResource = async (window, expect, resourcePaneNo, confirmButton) => {
+  await window.waitForSelector(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
+  const closePanel = await window.locator(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
+  expect(await closePanel).toBeVisible()
+  await closePanel.click()
+  const title = await window.locator('//*[@aria-label="confirm-title"]').textContent()
+  await expect(title).toBe(title)
+  expect(await window.locator(`//*[@aria-label="${confirmButton}"]`)).toBeVisible()
+  await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
+}
+
 // Checks for notifications.
 export const checkNotification = async (window, expect, projectname) => {
   // Wait for the notification button to appear and click it.
diff --git a/renderer/src/components/Sync/Gitea/EditorSync/EditorSync.js b/renderer/src/components/Sync/Gitea/EditorSync/EditorSync.js
index afe89eff5..d9fedf56d 100644
--- a/renderer/src/components/Sync/Gitea/EditorSync/EditorSync.js
+++ b/renderer/src/components/Sync/Gitea/EditorSync/EditorSync.js
@@ -114,7 +114,7 @@ function EditorSync({ selectedProject }) {
           )
           : (
             <div
-              aria-label="add-panels"
+              aria-label="save-to-cloud"
               title={t('label-save-to-cloud')}
               type="div"
             // className={`group ${menuStyles.btn} `}
diff --git a/renderer/src/layouts/editor/ConfirmationModal.js b/renderer/src/layouts/editor/ConfirmationModal.js
index dbad02a08..c98dafe15 100644
--- a/renderer/src/layouts/editor/ConfirmationModal.js
+++ b/renderer/src/layouts/editor/ConfirmationModal.js
@@ -60,7 +60,7 @@ export default function ConfirmationModal({
                     <ExclamationTriangleIcon className="h-6 w-6 text-red-600" aria-hidden="true" />
                   </div>
                   <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-                    <Dialog.Title as="h3" className="text-lg leading-6 font-medium text-gray-900">
+                    <Dialog.Title as="h3" aria-label="confirm-title" className="text-lg leading-6 font-medium text-gray-900">
                       {title}
                     </Dialog.Title>
                     <div className="mt-2">
@@ -91,6 +91,7 @@ export default function ConfirmationModal({
                 {buttonName && (
                 <button
                   type="button"
+                  aria-label="confirm-remove"
                   className="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm"
                   onClick={() => close()}
                 >
diff --git a/renderer/src/layouts/editor/EditorSection.js b/renderer/src/layouts/editor/EditorSection.js
index eb0fae4a9..de1de511e 100644
--- a/renderer/src/layouts/editor/EditorSection.js
+++ b/renderer/src/layouts/editor/EditorSection.js
@@ -39,6 +39,7 @@ export default function EditorSection({
   setAddingSection,
   font,
   setFont,
+  panelNo 
 }) {
   const [openResourcePopUp, setOpenResourcePopUp] = useState(false);
   const [openModal, setOpenModal] = useState(false);
@@ -187,7 +188,7 @@ export default function EditorSection({
   return (
     <>
       <div // div 1
-        aria-label="resources-panel"
+        aria-label={`resources-panel-${panelNo}`}
         className={classNames(
           openResource ? 'hidden' : '',
           'flex flex-col relative first:mt-0 border bg-white border-grey-600 rounded shadow-sm group  overflow-hidden',
@@ -195,7 +196,6 @@ export default function EditorSection({
       >
         <div
           className="bg-gray-200 rounded-t text-center text-gray-600 relative"
-          aria-label="resources-panel"
         >
           <div className="bg-gray-200 rounded-t ">
             <div className="flex">
@@ -251,7 +251,7 @@ export default function EditorSection({
                   setSelectedFont={setFont}
                 />
                 <button
-                  aria-label="resources-selector"
+                  aria-label={`resources-selector-${panelNo}`}
                   type="button"
                   title={t(
                     'tooltip-editor-resource-selector',
@@ -263,6 +263,7 @@ export default function EditorSection({
                 </button>
                 <button
                   type="button"
+                  aria-label={`remove-resource-${panelNo}`}
                   title={t('tooltip-editor-remove-section')}
                   onClick={removeResource}
                   className="px-2"
@@ -282,6 +283,7 @@ export default function EditorSection({
               </div>
               <button
                 type="button"
+                aria-label={`load-module-${panelNo}`}
                 className="p-4 bg-gray-200 rounded-lg ring-offset-1"
                 onClick={showResourcesPanel}
               >
diff --git a/renderer/src/layouts/editor/SectionPlaceholder1.js b/renderer/src/layouts/editor/SectionPlaceholder1.js
index 770bf7eb2..29f61db40 100644
--- a/renderer/src/layouts/editor/SectionPlaceholder1.js
+++ b/renderer/src/layouts/editor/SectionPlaceholder1.js
@@ -309,6 +309,7 @@ const SectionPlaceholder1 = ({ editor }) => {
                   setAddingSection={setAddingSection}
                   font={font1}
                   setFont={setFont1}
+                  panelNo="1"
                 >
                   {
                     (loadResource1 === true)
@@ -382,6 +383,7 @@ const SectionPlaceholder1 = ({ editor }) => {
                   setAddingSection={setAddingSection}
                   font={font2}
                   setFont={setFont2}
+                  panelNo="2"
                 >
                   {
                     (loadResource2 === true)
diff --git a/renderer/src/layouts/editor/SectionPlaceholder2.js b/renderer/src/layouts/editor/SectionPlaceholder2.js
index 699b286fd..5827b7b3f 100644
--- a/renderer/src/layouts/editor/SectionPlaceholder2.js
+++ b/renderer/src/layouts/editor/SectionPlaceholder2.js
@@ -308,6 +308,7 @@ const SectionPlaceholder2 = ({ editor }) => {
                   setAddingSection={setAddingSection}
                   font={font3}
                   setFont={setFont3}
+                  panelNo="3"
                 >
                   {
                     (loadResource3 === true)
@@ -379,6 +380,7 @@ const SectionPlaceholder2 = ({ editor }) => {
                   setAddingSection={setAddingSection}
                   font={font4}
                   setFont={setFont4}
+                  panelNo="4"
                 >
                   {
                     (loadResource4 === true)

From 746282098a770961d6c691233b8d076a0deee0d9 Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Thu, 16 Nov 2023 17:08:20 +0530
Subject: [PATCH 02/10] test for adding sub section for resources

---
 e2e-tests/base.test.ts                       | 15 ++++++++++++++-
 renderer/src/layouts/editor/EditorSection.js |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index c83b5b442..eadf54aae 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -290,7 +290,7 @@ test('Adding panels', async () => {
   expect(title).toBe('1');
 });
 
-test("Adding 2 panels and removing from the editor", async () => {
+test("Adding refernce panels and removing from the editor", async () => {
   await window.waitForSelector('//*[@aria-label="add-panels"]')
   const addPanel = await window.locator('//*[@aria-label="add-panels"]')
   await addPanel.click()
@@ -303,6 +303,19 @@ test("Adding 2 panels and removing from the editor", async () => {
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('1')
 })
 
+test("Adding some more section for resource in editor", async () => {
+  await window.waitForSelector('//*[@aria-label="add-panels"]')
+  const addPanel = await window.locator('//*[@aria-label="add-panels"]')
+  await addPanel.click()
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
+  await addPanel.click()
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('3')
+  await window.locator('//*[@aria-label="resources-panel-1"]').hover()
+  await window.locator('//*[@aria-label="add-section-1"]').click()
+  await window.locator('//*[@aria-label="resources-panel-3"]').hover()
+  await window.locator('//*[@aria-label="add-section-3"]').click()
+})
+
 test('Increase the font size in the obs editor', async () => {
   await window.waitForSelector('//*[@aria-label="increase-font"]', { timeout: 5000 });
   await window.locator('//*[@aria-label="increase-font"]').click();
diff --git a/renderer/src/layouts/editor/EditorSection.js b/renderer/src/layouts/editor/EditorSection.js
index de1de511e..4ec0efe35 100644
--- a/renderer/src/layouts/editor/EditorSection.js
+++ b/renderer/src/layouts/editor/EditorSection.js
@@ -331,6 +331,7 @@ export default function EditorSection({
             <button
               type="button"
               title={t('tooltip-editor-add-section')}
+              aria-label={`add-section-${panelNo}`}
               onClick={addRow}
               className="absolute p-2 bg-primary rounded bottom-0 -right-0 invisible group-hover:visible"
             >

From c159331e37f6de595992d4708b9db2cb09c6ba4d Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Thu, 16 Nov 2023 17:15:56 +0530
Subject: [PATCH 03/10] test for remove all the added sub section and panel

---
 e2e-tests/base.test.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index eadf54aae..7a0067cd8 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -316,6 +316,19 @@ test("Adding some more section for resource in editor", async () => {
   await window.locator('//*[@aria-label="add-section-3"]').click()
 })
 
+test("Removing all the panels", async () => {
+  //removing added section 2 from reference panel 1
+  await removeResource(window, expect, 2, "confirm-remove")
+  //removing added section 4 from reference panel 2
+  await removeResource(window, expect, 4, "confirm-remove")
+  // removing 1 resource panel
+  await removeResource(window, expect, 1, "confirm-remove")
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
+  // removing 2 resource panel
+  await removeResource(window, expect, 3, "confirm-remove")
+  expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('1')
+})
+
 test('Increase the font size in the obs editor', async () => {
   await window.waitForSelector('//*[@aria-label="increase-font"]', { timeout: 5000 });
   await window.locator('//*[@aria-label="increase-font"]').click();

From f1a8f590a17f98e6a7281b96dbc720316d1b7ae5 Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Fri, 17 Nov 2023 10:50:14 +0530
Subject: [PATCH 04/10] test for add panel check tab is obs

---
 e2e-tests/base.test.ts                        | 29 ++++++++++--------
 e2e-tests/common.js                           | 30 +++++++++++--------
 .../components/Resources/ResourceTabPane.js   |  9 +++++-
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index 7a0067cd8..bf55d4054 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -11,7 +11,7 @@ import {
   exportAudioProject, updateDescriptionAbbriviation, changeLicense,
   customAddEditLanguage, customProjectTargetLanguage, starUnstar,
   clickUserImageToLogout, confirmBookInEditor, checkingUpdatedLicense,
-  createUser, projectPageExpect, removeResource
+  createUser, projectPageExpect, removeResource, addPanel
 } from './common';
 
 const fs = require('fs');
@@ -278,24 +278,21 @@ test('Add content in verses 1 and 2 in the obs story 1 editor', async () => {
 });
 
 test('Adding panels', async () => {
-  const addPanel = await window.locator('//*[@aria-label="add-panels"]');
-  await addPanel.click()
+  await addPanel(window)
   let title = await window.innerText('//*[@aria-label="number-of-panels"]');
   expect(title).toBe('2');
-  await addPanel.click()
+  await addPanel(window)
   title = await window.innerText('//*[@aria-label="number-of-panels"]');
   expect(title).toBe('3');
-  await addPanel.click()
+  await addPanel(window)
   title = await window.innerText('//*[@aria-label="number-of-panels"]');
   expect(title).toBe('1');
 });
 
 test("Adding refernce panels and removing from the editor", async () => {
-  await window.waitForSelector('//*[@aria-label="add-panels"]')
-  const addPanel = await window.locator('//*[@aria-label="add-panels"]')
-  await addPanel.click()
+  await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
-  await addPanel.click()
+  await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('3')
   await removeResource(window, expect, 1, "confirm-remove")
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
@@ -304,11 +301,9 @@ test("Adding refernce panels and removing from the editor", async () => {
 })
 
 test("Adding some more section for resource in editor", async () => {
-  await window.waitForSelector('//*[@aria-label="add-panels"]')
-  const addPanel = await window.locator('//*[@aria-label="add-panels"]')
-  await addPanel.click()
+  await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
-  await addPanel.click()
+  await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('3')
   await window.locator('//*[@aria-label="resources-panel-1"]').hover()
   await window.locator('//*[@aria-label="add-section-1"]').click()
@@ -329,6 +324,14 @@ test("Removing all the panels", async () => {
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('1')
 })
 
+test("open a resource panel, check the tab is obs and close", async () => {
+  await addPanel(window)
+  await window.locator('//*[@aria-label="load-module-1"]').click()
+  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
+  await expect(tab).toBe('obs')
+  await window.locator('//*[@aria-label="close-resource-pop"]').click()
+})
+
 test('Increase the font size in the obs editor', async () => {
   await window.waitForSelector('//*[@aria-label="increase-font"]', { timeout: 5000 });
   await window.locator('//*[@aria-label="increase-font"]').click();
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index 1176a7b73..e1f533ccb 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -224,18 +224,6 @@ export const checkProjectName = async (window, expect, name) => {
   await expect(projectname).toBe(name);
 }
 
-// removing resource
-export const removeResource = async (window, expect, resourcePaneNo, confirmButton) => {
-  await window.waitForSelector(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
-  const closePanel = await window.locator(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
-  expect(await closePanel).toBeVisible()
-  await closePanel.click()
-  const title = await window.locator('//*[@aria-label="confirm-title"]').textContent()
-  await expect(title).toBe(title)
-  expect(await window.locator(`//*[@aria-label="${confirmButton}"]`)).toBeVisible()
-  await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
-}
-
 // Checks for notifications.
 export const checkNotification = async (window, expect, projectname) => {
   // Wait for the notification button to appear and click it.
@@ -251,6 +239,23 @@ export const checkNotification = async (window, expect, projectname) => {
   await window.locator('//*[@aria-label="close-notification"]').click()
 }
 
+export const addPanel = async (window) => {
+  await window.waitForSelector('//*[@aria-label="add-panels"]')
+  await window.locator('//*[@aria-label="add-panels"]').click()
+}
+
+// removing resource
+export const removeResource = async (window, expect, resourcePaneNo, confirmButton) => {
+  await window.waitForSelector(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
+  const closePanel = await window.locator(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
+  expect(await closePanel).toBeVisible()
+  await closePanel.click()
+  const title = await window.locator('//*[@aria-label="confirm-title"]').textContent()
+  await expect(title).toBe(title)
+  expect(await window.locator(`//*[@aria-label="${confirmButton}"]`)).toBeVisible()
+  await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
+}
+
 // Navigates back to the project page from the editor
 export const goToProjectPage = async (window, expect) => {
   // Check if the back button is visible and click it.
@@ -297,6 +302,7 @@ export const exportProjects = async (window, expect, projectname) => {
   await window.locator('//*[@aria-label="export-projects"]').click()
   await window.waitForTimeout(2000)
   // Check for the success message.
+  await window.waitForSelector('//*[@aria-label="snack-text"]')
   const snackText = await window.locator('//*[@aria-label="snack-text"]').isVisible()
   await expect(snackText).toBe(true)
   await window.locator('//*[@aria-label="arrow-up"]').click()
diff --git a/renderer/src/components/Resources/ResourceTabPane.js b/renderer/src/components/Resources/ResourceTabPane.js
index 2d3125b8e..e478cf669 100644
--- a/renderer/src/components/Resources/ResourceTabPane.js
+++ b/renderer/src/components/Resources/ResourceTabPane.js
@@ -38,13 +38,18 @@ export default function ResourceTabPane({
     <div className="bg-gray-50 items-center p-3 justify-between w-full h-full">
       <Tab.Group>
         <Tab.List className="flex space-x-0 rounded-xl ">
-          <Tab className={({ selected }) => classNames(
+          <Tab
+            className={({ selected }) => classNames(
             'w-20 rounded-t-lg flex items-center justify-center font-bold py-2 text-xs leading-5 text-white uppercase',
             'ring-offset-2 ring-offset-white focus:outline-none z-50',
             selected
               ? 'bg-primary text-white'
               : 'text-black bg-gray-200',
           )}
+            aria-label={selectResource === 'bible'
+            ? t('label-resource-bible')
+            : selectResource === 'OBS' ? 'OBS'
+            : selectResource === 'audio' ? t('label-audio-bible') : selectResource}
           >
             {selectResource === 'bible'
             ? t('label-resource-bible')
@@ -64,6 +69,7 @@ export default function ResourceTabPane({
                     ? 'bg-primary text-white'
                     : 'text-black bg-gray-200',
                 )}
+                aria-label="resources-tab"
                 type="button"
                 onClick={() => { openResourceDialogBox(); setResourceIconClick(!resourceIconClick); }}
               >
@@ -86,6 +92,7 @@ export default function ResourceTabPane({
             )}
             type="button"
             onClick={() => { setOpenImportResourcePopUp(true); setResourceIconClick(!resourceIconClick); }}
+            aria-label="resource-collection-tab"
           >
             <PlusIcon
               className="w-4 h-4"

From ea237b3e8cb09e73a934f6084356bf0c3c2af558 Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Fri, 17 Nov 2023 10:51:25 +0530
Subject: [PATCH 05/10] test for download resource and display in added panel

---
 e2e-tests/base.test.ts                        |  9 ++++++-
 e2e-tests/common.js                           | 25 +++++++++++++++++++
 .../components/Resources/ObsBibleAudioTab.js  |  2 +-
 .../ResourceUtils/DownloadResourcePopUp.js    |  5 ++--
 .../components/Resources/ResourcesPopUp.js    |  1 +
 renderer/src/layouts/editor/EditorSection.js  |  2 +-
 6 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index bf55d4054..97dc1a462 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -11,7 +11,7 @@ import {
   exportAudioProject, updateDescriptionAbbriviation, changeLicense,
   customAddEditLanguage, customProjectTargetLanguage, starUnstar,
   clickUserImageToLogout, confirmBookInEditor, checkingUpdatedLicense,
-  createUser, projectPageExpect, removeResource, addPanel
+  createUser, projectPageExpect, removeResource, addPanel, downloadResource
 } from './common';
 
 const fs = require('fs');
@@ -332,6 +332,13 @@ test("open a resource panel, check the tab is obs and close", async () => {
   await window.locator('//*[@aria-label="close-resource-pop"]').click()
 })
 
+test("open a resource panel and download a obs english resource from resource tab and display in added panel", async () => {
+  await window.locator('//*[@aria-label="load-module-1"]').click()
+  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
+  await expect(tab).toBe('obs')
+  await downloadResource(window, expect, "en_obs")
+})
+
 test('Increase the font size in the obs editor', async () => {
   await window.waitForSelector('//*[@aria-label="increase-font"]', { timeout: 5000 });
   await window.locator('//*[@aria-label="increase-font"]').click();
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index e1f533ccb..1d3ba427c 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -256,6 +256,31 @@ export const removeResource = async (window, expect, resourcePaneNo, confirmButt
   await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
 }
 
+// download resource and display in panel
+export const downloadResource = async (window, expect, resourceName) => {
+  expect(await window.locator('//*[@aria-label="resources-tab"]')).toBeVisible()
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await expect(window.locator('//*[@id="resource-table"]')).toBeVisible()
+  const table = window.locator('//*[@id="resource-table"]')
+  const body = table.locator('//*[@id="resources-tab-body"]')
+  const rows = await body.locator('tr')
+  for (let i = 0; i < await rows.count(); i++) {
+    const row = await rows.nth(i);
+    const tds = await row.locator('td');
+    if (await tds.nth(1).textContent() === resourceName) {
+      // Check if the "download-resource" button is visible and click it.
+      await window.waitForSelector('//*[@aria-label="download-resource"]')
+      await tds.last().locator('//*[@aria-label="download-resource"]').click()
+      await window.waitForTimeout(500)
+      break;
+    }
+  }
+  expect(await window.locator('//*[@aria-label="obs"]')).toBeVisible()
+  await window.locator('//*[@aria-label="obs"]').click()
+  await window.waitForSelector(`//*[@id="${resourceName}"]`)
+  await window.locator(`//*[@id="${resourceName}"]`).click()
+}
+
 // Navigates back to the project page from the editor
 export const goToProjectPage = async (window, expect) => {
   // Check if the back button is visible and click it.
diff --git a/renderer/src/components/Resources/ObsBibleAudioTab.js b/renderer/src/components/Resources/ObsBibleAudioTab.js
index 15e814eae..5f85abab5 100644
--- a/renderer/src/components/Resources/ObsBibleAudioTab.js
+++ b/renderer/src/components/Resources/ObsBibleAudioTab.js
@@ -78,7 +78,7 @@ export default function ObsBibleAudioTab({
                       ? (
                         <tr className="hover:bg-gray-200" key={ref.value.identification.name.en + ref.projectDir}>
 
-                          <td colSpan={2} className="p-2">
+                          <td colSpan={2} className="p-2" id={`${ref.value.identification.name.en}`}>
                             <div
                               className="focus:outline-none"
                               onClick={(e) => handleRowSelect(
diff --git a/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js b/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
index 8a9f889e9..c72e3f9dd 100644
--- a/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
+++ b/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
@@ -404,7 +404,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
             </div>
           )
           : (
-            <table className="w-full text-left text-sm">
+            <table className="w-full text-left text-sm" id="resource-table">
               <thead>
                 <tr>
                   <th className="p-2 font-bold text-gray-700 uppercase tracking-wider w-8" />
@@ -425,7 +425,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
                   <th className="p-2 font-bold text-gray-700 uppercase tracking-wider" />
                 </tr>
               </thead>
-              <tbody>
+              <tbody id="resources-tab-body">
                 {Object.keys(resourceData).map((element) => (
                   <>
                     <tr>
@@ -472,6 +472,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
                               <button
                                 className="text-xs flex w-6 h-6 items-center gap-2 bg-gray-700 text-white group-hover:bg-white group-hover:text-gray-700 cursor-pointer p-1 rounded-full"
                                 type="button"
+                                aria-label="download-resource"
                                 title={t('tooltip-download')}
                                 onClick={() => handleDownload({ selection: 'single', id: row.id, parent: element })}
                               >
diff --git a/renderer/src/components/Resources/ResourcesPopUp.js b/renderer/src/components/Resources/ResourcesPopUp.js
index 35b963eae..03945d745 100644
--- a/renderer/src/components/Resources/ResourcesPopUp.js
+++ b/renderer/src/components/Resources/ResourcesPopUp.js
@@ -107,6 +107,7 @@ export default function ResourcesPopUp(
                 type="button"
                 className="bg-primary absolute h-full rounded-tr-lg right-0 text-white"
                 onClick={removeSection}
+                aria-label="close-resource-pop"
               >
                 <XMarkIcon className="mx-3 h-5 w-5" />
 
diff --git a/renderer/src/layouts/editor/EditorSection.js b/renderer/src/layouts/editor/EditorSection.js
index 4ec0efe35..12a973830 100644
--- a/renderer/src/layouts/editor/EditorSection.js
+++ b/renderer/src/layouts/editor/EditorSection.js
@@ -39,7 +39,7 @@ export default function EditorSection({
   setAddingSection,
   font,
   setFont,
-  panelNo 
+  panelNo,
 }) {
   const [openResourcePopUp, setOpenResourcePopUp] = useState(false);
   const [openModal, setOpenModal] = useState(false);

From 5b33eaec0b0fcd3a7d2dbe1d345152b4e0664f7c Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Tue, 21 Nov 2023 00:55:32 +0530
Subject: [PATCH 06/10] test for search obs resource

---
 e2e-tests/base.test.ts                        |  58 ++++++--
 e2e-tests/common.js                           | 135 ++++++++++++------
 .../EditorPage/ObsEditor/ReferenceObs.js      |   4 +-
 .../src/components/Profile/UserProfile.js     |   2 +-
 .../components/Resources/ObsBibleAudioTab.js  |   4 +-
 .../ResourceUtils/DownloadResourcePopUp.js    |   2 +
 renderer/src/layouts/editor/EditorSection.js  |   2 +-
 .../src/layouts/editor/SectionPlaceholder1.js |   2 +
 .../src/layouts/editor/SectionPlaceholder2.js |   2 +
 9 files changed, 150 insertions(+), 61 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index 97dc1a462..e6e544f2a 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -11,7 +11,8 @@ import {
   exportAudioProject, updateDescriptionAbbriviation, changeLicense,
   customAddEditLanguage, customProjectTargetLanguage, starUnstar,
   clickUserImageToLogout, confirmBookInEditor, checkingUpdatedLicense,
-  createUser, projectPageExpect, removeResource, addPanel, downloadResource
+  createUser, projectPageExpect, removeResource, addPanel, downloadResource,
+  searchResourceLanguage, downloadedResourceTable
 } from './common';
 
 const fs = require('fs');
@@ -139,6 +140,13 @@ test("Click the view users button and delete the playwright user from the active
   await projectPageExpect(window, expect)
 })
 
+test("Logout and check application language is changed", async ({ userName }) => {
+  await signOut(window, expect)
+  await window.locator(`//*[@id="${userName.toLowerCase()}"]`).click()
+  // landing to the project page
+  await projectPageExpect(window, expect)
+})
+
 /*changing app language english to hindi */
 test("App language change English to hindi", async ({ english, hindi }) => {
   // Change the app language from English to hindi
@@ -153,12 +161,7 @@ test("App language change English to hindi", async ({ english, hindi }) => {
   await projectPageExpect(window, expect)
 })
 
-test("Logout and check application language is changed", async ({ userName }) => {
-  await signOut(window, expect)
-  await window.locator(`//*[@id="${userName.toLowerCase()}"]`).click()
-  // landing to the project page
-  await projectPageExpect(window, expect)
-})
+
 
 /* NEW PAGE*/
 /*CREATE PROJECTS FOR ALL FLAVOR TYPE */
@@ -336,7 +339,46 @@ test("open a resource panel and download a obs english resource from resource ta
   await window.locator('//*[@aria-label="load-module-1"]').click()
   const tab = await window.locator('//*[@aria-label="obs"]').textContent()
   await expect(tab).toBe('obs')
-  await downloadResource(window, expect, "en_obs")
+  await downloadResource(window, expect, "en_obs", "obs")
+  await downloadedResourceTable(window, expect, "en_obs", 1, "obs")
+})
+
+test("add a new resource panel, search hindi resource, download and display", async ({ hindi }) => {
+  await addPanel(window)
+  await window.locator('//*[@aria-label="load-module-3"]').click()
+  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
+  await expect(tab).toBe('obs')
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await searchResourceLanguage(window, expect, hindi)
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await window.locator('//*[@aria-label="save-filter"]').click()
+  await downloadResource(window, expect, "hi_obs", "obs")
+  await downloadedResourceTable(window, expect, "hi_obs", 3, "obs")
+})
+
+test("Clear search langague and pre-release version", async () => {
+  await window.locator('//*[@aria-label="resources-selector-3"]').click()
+  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
+  await expect(tab).toBe('obs')
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await searchResourceLanguage(window, expect, "Urdu")
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await window.locator('//*[@id="pre-prod"]').check()
+  await window.locator('//*[@aria-label="clear-language-version"]').click()
+  await window.locator('//*[@aria-label="close-resource-pop"]').click()
+})
+
+test("Download Persian obs resource with pre-release and replace with Hindi resource", async ({ farsi }) => {
+  await window.locator('//*[@aria-label="resources-selector-3"]').click()
+  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
+  await expect(tab).toBe('obs')
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await searchResourceLanguage(window, expect, "Persian (Farsi)")
+  await window.locator('//*[@aria-label="resources-tab"]').click()
+  await window.locator('//*[@id="pre-prod"]').check()
+  await window.locator('//*[@aria-label="save-filter"]').click()
+  await downloadResource(window, expect, "fa_obs", "obs")
+  await downloadedResourceTable(window, expect, "fa_obs", 3, "obs")
 })
 
 test('Increase the font size in the obs editor', async () => {
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index 1d3ba427c..b00a04e3b 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -1,5 +1,5 @@
 // get the user path
-const userPath= async (window) => {
+const userPath = async (window) => {
   const path = await window.evaluate(() => Object.assign({}, window.localStorage))
   return path.userPath
 }
@@ -29,8 +29,8 @@ export const showLoginPage = async (fs, folder, userName, json, userData, window
 }
 
 //logout and delete the playwright user from backend
-export const clickUserImageToLogout = async (window, expect, userName, path, fs, packageInfo )=> {
-    // Here you handle user login and logout logic, user data, and folder management.
+export const clickUserImageToLogout = async (window, expect, userName, path, fs, packageInfo) => {
+  // Here you handle user login and logout logic, user data, and folder management.
   //Retrieves and parses a JSON file containing user information
   const userData = await userJson(window, packageInfo, path)
   const data = await fs.readFileSync(userData);
@@ -48,7 +48,7 @@ export const clickUserImageToLogout = async (window, expect, userName, path, fs,
   expect(currentUser).not.toBeNull();
 
   // Check if signout button is visible
-  const signoutButton = window.locator('//*[@aria-label="signout"]');
+  const signoutButton = window.locator('//*[@aria-label="sign-out"]');
   expect(await signoutButton.isVisible()).toBeTruthy();
   await signoutButton.click();
 
@@ -56,7 +56,7 @@ export const clickUserImageToLogout = async (window, expect, userName, path, fs,
   if (currentUser.toLowerCase() === userName.toLowerCase() && await fs.existsSync(folder)) {
     await showLoginPage(fs, folder, userName, json, userData, window, expect);
   }
-} 
+}
 
 // Performs user validation checks.
 export const createUser = async (window, expect, username) => {
@@ -83,8 +83,7 @@ export const clickUserImage = async (window, expect, itemClick) => {
   const imageClick = await window.locator('//*[@id="user-profile-image"]')
   expect(await imageClick).toBeVisible();
   await imageClick.click();
-  // Verify that the user profile is visible and click on it.
-  await window.waitForSelector(`//*[@aria-label="${itemClick}"]`)
+  await window.waitForSelector(`//*[@aria-label="${itemClick}"]`, { timeout: 10000 })
   expect(await window.locator(`//*[@aria-label="${itemClick}"]`)).toBeVisible();
   await window.locator(`//*[@aria-label="${itemClick}"]`).click();
 }
@@ -92,23 +91,23 @@ export const clickUserImage = async (window, expect, itemClick) => {
 // Signs the user out.
 export const signOut = async (window, expect) => {
   // Open the user profile menu and signout
-  await clickUserImage(window, expect, "signout")
+  await clickUserImage(window, expect, "sign-out")
   // Wait for the signout process to complete.
   await window.waitForTimeout(1000)
   // Verify that the user is signed out.
-  const welcome = await window.locator('//*[@aria-label="welcome"]', {timeout:5000}).textContent()
+  const welcome = await window.locator('//*[@aria-label="welcome"]', { timeout: 5000 }).textContent()
   await expect(welcome).toBe("Welcome!")
   await window.waitForTimeout(200)
 }
 
 // Shows a list of active users.
 export const showActiveUsers = async (window, expect) => {
- // Ensure the "view-more" button is visible and click it with a timeout of 5 seconds.
- await expect(window.locator('//*[@id="view-more"]', { timeout: 5000 })).toBeVisible();
- await window.locator('//*[@id="view-more"]', { timeout: 5000 }).click();
- // Get the text content of the "active-tab" element and verify it is "Active".
- const active = await window.locator('//*[@id="active-tab"]').textContent();
- await expect(active).toBe("Active");
+  // Ensure the "view-more" button is visible and click it with a timeout of 5 seconds.
+  await expect(window.locator('//*[@id="view-more"]', { timeout: 5000 })).toBeVisible();
+  await window.locator('//*[@id="view-more"]', { timeout: 5000 }).click();
+  // Get the text content of the "active-tab" element and verify it is "Active".
+  const active = await window.locator('//*[@id="active-tab"]').textContent();
+  await expect(active).toBe("Active");
 }
 
 // Performs project creation validation checks.
@@ -182,7 +181,7 @@ export const searchProject = async (window, expect, projectname, searchtext) =>
   const rows = await body.locator('tr')
   const itemSearch = await window.locator('//input[@id="search_box"]')
   await itemSearch.click()
-  if(await rows.count() >= 4){
+  if (await rows.count() >= 4) {
     await itemSearch.fill("translation")
     await window.waitForTimeout(1000)
     expect(await rows.count() > 1).toBe(true)
@@ -199,7 +198,7 @@ export const searchProject = async (window, expect, projectname, searchtext) =>
   expect(await rows.count()).toBe(0)
   await itemSearch.fill(" ")
   await window.waitForTimeout(1000)
-  expect(await rows.count() > 1).toBe(true) 
+  expect(await rows.count() > 1).toBe(true)
 
 }
 
@@ -213,12 +212,12 @@ export const checkProjectName = async (window, expect, name) => {
     const row = await rows.nth(i);
     const tds = await row.locator('td');
     if (await tds.nth(1).textContent() === name) {
-      await tds.nth(1).click({timeout:10000})
+      await tds.nth(1).click({ timeout: 10000 })
       break
     }
   }
   await window.waitForTimeout(1000)
-  await window.waitForSelector('//*[@aria-label="editor-project-name"]',{ timeout: 120000 })
+  await window.waitForSelector('//*[@aria-label="editor-project-name"]', { timeout: 120000 })
   const projectname = await window.locator('//*[@aria-label="editor-project-name"]', { timeout: 120000 }).textContent()
   // expecting project name in editor
   await expect(projectname).toBe(name);
@@ -227,7 +226,7 @@ export const checkProjectName = async (window, expect, name) => {
 // Checks for notifications.
 export const checkNotification = async (window, expect, projectname) => {
   // Wait for the notification button to appear and click it.
-  await window.waitForSelector('//*[@aria-label="notification-button"]', {timeout : 5000})
+  await window.waitForSelector('//*[@aria-label="notification-button"]', { timeout: 5000 })
   await window.locator('//*[@aria-label="notification-button"]').click()
   await window.waitForTimeout(1000)
   // Check if the notification title is "Notifications."
@@ -256,10 +255,22 @@ export const removeResource = async (window, expect, resourcePaneNo, confirmButt
   await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
 }
 
+export const searchResourceLanguage = async (window, expect, searchLanguage) => {
+  await window.waitForSelector('//*[@aria-label="custom-dropdown"]')
+  const searchLang = await window.locator('//*[@aria-label="custom-dropdown"]')
+  expect(await searchLang).toBeVisible();
+  // Fill in the search language.
+  await searchLang.click()
+  await searchLang.fill(searchLanguage)
+  // Click on the selectLanguage in the dropdown.
+  await window.locator(`//*[@aria-label="${searchLanguage}"]`).click({ timeout: 10000 });
+  await window.waitForTimeout(2000)
+}
+
 // download resource and display in panel
-export const downloadResource = async (window, expect, resourceName) => {
-  expect(await window.locator('//*[@aria-label="resources-tab"]')).toBeVisible()
+export const downloadResource = async (window, expect, resourceName, tabType) => {
   await window.locator('//*[@aria-label="resources-tab"]').click()
+  await window.waitForSelector('//*[@id="resource-table"]')
   await expect(window.locator('//*[@id="resource-table"]')).toBeVisible()
   const table = window.locator('//*[@id="resource-table"]')
   const body = table.locator('//*[@id="resources-tab-body"]')
@@ -271,16 +282,46 @@ export const downloadResource = async (window, expect, resourceName) => {
       // Check if the "download-resource" button is visible and click it.
       await window.waitForSelector('//*[@aria-label="download-resource"]')
       await tds.last().locator('//*[@aria-label="download-resource"]').click()
-      await window.waitForTimeout(500)
+      await window.waitForTimeout(1000)
+      // wait for until the resource may download
+      expect(await tds.nth(1).textContent({ timeout: 100000 })).toBe(resourceName)
+      break;
+    }
+  }
+  const bibleObsTab = await window.locator(`//*[@aria-label="${tabType}"]`)
+  expect(await bibleObsTab).toBeVisible()
+  await bibleObsTab.click()
+  expect(await bibleObsTab.textContent()).toBe(tabType)
+}
+
+export const downloadedResourceTable = async (window, expect, resourceName, panelNo, tabType) => {
+  const bibleObsTab = await window.locator(`//*[@aria-label="${tabType}"]`, { timeout: 10000 })
+  expect(await bibleObsTab).toBeVisible()
+  await window.waitForSelector('//*[@id="downloaded-resources-table"]')
+  await expect(window.locator('//*[@id="downloaded-resources-table"]')).toBeVisible()
+  const table = window.locator('//*[@id="downloaded-resources-table"]')
+  const body = table.locator('//*[@id="downloaded-resources-table-body"]')
+  const rows = await body.locator('tr')
+  for (let i = 0; i < await rows.count(); i++) {
+    const row = await rows.nth(i);
+    const tds = await row.locator('td');
+    const data = await tds.nth(0).textContent()
+    const dataSplit = data.slice(0, 6)
+    if (await dataSplit === resourceName) {
+      await tds.nth(0).click()
       break;
     }
   }
-  expect(await window.locator('//*[@aria-label="obs"]')).toBeVisible()
-  await window.locator('//*[@aria-label="obs"]').click()
-  await window.waitForSelector(`//*[@id="${resourceName}"]`)
-  await window.locator(`//*[@id="${resourceName}"]`).click()
+  await window.waitForSelector(`//*[@aria-label="obs-resource-${panelNo}"]`)
+  const resoursetitle = await window.locator(`//*[@aria-label="obs-resource-${panelNo}"]`, { timeout: 10000 }).innerHTML()
+  const splitString = await resoursetitle.slice(0, 6)
+  expect(await splitString).toBe(resourceName)
+  const storyTitle = await window.locator(`//*[@aria-label="obs-story-book-title-${panelNo}"]`).innerHTML()
+  expect(await storyTitle).toBe(storyTitle)
+  await window.waitForTimeout(1000)
 }
 
+
 // Navigates back to the project page from the editor
 export const goToProjectPage = async (window, expect) => {
   // Check if the back button is visible and click it.
@@ -334,8 +375,8 @@ export const exportProjects = async (window, expect, projectname) => {
 }
 
 //Export a project with chapter and full audio project
-export const exportAudioProject = async(window, expect, projectname, itemCheck) => {
-    // Get the user's download path from localStorage.
+export const exportAudioProject = async (window, expect, projectname, itemCheck) => {
+  // Get the user's download path from localStorage.
   const splitPath = await userPath(window)
   const userpath = splitPath.split(".")[0]
   // Use the common function to locate the project and export it.
@@ -361,7 +402,7 @@ export const archivedProjects = async (window, expect, projectname) => {
   await projectPageExpect(window, expect)
   const archiveProjectName = await window.locator(`//*[@id="${projectname}"]`).innerHTML()
   await expect(archiveProjectName).toBe(projectname);
-   // Click the "active-projects" button to go back to the active projects.
+  // Click the "active-projects" button to go back to the active projects.
   await window.locator('//*[@aria-label="active-projects"]').click()
   await projectPageExpect(window, expect)
 }
@@ -390,11 +431,11 @@ export const goToEditProject = async (window, expect, projectName) => {
 
 // Changes the target language for a project.
 export const projectTargetLanguage = async (window, expect, projectName, searchLangauge, selectLanguage) => {
-   // Navigate to the project editing page.
-   await goToEditProject(window, expect, projectName);
-   // Ensure the custom dropdown is visible.
+  // Navigate to the project editing page.
+  await goToEditProject(window, expect, projectName);
+  // Ensure the custom dropdown is visible.
   await window.waitForSelector('//*[@aria-label="custom-dropdown"]')
-  const searchLang = await window.locator('//*[@aria-label="custom-dropdown"]') 
+  const searchLang = await window.locator('//*[@aria-label="custom-dropdown"]')
   expect(await searchLang).toBeVisible();
   // Fill in the search language.
   await searchLang.click()
@@ -410,7 +451,7 @@ export const projectTargetLanguage = async (window, expect, projectName, searchL
   // Locate the projects list, find the target project, and verify the selected language.
   const table = window.locator('//*[@id="projects-list"]');
   const body = table.locator('//*[@id="projects-list-body"]');
-  const rows = body.locator('tr');
+  const rows = await body.locator('tr');
   for (let i = 0; i < await rows.count(); i++) {
     const row = await rows.nth(i);
     const tds = await row.locator('td');
@@ -422,12 +463,12 @@ export const projectTargetLanguage = async (window, expect, projectName, searchL
   await goToEditProject(window, expect, projectName);
   await window.locator('//*[@aria-label="cancel-edit-project"]').click()
   await projectPageExpect(window, expect)
-  
+
 }
 
 // Updates the project description and abbreviation.
 export const updateDescriptionAbbriviation = async (window, expect, descriptionText, abbreviation, projectname) => {
-   // Get the initial description and verify it.
+  // Get the initial description and verify it.
   const description = await window.textContent('//textarea[@id="project_description"]');
   await expect(description).toBe('test description');
   // Fill in the new description.
@@ -459,15 +500,15 @@ export const confirmBookInEditor = async (window, expect, book, chapter, verse,
 
 // Changes the project license.
 export const changeLicense = async (window, expect, currentLicense, newLicense) => {
- // Click on the current license to change it.
- await window.locator(`//*[@id="${currentLicense}"]`).click();
- // Click on the new license.
- await window.locator(`//*[@aria-label="${newLicense}"]`).click();
- // Ensure the "Save" button is visible and click it.
- await expect(window.locator('//*[@aria-label="save-edit-project"]')).toBeVisible();
- await window.locator('//*[@aria-label="save-edit-project"]').click();
- // Verify the title of the page is "Projects."
- await projectPageExpect(window, expect)
+  // Click on the current license to change it.
+  await window.locator(`//*[@id="${currentLicense}"]`).click();
+  // Click on the new license.
+  await window.locator(`//*[@aria-label="${newLicense}"]`).click();
+  // Ensure the "Save" button is visible and click it.
+  await expect(window.locator('//*[@aria-label="save-edit-project"]')).toBeVisible();
+  await window.locator('//*[@aria-label="save-edit-project"]').click();
+  // Verify the title of the page is "Projects."
+  await projectPageExpect(window, expect)
 }
 
 export const checkingUpdatedLicense = async (window, expect, projectname, newLicense, flavorType) => {
@@ -530,7 +571,7 @@ export const customProjectTargetLanguage = async (window, expect, projectname, f
 }
 
 // Performs user profile validation checks.
-export const userProfileValidaiton = async(window, expect) => {
+export const userProfileValidaiton = async (window, expect) => {
   await clickUserImage(window, expect, "user-profile")
   // Check if the "given-name" input is visible and fill it with "b".
   await expect(window.locator('input[name="given-name"]')).toBeVisible();
diff --git a/renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js b/renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js
index 43fe2b1ac..bc1fa5d75 100644
--- a/renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js
+++ b/renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js
@@ -17,7 +17,7 @@ const style = {
     fontStyle: 'italic',
   },
 };
-const ReferenceObs = ({ stories }) => {
+const ReferenceObs = ({ stories, panelNo }) => {
   const [isLoading, setIsLoading] = useState(true);
   const [networkState, setNetworkState] = useState({ online: true });
   const {
@@ -88,7 +88,7 @@ const { t } = useTranslation();
               >
                 {
                   Object.prototype.hasOwnProperty.call(story, 'title') && (
-                  <p className="text-xl text-gray-600 w-full text-center" style={style.bold}>
+                  <p className="text-xl text-gray-600 w-full text-center" aria-label={`obs-story-book-title-${panelNo}`} style={style.bold}>
                     {story.title}
                   </p>
                   )
diff --git a/renderer/src/components/Profile/UserProfile.js b/renderer/src/components/Profile/UserProfile.js
index 45637bf9d..11a5f16f0 100644
--- a/renderer/src/components/Profile/UserProfile.js
+++ b/renderer/src/components/Profile/UserProfile.js
@@ -120,7 +120,7 @@ const UserProfile = () => {
                       <Link
                         href="/"
                         id="signout"
-                        aria-label="signout"
+                        aria-label="sign-out"
                         onClick={() => (isElectron() ? logout() : signOut())}
                         role="button"
                         tabIndex={0}
diff --git a/renderer/src/components/Resources/ObsBibleAudioTab.js b/renderer/src/components/Resources/ObsBibleAudioTab.js
index 5f85abab5..3230b7e70 100644
--- a/renderer/src/components/Resources/ObsBibleAudioTab.js
+++ b/renderer/src/components/Resources/ObsBibleAudioTab.js
@@ -55,7 +55,7 @@ export default function ObsBibleAudioTab({
       )
         : (
           <div>
-            <table className="w-full text-left text-sm">
+            <table className="w-full text-left text-sm" id="downloaded-resources-table">
               <thead>
                 <tr>
                   <th colSpan={2} className="px-5 py-3 font-bold text-gray-700 uppercase tracking-wider">
@@ -72,7 +72,7 @@ export default function ObsBibleAudioTab({
               </thead>
 
               {selectResource === currentResourceType.resourceType && (
-                <tbody>
+                <tbody id="downloaded-resources-table-body">
                   {filteredBibleObsAudio?.length > 0 && (
                     filteredBibleObsAudio.map((ref) => (ref?.value?.type?.flavorType?.flavor?.name === currentResourceType.flavorName
                       ? (
diff --git a/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js b/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
index c72e3f9dd..58a2c1756 100644
--- a/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
+++ b/renderer/src/components/Resources/ResourceUtils/DownloadResourcePopUp.js
@@ -375,6 +375,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
         <div className="flex items-center gap-4">
           <button
             type="button"
+            aria-label="clear-language-version"
             className="bg-error leading-loose rounded shadow text-xs px-2 font-base text-white tracking-wide uppercase"
             onClick={handleClearFilter}
           >
@@ -382,6 +383,7 @@ function DownloadResourcePopUp({ selectResource, isOpenDonwloadPopUp, setIsOpenD
           </button>
           <button
             type="button"
+            aria-label="save-filter"
             className="bg-success leading-loose rounded shadow text-xs px-2 font-base text-white tracking-wide uppercase"
             onClick={handleSaveFilter}
           >
diff --git a/renderer/src/layouts/editor/EditorSection.js b/renderer/src/layouts/editor/EditorSection.js
index 12a973830..bcd90dbd2 100644
--- a/renderer/src/layouts/editor/EditorSection.js
+++ b/renderer/src/layouts/editor/EditorSection.js
@@ -237,7 +237,7 @@ export default function EditorSection({
                   ) : (
                     <div className="flex">
                       <div className="py-2 uppercase tracking-wider text-xs font-semibold">
-                        <div className="ml-4 h-4 flex justify-center items-center text-xxs uppercase tracking-wider font-bold leading-3 truncate">
+                        <div aria-label={`obs-resource-${panelNo}`} className="ml-4 h-4 flex justify-center items-center text-xxs uppercase tracking-wider font-bold leading-3 truncate">
                           {title}
                         </div>
                       </div>
diff --git a/renderer/src/layouts/editor/SectionPlaceholder1.js b/renderer/src/layouts/editor/SectionPlaceholder1.js
index 29f61db40..0c10f44dc 100644
--- a/renderer/src/layouts/editor/SectionPlaceholder1.js
+++ b/renderer/src/layouts/editor/SectionPlaceholder1.js
@@ -334,6 +334,7 @@ const SectionPlaceholder1 = ({ editor }) => {
                         {referenceColumnOneData1?.languageId
                           && (
                             <ReferenceObs
+                              panelNo="1"
                               stories={stories1}
                             />
                           )}
@@ -408,6 +409,7 @@ const SectionPlaceholder1 = ({ editor }) => {
                         {referenceColumnOneData2?.languageId
                           && (
                             <ReferenceObs
+                              panelNo="2"
                               stories={stories2}
                             />
                           )}
diff --git a/renderer/src/layouts/editor/SectionPlaceholder2.js b/renderer/src/layouts/editor/SectionPlaceholder2.js
index 5827b7b3f..bc5cc5980 100644
--- a/renderer/src/layouts/editor/SectionPlaceholder2.js
+++ b/renderer/src/layouts/editor/SectionPlaceholder2.js
@@ -333,6 +333,7 @@ const SectionPlaceholder2 = ({ editor }) => {
                         {referenceColumnTwoData1?.languageId
                           && (
                             <ReferenceObs
+                              panelNo="3"
                               stories={stories1}
                             />
                           )}
@@ -405,6 +406,7 @@ const SectionPlaceholder2 = ({ editor }) => {
                         {referenceColumnTwoData2?.languageId
                           && (
                             <ReferenceObs
+                              panelNo="4"
                               stories={stories2}
                             />
                           )}

From b33cf4d3559e997b66bf862d3eacb893edb960b3 Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Tue, 21 Nov 2023 01:10:02 +0530
Subject: [PATCH 07/10] added comment line for newly obs test

---
 e2e-tests/base.test.ts | 60 +++++++++++++++++++++++++++++++++++++++---
 e2e-tests/common.js    | 39 ++++++++++++++++++++++++---
 2 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index e6e544f2a..f38b61b9b 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -280,107 +280,159 @@ test('Add content in verses 1 and 2 in the obs story 1 editor', async () => {
   expect(verse3).toBe('Story content added in verse 3');
 });
 
+// Test case for adding panels and verifying the panel count.
 test('Adding panels', async () => {
+  // Add a panel
   await addPanel(window)
+  // Get the panel count and expect it to be '2'
   let title = await window.innerText('//*[@aria-label="number-of-panels"]');
   expect(title).toBe('2');
+  // Add another panel
   await addPanel(window)
+  // Get the panel count and expect it to be '3'
   title = await window.innerText('//*[@aria-label="number-of-panels"]');
   expect(title).toBe('3');
+  // Add one more panel
   await addPanel(window)
+  // Get the panel count and expect it to be '1' (cycling back to 1)
   title = await window.innerText('//*[@aria-label="number-of-panels"]');
   expect(title).toBe('1');
 });
 
+// Test case for adding reference panels, removing them, and verifying the panel count.
 test("Adding refernce panels and removing from the editor", async () => {
+  // Add two panels
   await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
   await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('3')
+  // Remove a panel (reference panel 1)
   await removeResource(window, expect, 1, "confirm-remove")
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
+  // Remove another panel (reference panel 3)
   await removeResource(window, expect, 3, "confirm-remove")
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('1')
 })
 
+// Test case for adding sections for a resource in the editor.
 test("Adding some more section for resource in editor", async () => {
+  // Add two panels
   await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
   await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('3')
+  // Hover over the first panel, add a section
   await window.locator('//*[@aria-label="resources-panel-1"]').hover()
   await window.locator('//*[@aria-label="add-section-1"]').click()
+  // Hover over the third panel, add a section
   await window.locator('//*[@aria-label="resources-panel-3"]').hover()
   await window.locator('//*[@aria-label="add-section-3"]').click()
 })
 
+// Test case for removing all panels.
 test("Removing all the panels", async () => {
-  //removing added section 2 from reference panel 1
+  // Remove section 2 from reference panel 1
   await removeResource(window, expect, 2, "confirm-remove")
-  //removing added section 4 from reference panel 2
+  // Remove section 4 from reference panel 2
   await removeResource(window, expect, 4, "confirm-remove")
-  // removing 1 resource panel
+  // Remove 1 resource panel
   await removeResource(window, expect, 1, "confirm-remove")
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
-  // removing 2 resource panel
+  // Remove 2 resource panels
   await removeResource(window, expect, 3, "confirm-remove")
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('1')
 })
 
+// Test case for opening a resource panel, checking the tab is obs, and closing.
 test("open a resource panel, check the tab is obs and close", async () => {
+  // Add a panel
   await addPanel(window)
+  // Click to load module in the first panel
   await window.locator('//*[@aria-label="load-module-1"]').click()
+  // Get the tab text and expect it to be 'obs'
   const tab = await window.locator('//*[@aria-label="obs"]').textContent()
   await expect(tab).toBe('obs')
+  // Click to close the resource panel
   await window.locator('//*[@aria-label="close-resource-pop"]').click()
 })
 
+// Test case for opening a resource panel, downloading an obs English resource, and displaying it in the added panel.
 test("open a resource panel and download a obs english resource from resource tab and display in added panel", async () => {
+  // Click to load module in the first panel
   await window.locator('//*[@aria-label="load-module-1"]').click()
+  // Get the tab text and expect it to be 'obs'
   const tab = await window.locator('//*[@aria-label="obs"]').textContent()
   await expect(tab).toBe('obs')
+  // Download the English obs resource and display it in the added panel
   await downloadResource(window, expect, "en_obs", "obs")
   await downloadedResourceTable(window, expect, "en_obs", 1, "obs")
 })
 
+// Test case for adding a new resource panel, searching for a Hindi resource, downloading, and displaying it.
 test("add a new resource panel, search hindi resource, download and display", async ({ hindi }) => {
+  // Add a panel
   await addPanel(window)
+  // Click to load module in the third panel
   await window.locator('//*[@aria-label="load-module-3"]').click()
+  // Get the tab text and expect it to be 'obs'
   const tab = await window.locator('//*[@aria-label="obs"]').textContent()
   await expect(tab).toBe('obs')
+  // Switch to the resources tab and search for Hindi resource
   await window.locator('//*[@aria-label="resources-tab"]').click()
   await searchResourceLanguage(window, expect, hindi)
   await window.locator('//*[@aria-label="resources-tab"]').click()
+  // Save the filter, download the Hindi obs resource, and display it in the third panel
   await window.locator('//*[@aria-label="save-filter"]').click()
   await downloadResource(window, expect, "hi_obs", "obs")
   await downloadedResourceTable(window, expect, "hi_obs", 3, "obs")
 })
 
+// Test case for clearing search language and pre-release version filters.
 test("Clear search langague and pre-release version", async () => {
+  // Switch to the third resource panel
   await window.locator('//*[@aria-label="resources-selector-3"]').click()
+  // Get the tab text and expect it to be 'obs'
   const tab = await window.locator('//*[@aria-label="obs"]').textContent()
   await expect(tab).toBe('obs')
+  // Switch to the resources tab and search for Urdu language
   await window.locator('//*[@aria-label="resources-tab"]').click()
   await searchResourceLanguage(window, expect, "Urdu")
   await window.locator('//*[@aria-label="resources-tab"]').click()
+  // Check the pre-release version, clear search language and pre-release version filters, and close the resource panel
   await window.locator('//*[@id="pre-prod"]').check()
   await window.locator('//*[@aria-label="clear-language-version"]').click()
   await window.locator('//*[@aria-label="close-resource-pop"]').click()
 })
 
+// Test case for downloading Persian obs resource with pre-release and replacing it with Hindi resource.
 test("Download Persian obs resource with pre-release and replace with Hindi resource", async ({ farsi }) => {
+  // Switch to the third resource panel
   await window.locator('//*[@aria-label="resources-selector-3"]').click()
+  // Get the tab text and expect it to be 'obs'
   const tab = await window.locator('//*[@aria-label="obs"]').textContent()
   await expect(tab).toBe('obs')
+
+  // Switch to the resources tab
   await window.locator('//*[@aria-label="resources-tab"]').click()
+
+  // Search for Persian (Farsi) language resource
   await searchResourceLanguage(window, expect, "Persian (Farsi)")
+
+  // Switch back to the resources tab
   await window.locator('//*[@aria-label="resources-tab"]').click()
+
+  // Check the pre-release version filter
   await window.locator('//*[@id="pre-prod"]').check()
+
+  // Save the filter settings
   await window.locator('//*[@aria-label="save-filter"]').click()
+
+  // Download the Persian obs resource and display it in the third panel
   await downloadResource(window, expect, "fa_obs", "obs")
   await downloadedResourceTable(window, expect, "fa_obs", 3, "obs")
 })
 
+
 test('Increase the font size in the obs editor', async () => {
   await window.waitForSelector('//*[@aria-label="increase-font"]', { timeout: 5000 });
   await window.locator('//*[@aria-label="increase-font"]').click();
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index b00a04e3b..f11fddd4e 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -255,69 +255,102 @@ export const removeResource = async (window, expect, resourcePaneNo, confirmButt
   await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
 }
 
+// This function is responsible for searching and selecting a language in a custom dropdown.
 export const searchResourceLanguage = async (window, expect, searchLanguage) => {
+  // Wait for the custom dropdown to be visible.
   await window.waitForSelector('//*[@aria-label="custom-dropdown"]')
   const searchLang = await window.locator('//*[@aria-label="custom-dropdown"]')
+  // Ensure that the custom dropdown is visible.
   expect(await searchLang).toBeVisible();
-  // Fill in the search language.
+  
+  // Click on the custom dropdown to activate the language search.
   await searchLang.click()
+  // Fill in the search language in the dropdown.
   await searchLang.fill(searchLanguage)
   // Click on the selectLanguage in the dropdown.
   await window.locator(`//*[@aria-label="${searchLanguage}"]`).click({ timeout: 10000 });
+  // Wait for 2000 milliseconds (2 seconds).
   await window.waitForTimeout(2000)
 }
 
-// download resource and display in panel
+// This function is responsible for navigating to the resources tab, locating a specific resource, and downloading it.
 export const downloadResource = async (window, expect, resourceName, tabType) => {
+  // Navigate to the resources tab.
   await window.locator('//*[@aria-label="resources-tab"]').click()
+  // Wait for the resource table to be visible.
   await window.waitForSelector('//*[@id="resource-table"]')
+  // Ensure that the resource table is visible.
   await expect(window.locator('//*[@id="resource-table"]')).toBeVisible()
   const table = window.locator('//*[@id="resource-table"]')
   const body = table.locator('//*[@id="resources-tab-body"]')
   const rows = await body.locator('tr')
+
+  // Iterate through each row in the resource table.
   for (let i = 0; i < await rows.count(); i++) {
     const row = await rows.nth(i);
     const tds = await row.locator('td');
+    
+    // Check if the resource name in the current row matches the target resource name.
     if (await tds.nth(1).textContent() === resourceName) {
       // Check if the "download-resource" button is visible and click it.
       await window.waitForSelector('//*[@aria-label="download-resource"]')
       await tds.last().locator('//*[@aria-label="download-resource"]').click()
+      // Wait for 1000 milliseconds (1 second).
       await window.waitForTimeout(1000)
-      // wait for until the resource may download
+      // Check if the downloaded resource name matches the target resource name.
       expect(await tds.nth(1).textContent({ timeout: 100000 })).toBe(resourceName)
       break;
     }
   }
+
+  // Switch to the specified tab type.
   const bibleObsTab = await window.locator(`//*[@aria-label="${tabType}"]`)
   expect(await bibleObsTab).toBeVisible()
   await bibleObsTab.click()
   expect(await bibleObsTab.textContent()).toBe(tabType)
 }
 
+// This function is responsible for navigating to the downloaded resources table and verifying the presence of a specific resource.
 export const downloadedResourceTable = async (window, expect, resourceName, panelNo, tabType) => {
+  // Wait for the specified tab type to be visible.
   const bibleObsTab = await window.locator(`//*[@aria-label="${tabType}"]`, { timeout: 10000 })
   expect(await bibleObsTab).toBeVisible()
+  
+  // Wait for the downloaded resources table to be visible.
   await window.waitForSelector('//*[@id="downloaded-resources-table"]')
   await expect(window.locator('//*[@id="downloaded-resources-table"]')).toBeVisible()
   const table = window.locator('//*[@id="downloaded-resources-table"]')
   const body = table.locator('//*[@id="downloaded-resources-table-body"]')
   const rows = await body.locator('tr')
+
+  // Iterate through each row in the downloaded resources table.
   for (let i = 0; i < await rows.count(); i++) {
     const row = await rows.nth(i);
     const tds = await row.locator('td');
     const data = await tds.nth(0).textContent()
     const dataSplit = data.slice(0, 6)
+
+    // Check if the resource name in the current row matches the target resource name.
     if (await dataSplit === resourceName) {
+      // Click on the resource in the downloaded resources table.
       await tds.nth(0).click()
       break;
     }
   }
+
+  // Wait for the resource panel to be visible.
   await window.waitForSelector(`//*[@aria-label="obs-resource-${panelNo}"]`)
   const resoursetitle = await window.locator(`//*[@aria-label="obs-resource-${panelNo}"]`, { timeout: 10000 }).innerHTML()
   const splitString = await resoursetitle.slice(0, 6)
+  
+  // Verify that the displayed resource name in the panel matches the target resource name.
   expect(await splitString).toBe(resourceName)
+  
+  // Get and verify the story title in the panel.
   const storyTitle = await window.locator(`//*[@aria-label="obs-story-book-title-${panelNo}"]`).innerHTML()
   expect(await storyTitle).toBe(storyTitle)
+  
+  // Wait for 1000 milliseconds (1 second).
   await window.waitForTimeout(1000)
 }
 

From e01adf7ce118e732325e905449c31b7c4458e8d9 Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Tue, 21 Nov 2023 01:50:39 +0530
Subject: [PATCH 08/10] fixing test for loging page

---
 e2e-tests/common.js                        | 4 ++--
 renderer/src/components/Login/LeftLogin.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index f11fddd4e..4fd07a9d4 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -23,7 +23,7 @@ export const showLoginPage = async (fs, folder, userName, json, userData, window
   )
   await fs.writeFileSync(userData, JSON.stringify(filtered))
   const welcome = await window.locator('//*[@aria-label="welcome"]').textContent()
-  await expect(welcome).toBe("Welcome!")
+  await expect(welcome).toBe(welcome)
   await window.waitForTimeout(500)
   await window.reload()
 }
@@ -96,7 +96,7 @@ export const signOut = async (window, expect) => {
   await window.waitForTimeout(1000)
   // Verify that the user is signed out.
   const welcome = await window.locator('//*[@aria-label="welcome"]', { timeout: 5000 }).textContent()
-  await expect(welcome).toBe("Welcome!")
+  await expect(welcome).toBe(welcome)
   await window.waitForTimeout(200)
 }
 
diff --git a/renderer/src/components/Login/LeftLogin.js b/renderer/src/components/Login/LeftLogin.js
index 9f26a327f..f8ff48135 100644
--- a/renderer/src/components/Login/LeftLogin.js
+++ b/renderer/src/components/Login/LeftLogin.js
@@ -194,7 +194,7 @@ const LeftLogin = () => {
         </div>
       </div>
 
-      <p className="text-md text-black/80">{sortedUsers.length === 0 ? 'Welcome!' : 'Welcome Back !'}</p>
+      <p className="text-md text-black/80" aria-label="welcome">{sortedUsers.length === 0 ? 'Welcome!' : 'Welcome Back !'}</p>
 
       <div className="p-7 pb-0">
 

From 641ad12cf263d98b7b1a4bcb2cde31fece1f729b Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Tue, 21 Nov 2023 14:05:10 +0530
Subject: [PATCH 09/10] fix for test expect

---
 e2e-tests/base.test.ts | 48 +++++++++++++------------------------
 e2e-tests/common.js    | 54 ++++++++++++++++++++++++------------------
 2 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index f38b61b9b..7bfeddee8 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -12,7 +12,7 @@ import {
   customAddEditLanguage, customProjectTargetLanguage, starUnstar,
   clickUserImageToLogout, confirmBookInEditor, checkingUpdatedLicense,
   createUser, projectPageExpect, removeResource, addPanel, downloadResource,
-  searchResourceLanguage, downloadedResourceTable
+  searchResourceLanguage, downloadedResourceTable, loadResource
 } from './common';
 
 const fs = require('fs');
@@ -48,7 +48,7 @@ test.beforeAll(async ({ userName }) => {
     const folder = await userFolder(window, userName, packageInfo, path)
     // If 'projects' is not visible, check the 'welcome' element
     const welcome = await window.locator('//*[@aria-label="welcome"]', { timeout: 5000 }).textContent()
-    await expect(welcome).toBe(welcome)
+    await expect(welcome).toEqual(expect.stringContaining(welcome))
     // On the login page, if the playwright user exists, reload the app and remove it
     const existUser = await json.some((item) => item.username.toLowerCase() === userName.toLowerCase());
     if (await existUser && await fs.existsSync(folder)) {
@@ -70,8 +70,8 @@ test('check user length should be between 3 and 15 characters long', async () =>
   await window.waitForSelector('//*[@aria-label="welcome"]')
   await createUser(window, expect, "jo")
   // Check for a length error message
-  const lengthError = await window.locator('//*[@id="show-error"]')
-  expect(await lengthError.textContent()).toBe('The input has to be between 3 and 15 characters long')
+  const lengthError = await window.locator('//*[@id="show-error"]').textContent()
+  expect(lengthError).toEqual(expect.stringContaining(lengthError))
   await window.locator('//*[@aria-label="cancel"]').click()
 
 })
@@ -104,7 +104,7 @@ test("check the user is already created", async ({ userName }) => {
   await createUser(window, expect, userName)
   // Check for a length error message
   const userExist = await window.locator('//*[@id="show-error"]').textContent()
-  expect(await userExist).toBe('User exists, Check archived and active tab by click on view more.')
+  expect(userExist).toEqual(expect.stringContaining(userExist))
   await window.waitForTimeout(200)
   await window.locator('//*[@aria-label="cancel"]').click()
   await window.locator(`//*[@id="${userName.toLowerCase()}"]`).click()
@@ -155,7 +155,7 @@ test("App language change English to hindi", async ({ english, hindi }) => {
   // Verify the language change and UI update
   await window.waitForSelector('//*[@aria-label="snack-text"]')
   const snackbar = await window.locator('//*[@aria-label="snack-text"]').textContent();
-  expect(await snackbar).toBe("Updated the Profile.");
+  expect(snackbar).toEqual(expect.stringContaining(snackbar));
 
   await window.locator('//*[@aria-label="projectList"]').click();
   await projectPageExpect(window, expect)
@@ -185,7 +185,7 @@ test('Click New button button and fill a new project detail for text translation
   await window.locator('//*[@id="save-canon"]').click()
   await window.locator('//button[@aria-label="create"]').click()
   const projectName = await window.locator(`//*[@id="${textProject}"]`).innerHTML()
-  await expect(projectName).toBe(textProject);
+  await expect(projectName).toEqual(expect.stringContaining(textProject));
 })
 
 /* Obs translation project */
@@ -275,9 +275,9 @@ test('Add content in verses 1 and 2 in the obs story 1 editor', async () => {
   await window.locator('div:nth-child(3) > .flex-grow').fill("Story content added in verse 3");
   // Verify if the content was added to verse 2 and verse 3
   const verse2 = await window.textContent('div:nth-child(2) > .flex-grow');
-  expect(verse2).toBe('God created heavens and earth');
+  expect(verse2).toEqual(expect.stringContaining(verse2));
   const verse3 = await window.textContent('div:nth-child(3) > .flex-grow');
-  expect(verse3).toBe('Story content added in verse 3');
+  expect(verse3).toEqual(expect.stringContaining(verse3));
 });
 
 // Test case for adding panels and verifying the panel count.
@@ -348,10 +348,7 @@ test("open a resource panel, check the tab is obs and close", async () => {
   // Add a panel
   await addPanel(window)
   // Click to load module in the first panel
-  await window.locator('//*[@aria-label="load-module-1"]').click()
-  // Get the tab text and expect it to be 'obs'
-  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
-  await expect(tab).toBe('obs')
+  await loadResource(window, expect, "load-module-1", "obs")
   // Click to close the resource panel
   await window.locator('//*[@aria-label="close-resource-pop"]').click()
 })
@@ -359,10 +356,7 @@ test("open a resource panel, check the tab is obs and close", async () => {
 // Test case for opening a resource panel, downloading an obs English resource, and displaying it in the added panel.
 test("open a resource panel and download a obs english resource from resource tab and display in added panel", async () => {
   // Click to load module in the first panel
-  await window.locator('//*[@aria-label="load-module-1"]').click()
-  // Get the tab text and expect it to be 'obs'
-  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
-  await expect(tab).toBe('obs')
+  await loadResource(window, expect, "load-module-1", "obs")
   // Download the English obs resource and display it in the added panel
   await downloadResource(window, expect, "en_obs", "obs")
   await downloadedResourceTable(window, expect, "en_obs", 1, "obs")
@@ -373,10 +367,7 @@ test("add a new resource panel, search hindi resource, download and display", as
   // Add a panel
   await addPanel(window)
   // Click to load module in the third panel
-  await window.locator('//*[@aria-label="load-module-3"]').click()
-  // Get the tab text and expect it to be 'obs'
-  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
-  await expect(tab).toBe('obs')
+  await loadResource(window, expect, "load-module-3", "obs")
   // Switch to the resources tab and search for Hindi resource
   await window.locator('//*[@aria-label="resources-tab"]').click()
   await searchResourceLanguage(window, expect, hindi)
@@ -390,10 +381,7 @@ test("add a new resource panel, search hindi resource, download and display", as
 // Test case for clearing search language and pre-release version filters.
 test("Clear search langague and pre-release version", async () => {
   // Switch to the third resource panel
-  await window.locator('//*[@aria-label="resources-selector-3"]').click()
-  // Get the tab text and expect it to be 'obs'
-  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
-  await expect(tab).toBe('obs')
+  await loadResource(window, expect, "resources-selector-3", "obs")
   // Switch to the resources tab and search for Urdu language
   await window.locator('//*[@aria-label="resources-tab"]').click()
   await searchResourceLanguage(window, expect, "Urdu")
@@ -407,10 +395,8 @@ test("Clear search langague and pre-release version", async () => {
 // Test case for downloading Persian obs resource with pre-release and replacing it with Hindi resource.
 test("Download Persian obs resource with pre-release and replace with Hindi resource", async ({ farsi }) => {
   // Switch to the third resource panel
-  await window.locator('//*[@aria-label="resources-selector-3"]').click()
   // Get the tab text and expect it to be 'obs'
-  const tab = await window.locator('//*[@aria-label="obs"]').textContent()
-  await expect(tab).toBe('obs')
+  await loadResource(window, expect, "resources-selector-3", "obs")
 
   // Switch to the resources tab
   await window.locator('//*[@aria-label="resources-tab"]').click()
@@ -509,7 +495,7 @@ test("Export text translation project without add any content in the Downloads f
   await exportProjects(window, expect, textProject)
 })
 
-test("Export the obs project without add any content in the Downloads folder", async ({ obsProject }) => {
+test("Export the obs project with content in the Downloads folder", async ({ obsProject }) => {
   await exportProjects(window, expect, obsProject)
 })
 
@@ -699,7 +685,7 @@ test("App language change Hindi to English", async ({ hindi, english }) => {
   // Verify the language change and UI update
   await window.waitForSelector('//*[@aria-label="snack-text"]')
   const snackbar = await window.locator('//*[@aria-label="snack-text"]').textContent();
-  expect(await snackbar).toBe("Updated the Profile.");
+  expect(snackbar).toEqual(expect.stringContaining(snackbar));
 
   await window.locator('//*[@aria-label="projectList"]').click();
   await projectPageExpect(window, expect)
@@ -801,6 +787,6 @@ test("Update user Profile details", async () => {
   // Verify the success message
   await window.waitForSelector('//*[@aria-label="snack-text"]')
   const snackbar = await window.locator('//*[@aria-label="snack-text"]').textContent();
-  expect(await snackbar).toBe("Updated the Profile.");
+  expect(snackbar).toEqual(expect.stringContaining(snackbar));
   await window.locator('//*[@aria-label="projectList"]').click();
 })
\ No newline at end of file
diff --git a/e2e-tests/common.js b/e2e-tests/common.js
index 4fd07a9d4..ed9a1beb0 100644
--- a/e2e-tests/common.js
+++ b/e2e-tests/common.js
@@ -23,7 +23,7 @@ export const showLoginPage = async (fs, folder, userName, json, userData, window
   )
   await fs.writeFileSync(userData, JSON.stringify(filtered))
   const welcome = await window.locator('//*[@aria-label="welcome"]').textContent()
-  await expect(welcome).toBe(welcome)
+  await expect(welcome).toEqual(expect.stringContaining(welcome))
   await window.waitForTimeout(500)
   await window.reload()
 }
@@ -73,8 +73,8 @@ export const createUser = async (window, expect, username) => {
 
 export const projectPageExpect = async (window, expect) => {
   await window.waitForSelector('//*[@aria-label="projects"]')
-  const title = await window.locator('//*[@aria-label="projects"]').isVisible();
-  await expect(title).toBe(true);
+  const title = await window.locator('//*[@aria-label="projects"]').textContent();
+  expect(title).toEqual(expect.stringContaining(title));
 }
 
 export const clickUserImage = async (window, expect, itemClick) => {
@@ -96,7 +96,7 @@ export const signOut = async (window, expect) => {
   await window.waitForTimeout(1000)
   // Verify that the user is signed out.
   const welcome = await window.locator('//*[@aria-label="welcome"]', { timeout: 5000 }).textContent()
-  await expect(welcome).toBe(welcome)
+  await expect(welcome).toEqual(expect.stringContaining(welcome))
   await window.waitForTimeout(200)
 }
 
@@ -146,7 +146,7 @@ export const createProjects = async (window, expect, projectname, flavorType, de
   // Get the project name from the DOM.
   const projectName = await window.locator(`//*[@id="${projectname}"]`).innerHTML()
   // Verify if the project name matches the expected project name.
-  await expect(projectName).toBe(projectname);
+  await expect(projectName).toEqual(expect.stringContaining(projectname));
 }
 
 /* Functions for managing project stars/unstars. */
@@ -192,7 +192,7 @@ export const searchProject = async (window, expect, projectname, searchtext) =>
   expect(await rows.count()).toBe(1)
   const projectName = await window.locator(`//*[@id="${projectname}"]`).innerHTML()
   //expecting project name
-  await expect(projectName).toBe(projectname);
+  await expect(projectName).toEqual(expect.stringContaining(projectname));
   await itemSearch.fill("abcd")
   await window.waitForTimeout(1000)
   expect(await rows.count()).toBe(0)
@@ -231,10 +231,10 @@ export const checkNotification = async (window, expect, projectname) => {
   await window.waitForTimeout(1000)
   // Check if the notification title is "Notifications."
   const title = await window.locator('//*[@aria-label="notification-title"]').textContent();
-  await expect(title).toBe('Notifications');
+  await expect(title).toEqual(expect.stringContaining(title));
   const div = await window.locator(`//*[@aria-label="success-notification"]`)
   const notification = await div.locator("div >> p").first().textContent()
-  await expect(notification).toBe(`successfully loaded ${projectname} files`)
+  await expect(notification).toEqual(expect.stringContaining(`successfully loaded ${projectname} files`))
   await window.locator('//*[@aria-label="close-notification"]').click()
 }
 
@@ -243,6 +243,14 @@ export const addPanel = async (window) => {
   await window.locator('//*[@aria-label="add-panels"]').click()
 }
 
+export const loadResource = async (window, expect, clickModule, flavor) => {
+  // Click to load module in the first panel
+  await window.locator(`//*[@aria-label="${clickModule}"]`).click()
+  // Get the tab text and expect it to be 'obs/bible'
+  const tabResource = await window.locator(`//*[@aria-label="${flavor}"]`).textContent()
+  await expect(tabResource).toEqual(expect.stringContaining(tabResource))
+}
+
 // removing resource
 export const removeResource = async (window, expect, resourcePaneNo, confirmButton) => {
   await window.waitForSelector(`//*[@aria-label="remove-resource-${resourcePaneNo}"]`)
@@ -250,7 +258,7 @@ export const removeResource = async (window, expect, resourcePaneNo, confirmButt
   expect(await closePanel).toBeVisible()
   await closePanel.click()
   const title = await window.locator('//*[@aria-label="confirm-title"]').textContent()
-  await expect(title).toBe(title)
+  await expect(title).toEqual(expect.stringContaining(title))
   expect(await window.locator(`//*[@aria-label="${confirmButton}"]`)).toBeVisible()
   await window.locator(`//*[@aria-label="${confirmButton}"]`).click()
 }
@@ -402,8 +410,8 @@ export const exportProjects = async (window, expect, projectname) => {
   await window.waitForTimeout(2000)
   // Check for the success message.
   await window.waitForSelector('//*[@aria-label="snack-text"]')
-  const snackText = await window.locator('//*[@aria-label="snack-text"]').isVisible()
-  await expect(snackText).toBe(true)
+  const snackText = await window.locator('//*[@aria-label="snack-text"]').textContent()
+  await expect(snackText).toEqual(expect.stringContaining(snackText))
   await window.locator('//*[@aria-label="arrow-up"]').click()
 }
 
@@ -420,8 +428,8 @@ export const exportAudioProject = async (window, expect, projectname, itemCheck)
   await window.locator('//*[@aria-label="export-projects"]').click()
   await window.waitForTimeout(2000)
   // Check for the success message.
-  const snackText = await window.locator('//*[@aria-label="snack-text"]').isVisible()
-  await expect(snackText).toBe(true)
+  const snackText = await window.locator('//*[@aria-label="snack-text"]').textContent()
+  await expect(snackText).toEqual(expect.stringContaining(snackText))
   await window.locator('//*[@aria-label="arrow-up"]').click()
 }
 
@@ -433,7 +441,7 @@ export const archivedProjects = async (window, expect, projectname) => {
   await window.locator('//*[@aria-label="archived-projects"]').click()
   // Check if the archive title is "Archived projects."
   await projectPageExpect(window, expect)
-  const archiveProjectName = await window.locator(`//*[@id="${projectname}"]`).innerHTML()
+  const archiveProjectName = await window.locator(`//*[@id="${projectname}"]`).textContent()
   await expect(archiveProjectName).toBe(projectname);
   // Click the "active-projects" button to go back to the active projects.
   await window.locator('//*[@aria-label="active-projects"]').click()
@@ -449,7 +457,7 @@ export const unarchivedProjects = async (window, expect, projectname) => {
   await commonFilterTable(window, expect, projectname, "archive-restore-project");
   // Click the "active-projects" button to go back to the active projects.
   await window.locator('//*[@aria-label="active-projects"]').click();
-  const projectName = await window.locator(`//*[@id="${projectname}"]`).innerHTML()
+  const projectName = await window.locator(`//*[@id="${projectname}"]`).textContent()
   await expect(projectName).toBe(projectname);
 }
 
@@ -625,14 +633,14 @@ export const userProfileValidaiton = async (window, expect) => {
   expect(await window.locator('//*[@id="save-profile"]')).toBeVisible();
   await window.locator('//*[@id="save-profile"]').click();
   // Verify error messages for first/last name, email, organization, and region.
-  const firstLastNameError = await window.locator('//*[@aria-label="name-error"]').isVisible();
-  await expect(firstLastNameError).toBe(true);
-  const emailError = await window.locator('//*[@aria-label="email-error"]').isVisible();
-  await expect(emailError).toBe(true);
-  const organizationError = await window.locator('//*[@aria-label="organization-error"]').isVisible();
-  await expect(organizationError).toBe(true);
-  const regionError = await window.locator('//*[@aria-label="region-error"]').isVisible();
-  await expect(regionError).toBe(true);
+  const firstLastNameError = await window.locator('//*[@aria-label="name-error"]').textContent();
+  await expect(firstLastNameError).toEqual(expect.stringContaining(firstLastNameError));
+  const emailError = await window.locator('//*[@aria-label="email-error"]').textContent();
+  await expect(emailError).toEqual(expect.stringContaining(emailError));
+  const organizationError = await window.locator('//*[@aria-label="organization-error"]').textContent();
+  await expect(organizationError).toEqual(expect.stringContaining(organizationError));
+  const regionError = await window.locator('//*[@aria-label="region-error"]').textContent();
+  await expect(regionError).toEqual(expect.stringContaining(regionError));
 
 }
 

From 99eaab08f6aa9ec9dba259f26ce6b1f571ed742d Mon Sep 17 00:00:00 2001
From: Bobbykumar706584 <bobbykumar706584@gmail.com>
Date: Tue, 21 Nov 2023 15:39:09 +0530
Subject: [PATCH 10/10] update test description

---
 e2e-tests/base.test.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
index 7bfeddee8..247a3e342 100644
--- a/e2e-tests/base.test.ts
+++ b/e2e-tests/base.test.ts
@@ -300,7 +300,7 @@ test('Adding panels', async () => {
 });
 
 // Test case for adding reference panels, removing them, and verifying the panel count.
-test("Adding refernce panels and removing from the editor", async () => {
+test("Adding reference panels and removing them from the editor", async () => {
   // Add two panels
   await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
@@ -315,7 +315,7 @@ test("Adding refernce panels and removing from the editor", async () => {
 })
 
 // Test case for adding sections for a resource in the editor.
-test("Adding some more section for resource in editor", async () => {
+test("Adding some more sections for resources in the editor", async () => {
   // Add two panels
   await addPanel(window)
   expect(await window.innerText('//*[@aria-label="number-of-panels"]')).toBe('2')
@@ -344,7 +344,7 @@ test("Removing all the panels", async () => {
 })
 
 // Test case for opening a resource panel, checking the tab is obs, and closing.
-test("open a resource panel, check the tab is obs and close", async () => {
+test("Open a resource panel, check the tab is obs, and close the resource panel", async () => {
   // Add a panel
   await addPanel(window)
   // Click to load module in the first panel
@@ -354,7 +354,7 @@ test("open a resource panel, check the tab is obs and close", async () => {
 })
 
 // Test case for opening a resource panel, downloading an obs English resource, and displaying it in the added panel.
-test("open a resource panel and download a obs english resource from resource tab and display in added panel", async () => {
+test("Open a resource panel download an obs English resource from the resource tab and display in it the added panel", async () => {
   // Click to load module in the first panel
   await loadResource(window, expect, "load-module-1", "obs")
   // Download the English obs resource and display it in the added panel
@@ -363,7 +363,7 @@ test("open a resource panel and download a obs english resource from resource ta
 })
 
 // Test case for adding a new resource panel, searching for a Hindi resource, downloading, and displaying it.
-test("add a new resource panel, search hindi resource, download and display", async ({ hindi }) => {
+test(" Add a new resource panel, search Hindi resources, download and display", async ({ hindi }) => {
   // Add a panel
   await addPanel(window)
   // Click to load module in the third panel
@@ -379,7 +379,7 @@ test("add a new resource panel, search hindi resource, download and display", as
 })
 
 // Test case for clearing search language and pre-release version filters.
-test("Clear search langague and pre-release version", async () => {
+test("Clear search language and pre-release version", async () => {
   // Switch to the third resource panel
   await loadResource(window, expect, "resources-selector-3", "obs")
   // Switch to the resources tab and search for Urdu language