Skip to content

Commit 5541617

Browse files
nesrineabdmoulehnesrineabdmouleh
authored
Merge pull request PrestaShop#36971 from Progi1984/TEST-3989
Functional Tests : New products block module: Upgrade module
2 parents 5b57131 + 06b7eb4 commit 5541617

File tree

19 files changed

+665
-662
lines changed

19 files changed

+665
-662
lines changed

‎tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
6767
}
6868
});
6969

70-
installModule(dataModules.keycloak, `${baseContext}_preTest_1`);
70+
installModule(dataModules.keycloak, true, `${baseContext}_preTest_1`);
7171

7272
describe('Resource Endpoint', async () => {
7373
it('should login in BO', async function () {

‎tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('BO - Modules - Module Manager : Upload module', async () => {
3838
it(`should download the zip of the module '${dataModules.keycloak.name}'`, async function () {
3939
await testContext.addContextItem(this, 'testIdentifier', 'downloadModule', baseContext);
4040

41-
await utilsFile.downloadFile(dataModules.keycloak.releaseZip, 'module.zip');
41+
await utilsFile.downloadFile(dataModules.keycloak.releaseZip(dataModules.keycloak.versionCurrent), 'module.zip');
4242

4343
const found = await utilsFile.doesFileExist('module.zip');
4444
expect(found).to.eq(true);

‎tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/03_allowIframes.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import loginCommon from '@commonTests/BO/loginBO';
66

77
// Import pages
88
// Import BO pages
9-
import generalPage from '@pages/BO/shopParameters/general';
109
import addProductPage from '@pages/BO/catalog/products/add';
1110
import descriptionTab from '@pages/BO/catalog/products/add/descriptionTab';
1211

@@ -15,6 +14,7 @@ import type {BrowserContext, Page} from 'playwright';
1514
import {
1615
boDashboardPage,
1716
boProductsPage,
17+
boShopParametersPage,
1818
dataProducts,
1919
foClassicProductPage,
2020
utilsPlaywright,
@@ -64,17 +64,17 @@ describe('BO - Shop Parameters - General : Enable/Disable Allow iframes on HTML
6464
boDashboardPage.shopParametersParentLink,
6565
boDashboardPage.shopParametersGeneralLink,
6666
);
67-
await generalPage.closeSfToolBar(page);
67+
await boShopParametersPage.closeSfToolBar(page);
6868

69-
const pageTitle = await generalPage.getPageTitle(page);
70-
expect(pageTitle).to.contains(generalPage.pageTitle);
69+
const pageTitle = await boShopParametersPage.getPageTitle(page);
70+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
7171
});
7272

7373
it(`should ${test.args.action} allow iframes`, async function () {
7474
await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}AllowIframes`, baseContext);
7575

76-
const result = await generalPage.setAllowIframes(page, test.args.exist);
77-
expect(result).to.contains(generalPage.successfulUpdateMessage);
76+
const result = await boShopParametersPage.setAllowIframes(page, test.args.exist);
77+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
7878
});
7979

8080
it('should go to Products page', async function () {

‎tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/05_roundMode.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import loginCommon from '@commonTests/BO/loginBO';
66
import {createProductTest, deleteProductTest} from '@commonTests/BO/catalog/product';
77

88
// Import BO pages
9-
import generalPage from '@pages/BO/shopParameters/general';
109
import pricingTab from '@pages/BO/catalog/products/add/pricingTab';
1110
import createProductsPage from '@pages/BO/catalog/products/add';
1211

@@ -15,6 +14,7 @@ import type {BrowserContext, Page} from 'playwright';
1514
import {
1615
boDashboardPage,
1716
boProductsPage,
17+
boShopParametersPage,
1818
FakerProduct,
1919
foClassicHomePage,
2020
foClassicProductPage,
@@ -78,24 +78,24 @@ describe('BO - Shop Parameters - General : Round mode', async () => {
7878
boDashboardPage.shopParametersParentLink,
7979
boDashboardPage.shopParametersGeneralLink,
8080
);
81-
await generalPage.closeSfToolBar(page);
81+
await boShopParametersPage.closeSfToolBar(page);
8282

83-
const pageTitle = await generalPage.getPageTitle(page);
84-
expect(pageTitle).to.contains(generalPage.pageTitle);
83+
const pageTitle = await boShopParametersPage.getPageTitle(page);
84+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
8585
});
8686

8787
it(`should select the round mode '${test.args.roundMode}'`, async function () {
8888
await testContext.addContextItem(this, 'testIdentifier', `selectRoundMode${index}`, baseContext);
8989

90-
const result = await generalPage.selectRoundMode(page, test.args.roundMode);
91-
expect(result).to.contains(generalPage.successfulUpdateMessage);
90+
const result = await boShopParametersPage.selectRoundMode(page, test.args.roundMode);
91+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
9292
});
9393

9494
it('should view my shop', async function () {
9595
await testContext.addContextItem(this, 'testIdentifier', `viewMyShop${index}`, baseContext);
9696

9797
// View shop
98-
page = await generalPage.viewMyShop(page);
98+
page = await boShopParametersPage.viewMyShop(page);
9999
await foClassicHomePage.changeLanguage(page, 'en');
100100

101101
const isHomePage = await foClassicHomePage.isHomePage(page);
@@ -132,8 +132,8 @@ describe('BO - Shop Parameters - General : Round mode', async () => {
132132

133133
page = await foClassicProductPage.closePage(browserContext, page, 0);
134134

135-
const pageTitle = await generalPage.getPageTitle(page);
136-
expect(pageTitle).to.contains(generalPage.pageTitle);
135+
const pageTitle = await boShopParametersPage.getPageTitle(page);
136+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
137137
});
138138
});
139139
});
@@ -197,24 +197,24 @@ describe('BO - Shop Parameters - General : Round mode', async () => {
197197
boDashboardPage.shopParametersParentLink,
198198
boDashboardPage.shopParametersGeneralLink,
199199
);
200-
await generalPage.closeSfToolBar(page);
200+
await boShopParametersPage.closeSfToolBar(page);
201201

202-
const pageTitle = await generalPage.getPageTitle(page);
203-
expect(pageTitle).to.contains(generalPage.pageTitle);
202+
const pageTitle = await boShopParametersPage.getPageTitle(page);
203+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
204204
});
205205

206206
it(`should select the round mode '${test.args.roundMode}'`, async function () {
207207
await testContext.addContextItem(this, 'testIdentifier', `selectRoundMode2${index}`, baseContext);
208208

209-
const result = await generalPage.selectRoundMode(page, test.args.roundMode);
210-
expect(result).to.contains(generalPage.successfulUpdateMessage);
209+
const result = await boShopParametersPage.selectRoundMode(page, test.args.roundMode);
210+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
211211
});
212212

213213
it('should view my shop', async function () {
214214
await testContext.addContextItem(this, 'testIdentifier', `viewMyShop2${index}`, baseContext);
215215

216216
// View shop
217-
page = await generalPage.viewMyShop(page);
217+
page = await boShopParametersPage.viewMyShop(page);
218218
await foClassicHomePage.changeLanguage(page, 'en');
219219

220220
const isHomePage = await foClassicHomePage.isHomePage(page);
@@ -251,8 +251,8 @@ describe('BO - Shop Parameters - General : Round mode', async () => {
251251

252252
page = await foClassicProductPage.closePage(browserContext, page, 0);
253253

254-
const pageTitle = await generalPage.getPageTitle(page);
255-
expect(pageTitle).to.contains(generalPage.pageTitle);
254+
const pageTitle = await boShopParametersPage.getPageTitle(page);
255+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
256256
});
257257
});
258258
});
@@ -316,24 +316,24 @@ describe('BO - Shop Parameters - General : Round mode', async () => {
316316
boDashboardPage.shopParametersParentLink,
317317
boDashboardPage.shopParametersGeneralLink,
318318
);
319-
await generalPage.closeSfToolBar(page);
319+
await boShopParametersPage.closeSfToolBar(page);
320320

321-
const pageTitle = await generalPage.getPageTitle(page);
322-
expect(pageTitle).to.contains(generalPage.pageTitle);
321+
const pageTitle = await boShopParametersPage.getPageTitle(page);
322+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
323323
});
324324

325325
it(`should select the round mode '${test.args.roundMode}'`, async function () {
326326
await testContext.addContextItem(this, 'testIdentifier', `selectRoundMode3${index}`, baseContext);
327327

328-
const result = await generalPage.selectRoundMode(page, test.args.roundMode);
329-
expect(result).to.contains(generalPage.successfulUpdateMessage);
328+
const result = await boShopParametersPage.selectRoundMode(page, test.args.roundMode);
329+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
330330
});
331331

332332
it('should view my shop', async function () {
333333
await testContext.addContextItem(this, 'testIdentifier', `viewMyShop3${index}`, baseContext);
334334

335335
// View shop
336-
page = await generalPage.viewMyShop(page);
336+
page = await boShopParametersPage.viewMyShop(page);
337337
await foClassicHomePage.changeLanguage(page, 'en');
338338

339339
const isHomePage = await foClassicHomePage.isHomePage(page);
@@ -370,8 +370,8 @@ describe('BO - Shop Parameters - General : Round mode', async () => {
370370

371371
page = await foClassicProductPage.closePage(browserContext, page, 0);
372372

373-
const pageTitle = await generalPage.getPageTitle(page);
374-
expect(pageTitle).to.contains(generalPage.pageTitle);
373+
const pageTitle = await boShopParametersPage.getPageTitle(page);
374+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
375375
});
376376
});
377377
});

‎tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import loginCommon from '@commonTests/BO/loginBO';
66

77
// Import pages
88
// Import BO pages
9-
import generalPage from '@pages/BO/shopParameters/general';
109
import brandsPage from '@pages/BO/catalog/brands';
1110
import suppliersPage from '@pages/BO/catalog/suppliers';
1211
// Import FO pages
@@ -16,6 +15,7 @@ import {expect} from 'chai';
1615
import type {BrowserContext, Page} from 'playwright';
1716
import {
1817
boDashboardPage,
18+
boShopParametersPage,
1919
foClassicHomePage,
2020
utilsPlaywright,
2121
} from '@prestashop-core/ui-testing';
@@ -60,27 +60,27 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
6060
boDashboardPage.shopParametersParentLink,
6161
boDashboardPage.shopParametersGeneralLink,
6262
);
63-
await generalPage.closeSfToolBar(page);
63+
await boShopParametersPage.closeSfToolBar(page);
6464

65-
const pageTitle = await generalPage.getPageTitle(page);
66-
expect(pageTitle).to.contains(generalPage.pageTitle);
65+
const pageTitle = await boShopParametersPage.getPageTitle(page);
66+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
6767
});
6868

6969
it(`should ${test.args.action} display suppliers`, async function () {
7070
await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DisplaySuppliers`, baseContext);
7171

72-
const result = await generalPage.setDisplaySuppliers(page, test.args.exist);
73-
expect(result).to.contains(generalPage.successfulUpdateMessage);
72+
const result = await boShopParametersPage.setDisplaySuppliers(page, test.args.exist);
73+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
7474
});
7575

7676
if (test.args.action === 'Disable') {
7777
it('should go to \'Brands & Suppliers\' page', async function () {
7878
await testContext.addContextItem(this, 'testIdentifier', `goToBrandsPage_${index}`, baseContext);
7979

80-
await generalPage.goToSubMenu(
80+
await boShopParametersPage.goToSubMenu(
8181
page,
82-
generalPage.catalogParentLink,
83-
generalPage.brandsAndSuppliersLink,
82+
boShopParametersPage.catalogParentLink,
83+
boShopParametersPage.brandsAndSuppliersLink,
8484
);
8585

8686
const pageTitle = await brandsPage.getPageTitle(page);
@@ -134,8 +134,8 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
134134

135135
page = await siteMapPage.closePage(browserContext, page, 0);
136136

137-
const pageTitle = await generalPage.getPageTitle(page);
138-
expect(pageTitle).to.contains(generalPage.pageTitle);
137+
const pageTitle = await boShopParametersPage.getPageTitle(page);
138+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
139139
});
140140
}
141141
});

‎tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import testContext from '@utils/testContext';
55
import loginCommon from '@commonTests/BO/loginBO';
66

77
// Import BO pages
8-
import generalPage from '@pages/BO/shopParameters/general';
98
import brandsPage from '@pages/BO/catalog/brands';
109
import {siteMapPage} from '@pages/FO/classic/siteMap';
1110

1211
import {expect} from 'chai';
1312
import type {BrowserContext, Page} from 'playwright';
1413
import {
1514
boDashboardPage,
15+
boShopParametersPage,
1616
foClassicHomePage,
1717
utilsPlaywright,
1818
} from '@prestashop-core/ui-testing';
@@ -57,27 +57,27 @@ describe('BO - Shop Parameters - General : Enable/Disable display brands', async
5757
boDashboardPage.shopParametersParentLink,
5858
boDashboardPage.shopParametersGeneralLink,
5959
);
60-
await generalPage.closeSfToolBar(page);
60+
await boShopParametersPage.closeSfToolBar(page);
6161

62-
const pageTitle = await generalPage.getPageTitle(page);
63-
expect(pageTitle).to.contains(generalPage.pageTitle);
62+
const pageTitle = await boShopParametersPage.getPageTitle(page);
63+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
6464
});
6565

6666
it(`should ${test.args.action} display brands`, async function () {
6767
await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DisplayBrands`, baseContext);
6868

69-
const result = await generalPage.setDisplayBrands(page, test.args.exist);
70-
expect(result).to.contains(generalPage.successfulUpdateMessage);
69+
const result = await boShopParametersPage.setDisplayBrands(page, test.args.exist);
70+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
7171
});
7272

7373
if (test.args.action === 'Disable') {
7474
it('should go to \'Brands & Suppliers\' page', async function () {
7575
await testContext.addContextItem(this, 'testIdentifier', `goToBrandsPage_${index}`, baseContext);
7676

77-
await generalPage.goToSubMenu(
77+
await boShopParametersPage.goToSubMenu(
7878
page,
79-
generalPage.catalogParentLink,
80-
generalPage.brandsAndSuppliersLink,
79+
boShopParametersPage.catalogParentLink,
80+
boShopParametersPage.brandsAndSuppliersLink,
8181
);
8282

8383
const pageTitle = await brandsPage.getPageTitle(page);

‎tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/10_enableDisableBestSellers.ts

+9-10
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import testContext from '@utils/testContext';
55
import loginCommon from '@commonTests/BO/loginBO';
66

77
// Import pages
8-
// Import BO pages
9-
import generalPage from '@pages/BO/shopParameters/general';
108
// Import FO pages
119
import {siteMapPage} from '@pages/FO/classic/siteMap';
1210

1311
import {expect} from 'chai';
1412
import type {BrowserContext, Page} from 'playwright';
1513
import {
1614
boDashboardPage,
15+
boShopParametersPage,
1716
foClassicHomePage,
1817
utilsPlaywright,
1918
} from '@prestashop-core/ui-testing';
@@ -57,24 +56,24 @@ describe('BO - Shop Parameters - General : Enable/Disable display best sellers',
5756
boDashboardPage.shopParametersParentLink,
5857
boDashboardPage.shopParametersGeneralLink,
5958
);
60-
await generalPage.closeSfToolBar(page);
59+
await boShopParametersPage.closeSfToolBar(page);
6160

62-
const pageTitle = await generalPage.getPageTitle(page);
63-
expect(pageTitle).to.contains(generalPage.pageTitle);
61+
const pageTitle = await boShopParametersPage.getPageTitle(page);
62+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
6463
});
6564

6665
it(`should ${test.args.action} display best sellers`, async function () {
6766
await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DisplayBestSellers`, baseContext);
6867

69-
const result = await generalPage.setDisplayBestSellers(page, test.args.exist);
70-
expect(result).to.contains(generalPage.successfulUpdateMessage);
68+
const result = await boShopParametersPage.setDisplayBestSellers(page, test.args.exist);
69+
expect(result).to.contains(boShopParametersPage.successfulUpdateMessage);
7170
});
7271

7372
it('should go to FO', async function () {
7473
await testContext.addContextItem(this, 'testIdentifier', `goToFO_${test.args.action}`, baseContext);
7574

7675
// View shop
77-
page = await generalPage.viewMyShop(page);
76+
page = await boShopParametersPage.viewMyShop(page);
7877
// Change shop language
7978
await foClassicHomePage.changeLanguage(page, 'en');
8079

@@ -103,8 +102,8 @@ describe('BO - Shop Parameters - General : Enable/Disable display best sellers',
103102

104103
page = await siteMapPage.closePage(browserContext, page, 0);
105104

106-
const pageTitle = await generalPage.getPageTitle(page);
107-
expect(pageTitle).to.contains(generalPage.pageTitle);
105+
const pageTitle = await boShopParametersPage.getPageTitle(page);
106+
expect(pageTitle).to.contains(boShopParametersPage.pageTitle);
108107
});
109108
});
110109
});

0 commit comments

Comments
 (0)