OBPIH-7234 sort by alphabetical order and remain inputs (#56)

kkrawczyk123 · web-flow · commit 0af9292da0ce · 2025-05-15T15:14:33.000+02:00
* add confirm reload dialog

* add button to popup

* rename 1 product

* add elements to page

* add test for ordering items on receiving page and keep inputs

* add test default to 0 after removed qty and save, adjust other test to 2nd product

* add comment to appConfig

* update selector

* add assert not clearable field

* remove not needed lines from edit bin tests
diff --git a/src/components/AlertPopup.ts b/src/components/AlertPopup.ts
@@ -24,6 +24,10 @@ class AlertPopup extends BasePageModel {
     return this.dialog.getByRole('button', { name: this.cancelLabel });
   }
 
+  get yesButton() {
+    return this.dialog.getByRole('button', { name: 'Yes' });
+  }
+
   async assertPopupVisible() {
     await expect(this.dialog).toBeVisible();
   }
diff --git a/src/config/AppConfig.ts b/src/config/AppConfig.ts
@@ -290,7 +290,8 @@ class AppConfig {
       productFive: new ProductConfig({
         id: env.get('PRODUCT_FIVE').asString(),
         key: PRODUCT_KEY.FIVE,
-        name: this.uniqueIdentifier.generateUniqueString('product-five'),
+        name: this.uniqueIdentifier.generateUniqueString('aa-product-five'),
+        //'aa' part was added to improve visibility of ordering products alphabetically
         quantity: 160,
         required: false,
       }),
diff --git a/src/pages/inbound/create/steps/AddItemsStep.ts b/src/pages/inbound/create/steps/AddItemsStep.ts
@@ -1,5 +1,6 @@
 import { Page } from '@playwright/test';
 
+import AlertPopup from '@/components/AlertPopup';
 import FileHandler from '@/components/FileHandler';
 import { expect, test } from '@/fixtures/fixtures';
 import BasePageModel from '@/pages/BasePageModel';
@@ -9,11 +10,17 @@ import { CreateInboundAddItemsTableEntity } from '@/types';
 class AddItemsStep extends BasePageModel {
   table: AddItemsTable;
   fileHandler: FileHandler;
+  confirmReloadPopup: AlertPopup;
 
   constructor(page: Page) {
     super(page);
     this.table = new AddItemsTable(page);
     this.fileHandler = new FileHandler(page);
+    this.confirmReloadPopup = new AlertPopup(
+      page,
+      'Confirm refresh',
+      'Are you sure you want to refresh? Your progress since last save will be lost.'
+    );
   }
 
   async isLoaded() {
diff --git a/src/pages/receiving/steps/ReceivingStep.ts b/src/pages/receiving/steps/ReceivingStep.ts
@@ -83,6 +83,17 @@ class ReceivingStep extends BasePageModel {
         'You can only import the Receiving Now and the Comment fields. To make other changes, please use the edit line feature. You can then export and import the template again.'
       );
   }
+
+  get orderSelect() {
+    return this.page.getByTestId('custom-select-ordering');
+  }
+
+  getOrder(order: string) {
+    return this.page
+      .getByTestId('custom-select-dropdown-menu')
+      .getByRole('listitem')
+      .getByText(order, { exact: true });
+  }
 }
 
 export default ReceivingStep;
diff --git a/src/tests/receiving/editBinLocationWhenReceive.test.ts b/src/tests/receiving/editBinLocationWhenReceive.test.ts
@@ -98,7 +98,6 @@ test.describe('Edit Bin Location when receive inbound stock movement', () => {
         );
         await createLocationPage.binLocationTabSection.isLoaded();
         await createLocationPage.binLocationTabSection.deleteBinButton.click();
-        await createLocationPage.binLocationTabSection.isLoaded();
       });
     }
   );
@@ -279,7 +278,6 @@ test.describe('Edit Bin Location to bin with zone when receive inbound stock mov
         );
         await createLocationPage.binLocationTabSection.isLoaded();
         await createLocationPage.binLocationTabSection.deleteBinButton.click();
-        await createLocationPage.binLocationTabSection.isLoaded();
       });
 
       await test.step('Delete created zone location', async () => {
@@ -459,7 +457,6 @@ test.describe('Edit Bin Location when receive for all lines', () => {
         );
         await createLocationPage.binLocationTabSection.isLoaded();
         await createLocationPage.binLocationTabSection.deleteBinButton.click();
-        await createLocationPage.binLocationTabSection.isLoaded();
       });
     }
   );
