Fix Tests for Integrations API

Author: pkolmann

tests/Api/IntegrationsTest.php

@@ -15,13 +15,12 @@
 namespace Gitlab\Tests\Api;
 
 use Gitlab\Api\Integrations;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class IntegrationsTest extends TestCase
 {
-    /**
-     * @test
-     */
+    #[Test]
     public function shouldGetAllIntegrations(): void
     {
         $expectedArray = $this->getMultipleIntegrationsData();
@@ -30,6 +29,7 @@ public function shouldGetAllIntegrations(): void
         $this->assertEquals($expectedArray, $api->all(1));
     }
 
+    #[Test]
     public function shouldCreateMicrosoftTeams(): void
     {
         $expectedArray = [
@@ -40,14 +40,15 @@ public function shouldCreateMicrosoftTeams(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedArray));
+            ->with('projects/1/integrations/microsoft-teams')
+            ->willReturn($expectedArray);
 
         $this->assertEquals($expectedArray, $api->createMicrosoftTeams(1, [
-            'webroot' => 'https://test.org/',
+            'webhook' => 'https://test.org/',
         ]));
     }
 
+    #[Test]
     public function shouldUpdateMicrosoftTeams(): void
     {
         $expectedArray = [
@@ -58,14 +59,15 @@ public function shouldUpdateMicrosoftTeams(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedArray));
+            ->with('projects/1/integrations/microsoft-teams')
+            ->willReturn($expectedArray);
 
         $this->assertEquals($expectedArray, $api->updateMicrosoftTeams(1, [
-            'webroot' => 'https://test.org/',
+            'webhook' => 'https://test.org/',
         ]));
     }
 
+    #[Test]
     public function shouldGetMicrosoftTeams(): void
     {
         $expectedArray = [
@@ -76,25 +78,27 @@ public function shouldGetMicrosoftTeams(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedArray));
+            ->with('projects/1/integrations/microsoft-teams')
+            ->willReturn($expectedArray);
 
         $this->assertEquals($expectedArray, $api->getMicrosoftTeams(1));
     }
 
+    #[Test]
     public function shouldRemoveMicrosoftTeams(): void
     {
         $expectedBool = true;
 
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedBool));
+            ->with('projects/1/integrations/microsoft-teams')
+            ->willReturn($expectedBool);
 
         $this->assertEquals($expectedBool, $api->removeMicrosoftTeams(1));
     }
 
+    #[Test]
     public function shouldCreateJira(): void
     {
         $expectedArray = [
@@ -105,15 +109,16 @@ public function shouldCreateJira(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedArray));
+            ->with('projects/1/integrations/jira')
+            ->willReturn($expectedArray);
 
         $this->assertEquals($expectedArray, $api->createJira(1, [
-            'url' => 'http://test.org/',
+            'url' => 'https://test.org/',
             'password' => '123',
         ]));
     }
 
+    #[Test]
     public function shouldUpdateJira(): void
     {
         $expectedArray = [
@@ -124,15 +129,16 @@ public function shouldUpdateJira(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('put')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedArray));
+            ->with('projects/1/integrations/jira')
+            ->willReturn($expectedArray);
 
         $this->assertEquals($expectedArray, $api->updateJira(1, [
-            'url' => 'http://test.org/',
+            'url' => 'https://test.org/',
             'password' => '123',
         ]));
     }
 
+    #[Test]
     public function shouldGetJira(): void
     {
         $expectedArray = [
@@ -143,40 +149,45 @@ public function shouldGetJira(): void
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedArray));
+            ->with('projects/1/integrations/jira')
+            ->willReturn($expectedArray);
 
         $this->assertEquals($expectedArray, $api->getJira(1));
     }
 
+    #[Test]
     public function shouldRemoveJira(): void
     {
         $expectedBool = true;
 
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')
-            ->with('projects/1/integrations')
-            ->will($this->returnValue($expectedBool));
+            ->with('projects/1/integrations/jira')
+            ->willReturn($expectedBool);
 
         $this->assertEquals($expectedBool, $api->removeJira(1));
     }
 
-    protected function getMultipleIntegrationsData(): array
+    // This method is used to create an array of multiple integrations data.
+    // NOT A TEST
+    private function getMultipleIntegrationsData(): array
     {
         return [
             ['id' => 1, 'title' => 'Microsoft Teams notifications', 'slug' => 'microsoft-teams'],
             ['id' => 2, 'title' => 'Jira', 'slug' => 'jira'],
         ];
     }
 
-    protected function getMultipleIntegrationsRequestMock($path, $expectedArray = [], $expectedParameters = []): MockObject
+    // This method is used to create a mock for the Integrations class.
+    // NOT A TEST
+    private function getMultipleIntegrationsRequestMock($path, $expectedArray = [], $expectedParameters = []): MockObject
     {
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
             ->with($path, $expectedParameters)
-            ->will($this->returnValue($expectedArray));
+            ->willReturn($expectedArray);
 
         return $api;
     }

tests/Api/ProjectsTest.php

@@ -2769,14 +2769,17 @@ public function shouldSearchGroups(): void
     #[Test]
     public function shouldGetIntegrations(): void
     {
+        $expectedArray = [
+            ['id' => 1, 'title' => 'Microsoft Teams notifications', 'slug' => 'microsoft-teams'],
+        ];
         $api = $this->getApiMock();
         $api->expects($this->once())
-            ->method('put')
+            ->method('get')
             ->with(
                 'projects/1/integrations'
             )
-            ->willReturn([]);
+            ->willReturn($expectedArray);
 
-        $this->assertEquals([], $api->integrations(1));
+        $this->assertEquals($expectedArray, $api->integrations(1));
     }
 }