Merge pull request #52 from mrsombre/fix-test-webspace

Fix test creating webspace with disabled PHP handler

Author: mrsombre

tests/CustomerTest.php

@@ -58,9 +58,12 @@ public function testGetAll()
         ]);
 
         $customersInfo = static::$_client->customer()->getAll();
-        $this->assertCount(2, $customersInfo);
-        $this->assertEquals('John Smith', $customersInfo[0]->personalName);
-        $this->assertEquals('customer-a', $customersInfo[0]->login);
+        $this->assertIsArray($customersInfo);
+
+        $customersCheck = array_filter($customersInfo, function ($value) {
+            return $value->personalName === 'John Smith' || $value->personalName === 'Mike Black';
+        });
+        $this->assertCount(2, $customersCheck);
 
         static::$_client->customer()->delete('login', 'customer-a');
         static::$_client->customer()->delete('login', 'customer-b');

tests/WebspaceTest.php

@@ -46,16 +46,17 @@ public function testDelete()
 
     public function testRequestCreateWebspace()
     {
-        $id = uniqid();
-        $password = base64_encode(time());
-        $name = "d{$id}.test";
-
-        $handler = static::$_client->phpHandler()->get(null, null);
+        $handlers = static::$_client->phpHandler()->getAll();
+        $enabledHandlers = array_filter($handlers, function ($handler) {
+            return $handler->handlerStatus !== 'disabled';
+        });
+        $this->assertGreaterThan(0, count($enabledHandlers));
+        $handler = current($enabledHandlers);
 
         $request = [
             'add' => [
                 'gen_setup' => [
-                    'name' => $name,
+                    'name' => 'webspace-test-full.test',
                     'htype' => 'vrt_hst',
                     'status' => '0',
                     'ip_address' => [static::_getIpAddress()],
@@ -69,11 +70,11 @@ public function testRequestCreateWebspace()
                             ],
                             [
                                 'name' => 'ftp_login',
-                                'value' => "u{$id}",
+                                'value' => 'testuser',
                             ],
                             [
                                 'name' => 'ftp_password',
-                                'value' => $password,
+                                'value' => 'test-PWD*1',
                             ],
                         ],
                         'ip_address' => static::_getIpAddress(),
@@ -120,17 +121,7 @@ public function testRequestCreateWebspace()
             ],
         ];
 
-        try {
-            $webspace = static::$_client->webspace()->request($request);
-        } catch (\Exception $e) {
-            try {
-                $webspaceInfo = static::$_client->webspace()->get('name', $name);
-                static::$_client->webspace()->delete('guid', $webspaceInfo->guid);
-            } catch (\Exception $e) {
-            }
-
-            $this->fail($e->getMessage());
-        }
+        $webspace = static::$_client->webspace()->request($request);
 
         $this->assertGreaterThan(0, $webspace->id);
 
@@ -142,8 +133,8 @@ public function testGet()
         $webspace = static::_createWebspace();
         $webspaceInfo = static::$_client->webspace()->get('id', $webspace->id);
 
+        $this->assertInstanceOf(\PleskX\Api\Struct\Webspace\GeneralInfo::class, $webspaceInfo);
         $this->assertNotEmpty($webspaceInfo->name);
         $this->assertEquals(0, $webspaceInfo->realSize);
-
     }
 }