Merge pull request bagisto#10542 from kartikeywebkul9260/origin/new_2.2

Updated structure as required
devansh-webkul · Feb 6, 2025 · 87e9478 · 87e9478
2 parents 62d24ef + da461e8
commit 87e9478
Show file tree

Hide file tree

Showing 26 changed files with 4,646 additions and 7,233 deletions.
diff --git a/tests/admin/tests/catalog/attribute-families.spec.ts b/tests/admin/tests/catalog/attribute-families.spec.ts
@@ -70,12 +70,12 @@ test.describe('attribute family management', () => {
     test('edit attribute family', async () => {
         await createAttributeFamily(page);
 
-        await page.waitForTimeout(2000);
+        await page.waitForSelector('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-edit"]');
 
         const iconEdit = await page.$$('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-edit"]');
         await iconEdit[0].click();
 
-        await page.waitForTimeout(2000);
+        await page.waitForSelector('input[name="name"]');
         await page.fill('input[name="name"]', forms.generateRandomStringWithSpaces(Math.floor(Math.random() * 100)));
 
         const attributes = await page.$$('i.icon-drag');
@@ -110,7 +110,7 @@ test.describe('attribute family management', () => {
     test('delete attribute family', async () => {
         await createAttributeFamily(page);
 
-        await page.waitForTimeout(5000);
+        await page.waitForSelector('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-delete"]');
 
         const iconDelete = await page.$$('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-delete"]');
         await iconDelete[0].click();

diff --git a/tests/admin/tests/catalog/attributes.spec.ts b/tests/admin/tests/catalog/attributes.spec.ts
@@ -98,7 +98,7 @@ test.describe('attribute management', () => {
     });
 
     test('edit attribute', async () => {
-        await page.waitForTimeout(5000);
+        await page.waitForSelector('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-edit"]');
 
         const iconEdit = await page.$$('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-edit"]');
         await iconEdit[0].click();
@@ -156,7 +156,7 @@ test.describe('attribute management', () => {
     test('delete attribute', async () => {
         test.setTimeout(config.mediumTimeout);
 
-        await page.waitForTimeout(5000);
+        await page.waitForSelector('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-delete"]');
 
         const iconDelete = await page.$$('span[class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200 dark:hover:bg-gray-800 max-sm:place-self-center icon-delete"]');
         await iconDelete[0].click();
@@ -167,7 +167,7 @@ test.describe('attribute management', () => {
     });
 
     test('mass delete attributes', async () => {
-        await page.waitForTimeout(5000);
+        await page.waitForSelector('.icon-uncheckbox');
 
         const checkboxs = await page.$$('.icon-uncheckbox');