Skip to content

Commit 1361c19

Browse files
committed
improvements after review
1 parent 8504eec commit 1361c19

24 files changed

+242
-516
lines changed

src/tests/inbound/createInbound/exportItems.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ test.describe('Export all incoming items', () => {
152152
const isRollbackButtonVisible =
153153
await stockMovementShowPage.rollbackButton.isVisible();
154154

155-
// due to failed test, shipment might not be received which will not show the button
156155
if (isRollbackLastReceiptButtonVisible) {
157156
await stockMovementShowPage.rollbackLastReceiptButton.click();
158157
}

src/tests/receiving/assertBinLocationField.test.ts

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import AppConfig from '@/config/AppConfig';
22
import { ShipmentType } from '@/constants/ShipmentType';
33
import { expect, test } from '@/fixtures/fixtures';
44
import { StockMovementResponse } from '@/types';
5+
import BinLocationUtils from '@/utils/BinLocationUtils';
56

67
test.describe('Assert bin location not clearable', () => {
78
let STOCK_MOVEMENT: StockMovementResponse;
@@ -50,7 +51,6 @@ test.describe('Assert bin location not clearable', () => {
5051
const isRollbackButtonVisible =
5152
await stockMovementShowPage.rollbackButton.isVisible();
5253

53-
// due to failed test, shipment might not be received which will not show the button
5454
if (isRollbackLastReceiptButtonVisible) {
5555
await stockMovementShowPage.rollbackLastReceiptButton.click();
5656
}
@@ -60,30 +60,14 @@ test.describe('Assert bin location not clearable', () => {
6060
}
6161

6262
await stockMovementService.deleteStockMovement(STOCK_MOVEMENT.id);
63-
64-
await test.step('Deactivate receiving bin', async () => {
65-
const mainLocation = await mainLocationService.getLocation();
66-
const receivingBin =
67-
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
68-
await page.goto('./location/list');
69-
await locationListPage.searchByLocationNameField.fill(
70-
mainLocation.name
71-
);
72-
await locationListPage.findButton.click();
73-
await locationListPage.getLocationEditButton(mainLocation.name).click();
74-
await createLocationPage.binLocationTab.click();
75-
await createLocationPage.binLocationTabSection.isLoaded();
76-
await createLocationPage.binLocationTabSection.searchField.fill(
77-
receivingBin
78-
);
79-
await createLocationPage.binLocationTabSection.searchField.press(
80-
'Enter'
81-
);
82-
await createLocationPage.binLocationTabSection.isLoaded();
83-
await createLocationPage.binLocationTabSection.editBinButton.click();
84-
await createLocationPage.locationConfigurationTab.click();
85-
await createLocationPage.locationConfigurationTabSection.activeCheckbox.uncheck();
86-
await createLocationPage.locationConfigurationTabSection.saveButton.click();
63+
const receivingBin =
64+
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
65+
await BinLocationUtils.deactivateReceivingBin({
66+
mainLocationService,
67+
locationListPage,
68+
createLocationPage,
69+
page,
70+
receivingBin,
8771
});
8872
}
8973
);

src/tests/receiving/assertCreationOfGoodsReceiptNote.test.ts

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import AppConfig from '@/config/AppConfig';
22
import { ShipmentType } from '@/constants/ShipmentType';
33
import { expect, test } from '@/fixtures/fixtures';
44
import { StockMovementResponse } from '@/types';
5+
import BinLocationUtils from '@/utils/BinLocationUtils';
56

67
test.describe('Assert Goods Receipt Note is created and opened', () => {
78
let STOCK_MOVEMENT: StockMovementResponse;
@@ -48,30 +49,14 @@ test.describe('Assert Goods Receipt Note is created and opened', () => {
4849
await stockMovementShowPage.rollbackLastReceiptButton.click();
4950
await stockMovementShowPage.rollbackButton.click();
5051
await stockMovementService.deleteStockMovement(STOCK_MOVEMENT.id);
51-
52-
await test.step('Deactivate receiving bin', async () => {
53-
const mainLocation = await mainLocationService.getLocation();
54-
const receivingBin =
55-
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
56-
await page.goto('./location/list');
57-
await locationListPage.searchByLocationNameField.fill(
58-
mainLocation.name
59-
);
60-
await locationListPage.findButton.click();
61-
await locationListPage.getLocationEditButton(mainLocation.name).click();
62-
await createLocationPage.binLocationTab.click();
63-
await createLocationPage.binLocationTabSection.isLoaded();
64-
await createLocationPage.binLocationTabSection.searchField.fill(
65-
receivingBin
66-
);
67-
await createLocationPage.binLocationTabSection.searchField.press(
68-
'Enter'
69-
);
70-
await createLocationPage.binLocationTabSection.isLoaded();
71-
await createLocationPage.binLocationTabSection.editBinButton.click();
72-
await createLocationPage.locationConfigurationTab.click();
73-
await createLocationPage.locationConfigurationTabSection.activeCheckbox.uncheck();
74-
await createLocationPage.locationConfigurationTabSection.saveButton.click();
52+
const receivingBin =
53+
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
54+
await BinLocationUtils.deactivateReceivingBin({
55+
mainLocationService,
56+
locationListPage,
57+
createLocationPage,
58+
page,
59+
receivingBin,
7560
});
7661
}
7762
);

src/tests/receiving/assertCreationOfReceivingBin.test.ts

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { expect, test } from '@/fixtures/fixtures';
44
import CreateLocationPage from '@/pages/location/createLocation/CreateLocationPage';
55
import LocationListPage from '@/pages/location/LocationListPage';
66
import { StockMovementResponse } from '@/types';
7+
import BinLocationUtils from '@/utils/BinLocationUtils';
78

89
test.describe('Assert creation of receiving bin', () => {
910
test.describe.configure({ timeout: 60000 });
@@ -55,29 +56,14 @@ test.describe('Assert creation of receiving bin', () => {
5556
await stockMovementShowPage.rollbackButton.click();
5657
await stockMovementService.deleteStockMovement(STOCK_MOVEMENT.id);
5758

58-
await test.step('Deactivate receiving bin', async () => {
59-
const mainLocation = await mainLocationService.getLocation();
60-
const receivingBin =
61-
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
62-
await page.goto('./location/list');
63-
await locationListPage.searchByLocationNameField.fill(
64-
mainLocation.name
65-
);
66-
await locationListPage.findButton.click();
67-
await locationListPage.getLocationEditButton(mainLocation.name).click();
68-
await createLocationPage.binLocationTab.click();
69-
await createLocationPage.binLocationTabSection.isLoaded();
70-
await createLocationPage.binLocationTabSection.searchField.fill(
71-
receivingBin
72-
);
73-
await createLocationPage.binLocationTabSection.searchField.press(
74-
'Enter'
75-
);
76-
await createLocationPage.binLocationTabSection.isLoaded();
77-
await createLocationPage.binLocationTabSection.editBinButton.click();
78-
await createLocationPage.locationConfigurationTab.click();
79-
await createLocationPage.locationConfigurationTabSection.activeCheckbox.uncheck();
80-
await createLocationPage.locationConfigurationTabSection.saveButton.click();
59+
const receivingBin =
60+
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
61+
await BinLocationUtils.deactivateReceivingBin({
62+
mainLocationService,
63+
locationListPage,
64+
createLocationPage,
65+
page,
66+
receivingBin,
8167
});
8268
}
8369
);

src/tests/receiving/assertQtyInputs.test.ts

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import AppConfig from '@/config/AppConfig';
22
import { ShipmentType } from '@/constants/ShipmentType';
33
import { expect, test } from '@/fixtures/fixtures';
44
import { StockMovementResponse } from '@/types';
5+
import BinLocationUtils from '@/utils/BinLocationUtils';
56
import { formatDate, getDateByOffset } from '@/utils/DateUtils';
67

78
test.describe('Assert if quantity inputs remain when split lines', () => {
@@ -57,7 +58,6 @@ test.describe('Assert if quantity inputs remain when split lines', () => {
5758
const isRollbackButtonVisible =
5859
await stockMovementShowPage.rollbackButton.isVisible();
5960

60-
// due to failed test, shipment might not be received which will not show the button
6161
if (isRollbackLastReceiptButtonVisible) {
6262
await stockMovementShowPage.rollbackLastReceiptButton.click();
6363
}
@@ -68,29 +68,14 @@ test.describe('Assert if quantity inputs remain when split lines', () => {
6868

6969
await stockMovementService.deleteStockMovement(STOCK_MOVEMENT.id);
7070

71-
await test.step('Deactivate receiving bin', async () => {
72-
const mainLocation = await mainLocationService.getLocation();
73-
const receivingBin =
74-
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
75-
await page.goto('./location/list');
76-
await locationListPage.searchByLocationNameField.fill(
77-
mainLocation.name
78-
);
79-
await locationListPage.findButton.click();
80-
await locationListPage.getLocationEditButton(mainLocation.name).click();
81-
await createLocationPage.binLocationTab.click();
82-
await createLocationPage.binLocationTabSection.isLoaded();
83-
await createLocationPage.binLocationTabSection.searchField.fill(
84-
receivingBin
85-
);
86-
await createLocationPage.binLocationTabSection.searchField.press(
87-
'Enter'
88-
);
89-
await createLocationPage.binLocationTabSection.isLoaded();
90-
await createLocationPage.binLocationTabSection.editBinButton.click();
91-
await createLocationPage.locationConfigurationTab.click();
92-
await createLocationPage.locationConfigurationTabSection.activeCheckbox.uncheck();
93-
await createLocationPage.locationConfigurationTabSection.saveButton.click();
71+
const receivingBin =
72+
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
73+
await BinLocationUtils.deactivateReceivingBin({
74+
mainLocationService,
75+
locationListPage,
76+
createLocationPage,
77+
page,
78+
receivingBin,
9479
});
9580
}
9681
);

src/tests/receiving/assertRecipientField.test.ts

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import AppConfig from '@/config/AppConfig';
22
import { ShipmentType } from '@/constants/ShipmentType';
33
import { expect, test } from '@/fixtures/fixtures';
44
import { StockMovementResponse } from '@/types';
5+
import BinLocationUtils from '@/utils/BinLocationUtils';
56

67
test.describe('Assert recipient field when receive', () => {
78
let STOCK_MOVEMENT: StockMovementResponse;
@@ -59,7 +60,6 @@ test.describe('Assert recipient field when receive', () => {
5960
const isRollbackButtonVisible =
6061
await stockMovementShowPage.rollbackButton.isVisible();
6162

62-
// due to failed test, shipment might not be received which will not show the button
6363
if (isRollbackLastReceiptButtonVisible) {
6464
await stockMovementShowPage.rollbackLastReceiptButton.click();
6565
}
@@ -70,29 +70,14 @@ test.describe('Assert recipient field when receive', () => {
7070

7171
await stockMovementService.deleteStockMovement(STOCK_MOVEMENT.id);
7272

73-
await test.step('Deactivate receiving bin', async () => {
74-
const mainLocation = await mainLocationService.getLocation();
75-
const receivingBin =
76-
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
77-
await page.goto('./location/list');
78-
await locationListPage.searchByLocationNameField.fill(
79-
mainLocation.name
80-
);
81-
await locationListPage.findButton.click();
82-
await locationListPage.getLocationEditButton(mainLocation.name).click();
83-
await createLocationPage.binLocationTab.click();
84-
await createLocationPage.binLocationTabSection.isLoaded();
85-
await createLocationPage.binLocationTabSection.searchField.fill(
86-
receivingBin
87-
);
88-
await createLocationPage.binLocationTabSection.searchField.press(
89-
'Enter'
90-
);
91-
await createLocationPage.binLocationTabSection.isLoaded();
92-
await createLocationPage.binLocationTabSection.editBinButton.click();
93-
await createLocationPage.locationConfigurationTab.click();
94-
await createLocationPage.locationConfigurationTabSection.activeCheckbox.uncheck();
95-
await createLocationPage.locationConfigurationTabSection.saveButton.click();
73+
const receivingBin =
74+
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
75+
await BinLocationUtils.deactivateReceivingBin({
76+
mainLocationService,
77+
locationListPage,
78+
createLocationPage,
79+
page,
80+
receivingBin,
9681
});
9782
}
9883
);

src/tests/receiving/cancelRemainingQty.test.ts

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import AppConfig from '@/config/AppConfig';
22
import { ShipmentType } from '@/constants/ShipmentType';
33
import { expect, test } from '@/fixtures/fixtures';
44
import { StockMovementResponse } from '@/types';
5+
import BinLocationUtils from '@/utils/BinLocationUtils';
56

67
test.describe('Cancel qty in the middle of receipt', () => {
78
let STOCK_MOVEMENT: StockMovementResponse;
@@ -53,7 +54,6 @@ test.describe('Cancel qty in the middle of receipt', () => {
5354
const isRollbackButtonVisible =
5455
await stockMovementShowPage.rollbackButton.isVisible();
5556

56-
// due to failed test, shipment might not be received which will not show the button
5757
if (isRollbackLastReceiptButtonVisible) {
5858
await stockMovementShowPage.rollbackLastReceiptButton.click();
5959
}
@@ -63,30 +63,14 @@ test.describe('Cancel qty in the middle of receipt', () => {
6363
}
6464

6565
await stockMovementService.deleteStockMovement(STOCK_MOVEMENT.id);
66-
67-
await test.step('Deactivate receiving bin', async () => {
68-
const mainLocation = await mainLocationService.getLocation();
69-
const receivingBin =
70-
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
71-
await page.goto('./location/list');
72-
await locationListPage.searchByLocationNameField.fill(
73-
mainLocation.name
74-
);
75-
await locationListPage.findButton.click();
76-
await locationListPage.getLocationEditButton(mainLocation.name).click();
77-
await createLocationPage.binLocationTab.click();
78-
await createLocationPage.binLocationTabSection.isLoaded();
79-
await createLocationPage.binLocationTabSection.searchField.fill(
80-
receivingBin
81-
);
82-
await createLocationPage.binLocationTabSection.searchField.press(
83-
'Enter'
84-
);
85-
await createLocationPage.binLocationTabSection.isLoaded();
86-
await createLocationPage.binLocationTabSection.editBinButton.click();
87-
await createLocationPage.locationConfigurationTab.click();
88-
await createLocationPage.locationConfigurationTabSection.activeCheckbox.uncheck();
89-
await createLocationPage.locationConfigurationTabSection.saveButton.click();
66+
const receivingBin =
67+
AppConfig.instance.receivingBinPrefix + STOCK_MOVEMENT.identifier;
68+
await BinLocationUtils.deactivateReceivingBin({
69+
mainLocationService,
70+
locationListPage,
71+
createLocationPage,
72+
page,
73+
receivingBin,
9074
});
9175
}
9276
);

0 commit comments

Comments
 (0)