diff --git a/src/tests/receiving/receiveInbound.test.ts b/src/tests/receiving/receiveInbound.test.ts
@@ -15,6 +15,7 @@ test.describe('Receive inbound stock movement', () => {
       supplierLocationService,
       stockMovementService,
       mainProductService,
+      otherProductService,
     }) => {
       const supplierLocation = await supplierLocationService.getLocation();
       STOCK_MOVEMENT = await stockMovementService.createInbound({
@@ -24,10 +25,14 @@ test.describe('Receive inbound stock movement', () => {
       });
 
       const product = await mainProductService.getProduct();
+      const product2 = await otherProductService.getProduct();
 
       await stockMovementService.addItemsToInboundStockMovement(
         STOCK_MOVEMENT.id,
-        [{ productId: product.id, quantity: 10 }]
+        [
+          { productId: product.id, quantity: 10 },
+          { productId: product2.id, quantity: 10 },
+        ]
       );
 
       await stockMovementService.sendInboundStockMovement(STOCK_MOVEMENT.id, {
@@ -117,9 +122,7 @@ test.describe('Receive inbound stock movement', () => {
 
     await test.step('Select all items to receive', async () => {
       await receivingPage.receivingStep.isLoaded();
-      await receivingPage.receivingStep.table
-        .row(1)
-        .receivingNowField.textbox.fill('10');
+      await receivingPage.receivingStep.autofillQuantitiesButton.click();
     });
 
     await test.step('Go to Check page', async () => {
@@ -257,6 +260,9 @@ test.describe('Receive inbound stock movement', () => {
       await receivingPage.receivingStep.table
         .row(1)
         .receivingNowField.textbox.fill('8');
+      await receivingPage.receivingStep.table
+        .row(2)
+        .receivingNowField.textbox.fill('8');
     });
 
     await test.step('Click on Save button', async () => {
@@ -271,6 +277,9 @@ test.describe('Receive inbound stock movement', () => {
       await expect(
         receivingPage.receivingStep.table.row(1).receivingNowField.textbox
       ).toHaveValue('8');
+      await expect(
+        receivingPage.receivingStep.table.row(2).receivingNowField.textbox
+      ).toHaveValue('8');
     });
   });
 
@@ -292,6 +301,9 @@ test.describe('Receive inbound stock movement', () => {
       await receivingPage.receivingStep.table
         .row(1)
         .receivingNowField.textbox.fill('2');
+      await receivingPage.receivingStep.table
+        .row(2)
+        .receivingNowField.textbox.fill('2');
     });
 
     await test.step('Click on Save and Exit button', async () => {
@@ -305,6 +317,46 @@ test.describe('Receive inbound stock movement', () => {
       await expect(
         receivingPage.receivingStep.table.row(1).receivingNowField.textbox
       ).toHaveValue('2');
+      await expect(
+        receivingPage.receivingStep.table.row(2).receivingNowField.textbox
+      ).toHaveValue('2');
+    });
+  });
+
+  test.skip('Use Save button after removing qty and default to 0', async ({
+    stockMovementShowPage,
+    receivingPage,
+  }) => {
+    await test.step('Go to stock movement show page', async () => {
+      await stockMovementShowPage.goToPage(STOCK_MOVEMENT.id);
+      await stockMovementShowPage.isLoaded();
+    });
+
+    await test.step('Go to shipment receiving page', async () => {
+      await stockMovementShowPage.receiveButton.click();
+      await receivingPage.receivingStep.isLoaded();
+    });
+
+    await test.step('Input qty for an item to be received', async () => {
+      await receivingPage.receivingStep.table
+        .row(1)
+        .receivingNowField.textbox.fill('8');
+      await receivingPage.receivingStep.table
+        .row(2)
+        .receivingNowField.textbox.fill('10');
+    });
+
+    await test.step('Clear qty field and click on Save button', async () => {
+      await receivingPage.receivingStep.table
+        .row(1)
+        .receivingNowField.textbox.clear();
+      await receivingPage.receivingStep.saveButton.click();
+      await expect(
+        receivingPage.receivingStep.table.row(1).receivingNowField.textbox
+      ).toHaveValue('0');
+      await expect(
+        receivingPage.receivingStep.table.row(2).receivingNowField.textbox
+      ).toHaveValue('10');
     });
   });
 
diff --git a/src/tests/receiving/receiveToHoldBin.test.ts b/src/tests/receiving/receiveToHoldBin.test.ts
@@ -5,7 +5,7 @@ import UniqueIdentifier from '@/utils/UniqueIdentifier';
 
 test.describe('Receive item into hold bin', () => {
   test.describe.configure({ timeout: 60000 });
-  //timeout has been added for this test to make sure that the content on bin location tab will load as it can include a lot of data 
+  //timeout has been added for this test to make sure that the content on bin location tab will load as it can include a lot of data
   let STOCK_MOVEMENT: StockMovementResponse;
   const uniqueIdentifier = new UniqueIdentifier();
   const binLocationName = uniqueIdentifier.generateUniqueString('holdbin');
@@ -30,9 +30,7 @@ test.describe('Receive item into hold bin', () => {
 
       await stockMovementService.addItemsToInboundStockMovement(
         STOCK_MOVEMENT.id,
-        [
-          { productId: PRODUCT_ONE.id, quantity: 20 },
-        ]
+        [{ productId: PRODUCT_ONE.id, quantity: 20 }]
       );
 
       await stockMovementService.sendInboundStockMovement(STOCK_MOVEMENT.id, {
@@ -67,10 +65,16 @@ test.describe('Receive item into hold bin', () => {
         await createLocationPage.binLocationTabSection.editBinButton.click();
         await createLocationPage.locationConfigurationTab.click();
         await createLocationPage.locationConfigurationTabSection.useDefaultSettingsCheckbox.uncheck();
-        await createLocationPage.locationConfigurationTabSection.removeSupportedActivitiesButton('Putaway stock').click();
-        await createLocationPage.locationConfigurationTabSection.removeSupportedActivitiesButton('Pick stock').click();
+        await createLocationPage.locationConfigurationTabSection
+          .removeSupportedActivitiesButton('Putaway stock')
+          .click();
+        await createLocationPage.locationConfigurationTabSection
+          .removeSupportedActivitiesButton('Pick stock')
+          .click();
         await createLocationPage.locationConfigurationTabSection.supportedActivitiesSelect.click();
-        await createLocationPage.locationConfigurationTabSection.getSupportedActivitiesOption('Hold stock').click();
+        await createLocationPage.locationConfigurationTabSection
+          .getSupportedActivitiesOption('Hold stock')
+          .click();
         await createLocationPage.locationConfigurationTabSection.saveButton.click();
       });
     }
@@ -111,7 +115,6 @@ test.describe('Receive item into hold bin', () => {
         );
         await createLocationPage.binLocationTabSection.isLoaded();
         await createLocationPage.binLocationTabSection.deleteBinButton.click();
-        await createLocationPage.binLocationTabSection.isLoaded();
       });
     }
   );
@@ -167,8 +170,12 @@ test.describe('Receive item into hold bin', () => {
       await expect(
         productShowPage.inStockTabSection.row(2).binLocation
       ).toHaveText(binLocationName);
-      await expect(productShowPage.inStockTabSection.row(2).row).toHaveAttribute('title', 'This bin has been restricted');
-      await expect(productShowPage.inStockTabSection.row(2).inventoryInformation).toHaveText('Hold');
+      await expect(
+        productShowPage.inStockTabSection.row(2).row
+      ).toHaveAttribute('title', 'This bin has been restricted');
+      await expect(
+        productShowPage.inStockTabSection.row(2).inventoryInformation
+      ).toHaveText('Hold');
     });
   });
 });
diff --git a/src/tests/receiving/sortByAlphabeticalOrderAndRemainInputs.test.ts b/src/tests/receiving/sortByAlphabeticalOrderAndRemainInputs.test.ts

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ class AlertPopup extends BasePageModel {`
`24`	`24`	`return this.dialog.getByRole('button', { name: this.cancelLabel });`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ get yesButton() {`
	`28`	`+ return this.dialog.getByRole('button', { name: 'Yes' });`
	`29`	`+ }`
	`30`	`+`
`27`	`31`	`async assertPopupVisible() {`
`28`	`32`	`await expect(this.dialog).toBeVisible();`
`29`	`33`	`}`