Skip to content

Commit 8a357ff

Browse files
TitaKolevaTitaKoleva
committed
Merge branch 'b-7.0.x-fix_tests-OXDEV-8211' into b-7.0.x
2 parents d2e4429 + c5682a9 commit 8a357ff

File tree

7 files changed

+58
-40
lines changed

7 files changed

+58
-40
lines changed

‎Application/Core/ViewConfig.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ViewConfig extends ViewConfig_parent
2626
public function __construct()
2727
{
2828
parent::__construct();
29-
$this->oePersonalizationfactory = oxNew(Factory::class);
29+
$this->oePersonalizationfactory = Registry::get(Factory::class);
3030
$this->moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
3131
}
3232

‎tests/Helper/UserPreparationTrait.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ public function createUser($userId)
1515
{
1616
$user = oxNew(User::class);
1717
$user->setId($userId);
18-
$user->oxuser__oxusername = new Field('testemail@oxid-esales.com');
19-
$user->oxuser__oxpassword = new Field('test');
20-
$user->oxuser__oxbirthdate = new Field('any');
18+
$user->assign([
19+
'oxusername' => 'testemail@oxid-esales.com',
20+
'oxpassword' => md5('test'),
21+
'oxbirthdate' => '1990-01-01',
22+
]);
2123
$user->save();
2224

2325
return $user;

‎tests/Integration/Application/AbstractExportDataInCSV.php

+42-36
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
namespace OxidEsales\PersonalizationModule\Tests\Integration\Application;
99

10-
use OxidEsales\Eshop\Application\Model\Shop;
1110
use OxidEsales\Eshop\Core\Registry;
1211
use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
1312
use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationDaoBridgeInterface;
1413
use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
14+
use OxidEsales\EshopEnterprise\Internal\Framework\Module\Configuration\Bridge\ShopConfigurationGeneratorBridgeInterface;
1515
use OxidEsales\Facts\Facts;
1616
use OxidEsales\PersonalizationModule\Tests\Integration\IntegrationTestCase;
1717

@@ -233,7 +233,7 @@ public function testProductsExportWithSubshop()
233233
$lines = $this->prepareAndExecuteProductExport();
234234
$expectedContent = [
235235
'ID|SKU|Name|Name_var1|Description|Description_var1|ProductUrl|ProductUrl_var1|ImageUrl|Price|OldPrice|New|Stock|EAN|Brand|ProductCategory',
236-
'8888|8888|"Bar ""Butler"" 6 BOTTLES"|"Bar ""Butler"" 6 BOTTLES"|||%shopUrl%Geschenke/Bar-Butler-6-BOTTLES.html?shp=2|%shopUrl%en/Gifts/Bar-Butler-6-BOTTLES.html?shp=2|%shopUrl%out/pictures/generated/product/1/540_340_75/nopic.jpg|89.9|94|0|6|||subshopcategoryid'
236+
'8888|8888|"Bar ""Butler"" 6 BOTTLES"|"Bar ""Butler"" 6 BOTTLES"|||%shopUrl%Geschenke/Bar-Butler-6-BOTTLES.html?shp=2|%shopUrl%en/Gifts/Bar-Butler-6-BOTTLES.html?shp=2|%shopUrl%out/pictures/generated/product/1/800_600_75/nopic.jpg|89.9|94|0|6|||subshopcategoryid'
237237
];
238238
array_walk($expectedContent, function(&$item) use ($shopUrl) {
239239
$item = str_replace('%shopUrl%', $shopUrl, $item);
@@ -270,43 +270,43 @@ private function prepareAndExecuteProductExport(): array
270270

271271
private function prepareSubShop()
272272
{
273-
$subShopId = 2;
273+
$shopId = 2;
274+
275+
274276
$container = ContainerFactory::getInstance()->getContainer();
275-
/** @var ShopConfigurationDaoBridgeInterface $shopConfigurationDaoBridge */
276-
$shopConfigurationDaoBridge = $container->get(ShopConfigurationDaoBridgeInterface::class);
277-
$shopConfiguration = $shopConfigurationDaoBridge->get();
278-
Registry::getConfig()->setShopId($subShopId);
279-
$shopConfigurationDaoBridge->save($shopConfiguration);
280-
281-
// $this->activateModule('oepersonalization');
282-
Registry::getConfig()->saveShopConfVar('arr','aCurrencies', [
277+
$shopConfiguration = $container->get(ShopConfigurationDaoBridgeInterface::class)->get(1);
278+
$container->get(ShopConfigurationDaoBridgeInterface::class)->save($shopConfiguration);
279+
$container->get(ShopConfigurationGeneratorBridgeInterface::class)->generateForShop($shopId);
280+
281+
$config = Registry::getConfig();
282+
$config->setShopId($shopId);
283+
$config->saveShopConfVar('arr','aCurrencies', [
283284
'EUR@ 1.00@ ,@ .@ €@ 2',
284285
'GBP@ 0.8565@ .@ @ £@ 2',
285286
'CHF@ 1.4326@ ,@ .@ <small>CHF</small>@ 2',
286287
'USD@ 1.2994@ .@ @ $@ 2',
287-
], $subShopId);
288-
289-
Registry::getConfig()->saveShopConfVar('arr','aDetailImageSizes', [
290-
'oxpic1' => '540*340',
291-
'oxpic2' => '540*340',
292-
'oxpic3' => '540*340',
293-
'oxpic4' => '540*340',
294-
'oxpic5' => '540*340',
295-
'oxpic6' => '540*340',
296-
'oxpic7' => '540*340',
297-
'oxpic8' => '540*340',
298-
'oxpic9' => '540*340',
299-
'oxpic10' => '540*340',
300-
'oxpic11' => '540*340',
301-
'oxpic12' => '540*340',
302-
], $subShopId);
303-
304-
Registry::getConfig()->saveShopConfVar('string','sDefaultImageQuality', '75', $subShopId);
305-
Registry::getConfig()->saveShopConfVar('bool', 'bl_perfLoadPrice', true, $subShopId);
306-
307-
$shop = oxNew(Shop::class);
308-
$shop->load($subShopId);
309-
$shop->generateViews();
288+
], 2);
289+
$config->saveShopConfVar('arr','aDetailImageSizes', [
290+
'oxpic1' => '800*600',
291+
'oxpic2' => '800*600',
292+
'oxpic3' => '800*600',
293+
'oxpic4' => '800*600',
294+
'oxpic5' => '800*600',
295+
'oxpic6' => '800*600',
296+
'oxpic7' => '800*600',
297+
'oxpic8' => '800*600',
298+
'oxpic9' => '800*600',
299+
'oxpic10' => '800*600',
300+
'oxpic11' => '800*600',
301+
'oxpic12' => '800*600',
302+
], 2);
303+
$config->saveShopConfVar('string','sDefaultImageQuality', '75', 2);
304+
$config->saveShopConfVar('bool', 'bl_perfLoadPrice', true);
305+
306+
$this->regenerateDatabaseViews();
307+
$this->activateModule();
308+
309+
ContainerFactory::resetContainer();
310310
}
311311

312312
/**
@@ -319,12 +319,12 @@ private function isEnterpriseEdition(): bool
319319
return ('EE' === $facts->getEdition());
320320
}
321321

322-
public function activateModule($moduleId)
322+
public function activateModule()
323323
{
324324
$container = ContainerFactory::getInstance()->getContainer();
325325
/** @var ModuleActivationBridgeInterface $moduleService */
326326
$moduleService = $container->get(ModuleActivationBridgeInterface::class);
327-
$moduleService->activate($moduleId, Registry::getConfig()->getShopId());
327+
$moduleService->activate('oepersonalization', Registry::getConfig()->getShopId());
328328
}
329329

330330
/**
@@ -345,4 +345,10 @@ protected function prepareShopStructureForExport()
345345
{
346346
return Registry::getConfig()->getConfigParam('sShopDir');
347347
}
348+
349+
private function regenerateDatabaseViews(): void
350+
{
351+
$vendorPath = (new Facts())->getVendorPath();
352+
exec($vendorPath . '/bin/oe-eshop-db_views_generate');
353+
}
348354
}

‎tests/Integration/Application/TrackingTabControllerTest.php

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace OxidEsales\PersonalizationModule\Tests\Integration\Application;
88

99
use FileUpload\FileUpload;
10+
use OxidEsales\Eshop\Core\Registry;
1011
use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
1112
use OxidEsales\PersonalizationModule\Application\Controller\Admin\Tab\TrackingTabController;
1213
use OxidEsales\PersonalizationModule\Application\Factory;
@@ -15,6 +16,12 @@
1516

1617
class TrackingTabControllerTest extends IntegrationTestCase
1718
{
19+
public function tearDown(): void
20+
{
21+
Registry::getSession()->setAdminMode(false);
22+
parent::tearDown();
23+
}
24+
1825
public function testGetTrackingScriptMessageIfEnabledWhenFileIsPresent()
1926
{
2027
$jsFileLocatorStub = $this->makeFileSystemStub(true);

‎tests/fixtures/testdata_ce.sql

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SET @@session.sql_mode = '';
33

44
# Activate en and de languages
55
UPDATE `oxconfig` SET `OXVARVALUE` = 'a:2:{s:2:"de";a:3:{s:6:"baseId";i:0;s:6:"active";s:1:"1";s:4:"sort";s:1:"1";}s:2:"en";a:3:{s:6:"baseId";i:1;s:6:"active";s:1:"1";s:4:"sort";s:1:"2";}}' WHERE `OXVARNAME` = 'aLanguageParams';
6+
UPDATE `oxconfig` SET `OXVARVALUE` = 'a:12:{s:6:"oxpic1";s:7:"800*600";s:6:"oxpic2";s:7:"800*600";s:6:"oxpic3";s:7:"800*600";s:6:"oxpic4";s:7:"800*600";s:6:"oxpic5";s:7:"800*600";s:6:"oxpic6";s:7:"800*600";s:6:"oxpic7";s:7:"800*600";s:6:"oxpic8";s:7:"800*600";s:6:"oxpic9";s:7:"800*600";s:7:"oxpic10";s:7:"800*600";s:7:"oxpic11";s:7:"800*600";s:7:"oxpic12";s:7:"800*600";}' WHERE `OXVARNAME` = 'aDetailImageSizes';
67

78
#set country for default user
89
UPDATE oxuser SET oxcountryid = 'a7c40f631fc920687.20179984' where oxid='oxdefaultadmin';

‎tests/fixtures/testdata_ee.sql

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ SET @@session.sql_mode = '';
22

33
# Activate en and de languages
44
UPDATE `oxconfig` SET `OXVARVALUE` = 'a:2:{s:2:"de";a:3:{s:6:"baseId";i:0;s:6:"active";s:1:"1";s:4:"sort";s:1:"1";}s:2:"en";a:3:{s:6:"baseId";i:1;s:6:"active";s:1:"1";s:4:"sort";s:1:"2";}}' WHERE `OXVARNAME` = 'aLanguageParams';
5+
UPDATE `oxconfig` SET `OXVARVALUE` = 'a:12:{s:6:"oxpic1";s:7:"800*600";s:6:"oxpic2";s:7:"800*600";s:6:"oxpic3";s:7:"800*600";s:6:"oxpic4";s:7:"800*600";s:6:"oxpic5";s:7:"800*600";s:6:"oxpic6";s:7:"800*600";s:6:"oxpic7";s:7:"800*600";s:6:"oxpic8";s:7:"800*600";s:6:"oxpic9";s:7:"800*600";s:7:"oxpic10";s:7:"800*600";s:7:"oxpic11";s:7:"800*600";s:7:"oxpic12";s:7:"800*600";}' WHERE `OXVARNAME` = 'aDetailImageSizes';
56

67
#set country for default user
78
UPDATE oxuser SET oxcountryid = 'a7c40f631fc920687.20179984' where oxid='oxdefaultadmin';

‎tests/fixtures/testdata_pe.sql

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SET @@session.sql_mode = '';
33

44
# Activate en and de languages
55
UPDATE `oxconfig` SET `OXVARVALUE` = 'a:2:{s:2:"de";a:3:{s:6:"baseId";i:0;s:6:"active";s:1:"1";s:4:"sort";s:1:"1";}s:2:"en";a:3:{s:6:"baseId";i:1;s:6:"active";s:1:"1";s:4:"sort";s:1:"2";}}' WHERE `OXVARNAME` = 'aLanguageParams';
6+
UPDATE `oxconfig` SET `OXVARVALUE` = 'a:12:{s:6:"oxpic1";s:7:"800*600";s:6:"oxpic2";s:7:"800*600";s:6:"oxpic3";s:7:"800*600";s:6:"oxpic4";s:7:"800*600";s:6:"oxpic5";s:7:"800*600";s:6:"oxpic6";s:7:"800*600";s:6:"oxpic7";s:7:"800*600";s:6:"oxpic8";s:7:"800*600";s:6:"oxpic9";s:7:"800*600";s:7:"oxpic10";s:7:"800*600";s:7:"oxpic11";s:7:"800*600";s:7:"oxpic12";s:7:"800*600";}' WHERE `OXVARNAME` = 'aDetailImageSizes';
67

78
#set country for default user
89
UPDATE oxuser SET oxcountryid = 'a7c40f631fc920687.20179984' where oxid='oxdefaultadmin';

0 commit comments

Comments
 (0)