Improve tests for User::remove()

Author: Art4

tests/Behat/Bootstrap/UserContextTrait.php

@@ -62,4 +62,18 @@ public function iShowTheUserWithId(int $userId)
             $api->getLastResponse()
         );
     }
+
+    /**
+     * @When I remove the user with id :userId
+     */
+    public function iRemoveTheUserWithId($userId)
+    {
+        /** @var User */
+        $api = $this->getNativeCurlClient()->getApi('user');
+
+        $this->registerClientResponse(
+            $api->remove($userId),
+            $api->getLastResponse()
+        );
+    }
 }

tests/Behat/features/user.feature

@@ -113,3 +113,18 @@ Feature: Interacting with the REST API for users
         And the response has the content type "application/json"
         And the response has the content ""
         And the returned data is false
+
+    @user
+    Scenario: Removing an user
+        Given I have a "NativeCurlClient" client
+        And I create a user with the following data
+            | property          | value                |
+            | login             | username             |
+            | firstname         | first                |
+            | lastname          | last                 |
+            | mail              | mail@example.com     |
+        When I remove the user with id "4"
+        Then the response has the status code "204"
+        And the response has an empty content type
+        And the response has the content ""
+        And the returned data is exactly ""

tests/Unit/Api/User/RemoveTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Redmine\Tests\Unit\Api\User;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use Redmine\Api\User;
+use Redmine\Tests\Fixtures\AssertingHttpClient;
+
+#[CoversClass(User::class)]
+class RemoveTest extends TestCase
+{
+    /**
+     * @dataProvider getRemoveData
+     */
+    #[DataProvider('getRemoveData')]
+    public function testRemoveReturnsCorrectResponse($id, $expectedPath, $responseCode, $response)
+    {
+        $client = AssertingHttpClient::create(
+            $this,
+            [
+                'DELETE',
+                $expectedPath,
+                'application/xml',
+                '',
+                $responseCode,
+                '',
+                $response
+            ]
+        );
+
+        // Create the object under test
+        $api = new User($client);
+
+        // Perform the tests
+        $this->assertSame($response, $api->remove($id));
+    }
+
+    public static function getRemoveData(): array
+    {
+        return [
+            'test with integer' => [
+                5,
+                '/users/5.xml',
+                204,
+                '',
+            ],
+        ];
+    }
+}

tests/Unit/Api/UserTest.php

@@ -183,31 +183,6 @@ public function testAllReturnsClientGetResponseWithParameters()
         $this->assertSame($expectedReturn, $api->all($parameters));
     }
 
-    /**
-     * Test remove().
-     */
-    public function testRemoveCallsDelete()
-    {
-        // Test values
-        $response = 'API Response';
-
-        // Create the used mock objects
-        $client = $this->createMock(Client::class);
-        $client->expects($this->once())
-            ->method('requestDelete')
-            ->with('/users/5.xml')
-            ->willReturn(true);
-        $client->expects($this->exactly(1))
-            ->method('getLastResponseBody')
-            ->willReturn($response);
-
-        // Create the object under test
-        $api = new User($client);
-
-        // Perform the tests
-        $this->assertSame($response, $api->remove(5));
-    }
-
     /**
      * Test listing().
      */