fix tests

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Apr 29, 2024 · 85f8bf4 · 85f8bf4
1 parent d665105
commit 85f8bf4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -22,9 +22,6 @@ jobs:
         databases: ['sqlite', 'mysql', 'pgsql']
         server-versions: ['master']
         include:
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: stable25
             - php-versions: 8.1
               databases: mysql
               server-versions: stable26
@@ -34,6 +31,9 @@ jobs:
             - php-versions: 8.1
               databases: mysql
               server-versions: stable28
+            - php-versions: 8.1
+              databases: mysql
+              server-versions: stable29
             - php-versions: 8.1
               databases: mysql
               server-versions: master

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -19,12 +19,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2']
         databases: ['mysql']
-        server-versions: ['stable25', 'stable26', 'stable27', 'stable28', 'master']
+        server-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'master']
         exclude:
           - php-versions: 7.4
             server-versions: master
+          - php-versions: 7.4
+            server-versions: stable29
           - php-versions: 7.4
             server-versions: stable28
           - php-versions: 7.4
@@ -34,21 +36,9 @@ jobs:
           - php-versions: 8.0
             server-versions: master
         include:
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable26
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable27
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: stable28
           - php-versions: 8.3
             databases: mysql
             server-versions: stable28
-          - php-versions: 8.2
-            databases: mysql
-            server-versions: master
           - php-versions: 8.3
             databases: mysql
             server-versions: master

diff --git a/tests/unit/Service/ProvisioningServiceTest.php b/tests/unit/Service/ProvisioningServiceTest.php
@@ -8,6 +8,8 @@
 use OCA\UserOIDC\Service\ProvisioningService;
 use OCP\Accounts\IAccountManager;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Http\Client\IClientService;
+use OCP\IAvatarManager;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUser;
@@ -44,6 +46,12 @@ class ProvisioningServiceTest extends TestCase {
 	/** @var IAccountManager | MockObject */
 	private $accountManager;
 
+	/** @var IClientService | MockObject */
+	private $clientService;
+
+	/** @var IAvatarManager | MockObject */
+	private $avatarManager;
+
 	public function setUp(): void {
 		parent::setUp();
 		$this->idService = $this->createMock(LocalIdService::class);
@@ -55,6 +63,8 @@ public function setUp(): void {
 		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->accountManager = $this->createMock(IAccountManager::class);
+		$this->clientService = $this->createMock(IClientService::class);
+		$this->avatarManager = $this->createMock(IAvatarManager::class);
 
 		$this->provisioningService = new ProvisioningService(
 			$this->idService,
@@ -65,6 +75,8 @@ public function setUp(): void {
 			$this->eventDispatcher,
 			$this->logger,
 			$this->accountManager,
+			$this->clientService,
+			$this->avatarManager
 		);
 	}