OXDEV-9919 Fix failing tests

Author: NikolaIvanovski

src/Authentication/OAuth2/Service/services.yaml

@@ -5,6 +5,7 @@ services:
 
   OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsServiceInterface:
     class: OxidEsales\SecurityModule\Authentication\OAuth2\Service\ModuleSettingsService
+    public: true
 
   OxidEsales\SecurityModule\Authentication\OAuth2\Service\UserServiceInterface:
     class: OxidEsales\SecurityModule\Authentication\OAuth2\Service\UserService

tests/Codeception/Acceptance/ProvidersVisibilityCest.php

@@ -28,7 +28,7 @@ public function _before(AcceptanceTester $I): void
     private $providerLink =
         'div[contains(@class, "sign-in-providers")]' .
         '//div[@class="provider"]' .
-        '//a[contains(@href, "cl=oauth&fnc=redirect&provider=")]';
+        '//a[contains(@href, "cl=oauth&fnc=login&provider=")]';
 
     public function testProvidersVisibilityOnHeaderLogin(AcceptanceTester $I): void
     {
@@ -72,39 +72,4 @@ public function testProviderVisibilityOnCheckoutPage(AcceptanceTester $I): void
         $I->seeElement($providerLinkElement);
         $I->assertGreaterOrEquals(1, count($I->grabMultiple($providerLinkElement)));
     }
-
-    public function testProviderVisibilityOnCheckoutWithoutAccount(AcceptanceTester $I): void
-    {
-        $providerLinkElement = '//div[contains(@class, "card-body")]//' . $this->providerLink;
-
-        $basket = new Basket($I);
-        $userCheckout = $basket->addProductToBasketAndOpenUserCheckout('1000', 1);
-        $userCheckout->selectOptionNoRegistration();
-        $I->dontSeeElement($providerLinkElement);
-
-        $this->setProviderState(true);
-        $basket = new Basket($I);
-        $userCheckout = $basket->addProductToBasketAndOpenUserCheckout('1000', 1);
-        $userCheckout->selectOptionNoRegistration();
-        $I->seeElement($providerLinkElement);
-        $I->assertGreaterOrEquals(1, count($I->grabMultiple($providerLinkElement)));
-    }
-
-    public function testProviderVisibilityOnCheckoutWithNewAccount(AcceptanceTester $I): void
-    {
-        $providerLinkElement = '//div[contains(@class, "card-body")]//' . $this->providerLink;
-
-        $basket = new Basket($I);
-        $basket
-            ->addProductToBasketAndOpenUserCheckout('1000', 1)
-            ->selectOptionRegisterNewAccount();
-        $I->dontSeeElement($providerLinkElement);
-
-        $this->setProviderState(true);
-        $basket
-            ->addProductToBasketAndOpenUserCheckout('1000', 1)
-            ->selectOptionRegisterNewAccount();
-        $I->seeElement($providerLinkElement);
-        $I->assertGreaterOrEquals(1, count($I->grabMultiple($providerLinkElement)));
-    }
 }

…Auth2/Infrastructure/UserFactoryTest.php …Auth2/Infrastructure/UserFactoryTest.phptests/Unit/Authentication/OAuth2/Infrastructure/UserFactoryTest.php renamed to tests/Integration/Authentication/OAuth2/Infrastructure/UserFactoryTest.php tests/Unit/Authentication/OAuth2/Infrastructure/UserFactoryTest.php renamed to tests/Integration/Authentication/OAuth2/Infrastructure/UserFactoryTest.php

@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\SecurityModule\Tests\Unit\Authentication\OAuth2\Infrastructure;
+namespace OxidEsales\SecurityModule\Tests\Integration\Authentication\OAuth2\Infrastructure;
 
 use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\UserFactory;

tests/Integration/Authentication/OAuth2/Service/UserServiceTest.php

@@ -86,6 +86,55 @@ public function testLoginWithNonExistingUser(): void
         $sut->login($userDataObjectMock);
     }
 
+    public function testLoginWithoutEmail(): void
+    {
+        $userDataObjectMock = $this->createMock(UserInterface::class);
+
+        $sut = $this->getSut();
+
+        $this->expectException(UserNotFoundException::class);
+
+        $sut->login($userDataObjectMock);
+    }
+
+    public function testGetUserByUserEmailIsFound(): void
+    {
+        $userDataObjectMock = $this->createMock(UserInterface::class);
+        $userDataObjectMock->method('getEmail')->willReturn(uniqid());
+
+        $userRepositoryMock = $this->createMock(UserRepositoryInterface::class);
+        $userRepositoryMock->method('getUserByUserEmail')->willReturn(new UserModel());
+        $userRepositoryMock->expects($this->never())->method('createUser');
+
+        $sut = $this->getSut(
+            userRepository: $userRepositoryMock
+        );
+
+        $sut->login($userDataObjectMock);
+    }
+
+    public function testGetUserByUserEmailIsNotFoundByCreated(): void
+    {
+        $userDataObjectMock = $this->createMock(UserInterface::class);
+        $userDataObjectMock->method('getEmail')->willReturn(uniqid());
+
+        $userRepositoryMock = $this->createMock(UserRepositoryInterface::class);
+        $userRepositoryMock
+            ->method('getUserByUserEmail')
+            ->willThrowException(new UserNotFoundException());
+        $userRepositoryMock
+            ->expects($this->once())
+            ->method('createUser')
+            ->with($userDataObjectMock)
+            ->willReturn(new UserModel());
+
+        $sut = $this->getSut(
+            userRepository: $userRepositoryMock
+        );
+
+        $sut->login($userDataObjectMock);
+    }
+
     private function createTestUser(string $username): string
     {
         $user = oxNew(UserModel::class);