OXDEV-8234 Code cleanup

src/Component/UserComponent.php

@@ -7,7 +7,7 @@
 
 namespace OxidEsales\GeoBlocking\Component;
 
-use OxidEsales\GeoBlocking\Model\Address;
+use OxidEsales\Eshop\Application\Model\Address;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\GeoBlocking\Service\CountryToShopService;
 

tests/Codeception/Acceptance/FrontendCest.php

@@ -17,15 +17,7 @@ class FrontendCest
 {
     public function _before(AcceptanceTester $I)
     {
-        $I->setModuleActive();
-
-        $I->deleteFromDatabase('oxarticles', ['OXID' => '1000']);
-        $I->deleteFromDatabase('oxuser', ['OXID' => 'oegeoblockingtestuser']);
-        $I->deleteFromDatabase('oxuser', ['OXUSERNAME' => '[email protected]']);
-        $I->deleteFromDatabase('oxaddress', ['OXID' => 'pickup_address_id']);
-        $I->deleteFromDatabase('oxaddress', ['OXID' => 'user_defined_pickup_address_id']);
         $I->haveInDatabase('oegeoblocking_country_to_shop', Fixtures::get('countryToShopData'));
-        $I->updateConfigInDatabase('stickyHeader', false, 'bool');
     }
 
     public function registerUserWithCountryWhichIsInvoiceOnly(AcceptanceTester $I)

tests/Codeception/Support/AcceptanceTester.php

@@ -41,12 +41,4 @@ public function openShop()
         $I->amOnPage($homePage->URL);
         return $homePage;
     }
-
-    public function setModuleActive(): void
-    {
-        ContainerFactory::getInstance()
-            ->getContainer()
-            ->get(ModuleActivationBridgeInterface::class)
-            ->activate('oegeoblocking', 1);
-    }
 }

tests/Integration/Component/UserComponentTest.php

@@ -9,6 +9,7 @@
 
 use OxidEsales\Eshop\Application\Component\UserComponent;
 use OxidEsales\GeoBlocking\Model\Address;
+use OxidEsales\Eshop\Application\Model\Address as EShopAddress;
 use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\Eshop\Core\Field;
 use OxidEsales\Eshop\Core\Registry;
@@ -29,11 +30,11 @@ protected function setUp(): void
         $countryToShop->oegeoblocking_country_to_shop__invoice_only = new Field(1);
         $countryToShop->save();
 
-        $address = new Address();
+        $address = new EShopAddress();
         $address->setId('address_id');
         $address->save();
 
-        $address2 = new Address();
+        $address2 = new EShopAddress();
         $address2->setId('address_id2');
         $address2->save();
     }
@@ -55,7 +56,7 @@ public function testChangeUserWithoutRedirectWhenNotAllowedToChangeAddressData()
             ->onlyMethods(['oeGeoBlockingIsUserChangingAddress'])
             ->getMock();
         $addressMock->method('oeGeoBlockingIsUserChangingAddress')->willReturn(true);
-        Registry::set(Address::class, $addressMock);
+        Registry::set(EShopAddress::class, $addressMock);
 
         $this->assertFalse($userComponent->changeUserWithoutRedirect());
         $errors = Registry::getSession()->getVariable('Errors');
@@ -72,7 +73,7 @@ public function testChangeUserWithoutRedirectWhenAllowedToChangeAddressData()
             ->onlyMethods(['oeGeoBlockingIsUserChangingAddress'])
             ->getMock();
         $addressMock->method('oeGeoBlockingIsUserChangingAddress')->willReturn(false);
-        Registry::set(Address::class, $addressMock);
+        Registry::set(EShopAddress::class, $addressMock);
 
         $this->assertNotFalse($userComponent->changeUserWithoutRedirect());
         $errors = Registry::getSession()->getVariable('Errors');

tests/Integration/Model/UserAddressListTest.php

@@ -23,6 +23,10 @@ protected function setUp(): void
 
         $user = new User();
         $user->setId('user_id');
+        $user->assign([
+            'oxusername' => 'test',
+            'oxpassword' => md5('test')
+        ]);
         $user->save();
 
         $countryToShop = new CountryToShop();