Fix tests marked as incomplete

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

2 files changed, 27 insertions, 22 deletions

diff --git a/test/classes/Controllers/Sql/EnumValuesControllerTest.php b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
index fdb74b2e5b..dc3c9aa574 100644
--- a/test/classes/Controllers/Sql/EnumValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
@@ -39,21 +39,22 @@ class EnumValuesControllerTest extends AbstractTestCase
     {
         $this->dummyDbi->addResult('SHOW COLUMNS FROM `cvv`.`enums` LIKE \'set\'', false);
 
-        $_POST = [
-            'ajax_request' => true,
-            'db' => 'cvv',
-            'table' => 'enums',
-            'column' => 'set',
-            'curr_value' => 'b&c',
-        ];
-        $GLOBALS['db'] = $_POST['db'];
-        $GLOBALS['table'] = $_POST['table'];
+        $GLOBALS['db'] = 'cvv';
+        $GLOBALS['table'] = 'enums';
+
+        $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['db', null, 'cvv'],
+            ['table', null, 'enums'],
+            ['column', null, 'set'],
+            ['curr_value', null, 'b&c'],
+        ]);
 
         $GLOBALS['containerBuilder']->setParameter('db', $GLOBALS['db']);
         $GLOBALS['containerBuilder']->setParameter('table', $GLOBALS['table']);
         /** @var EnumValuesController $sqlController */
         $sqlController = $GLOBALS['containerBuilder']->get(EnumValuesController::class);
-        $sqlController($this->createStub(ServerRequest::class));
+        $sqlController($request);
 
         $this->assertResponseWasNotSuccessfull();
 
@@ -87,21 +88,22 @@ class EnumValuesControllerTest extends AbstractTestCase
             ]
         );
 
-        $_POST = [
-            'ajax_request' => true,
-            'db' => 'cvv',
-            'table' => 'enums',
-            'column' => 'set',
-            'curr_value' => 'b&c',
-        ];
-        $GLOBALS['db'] = $_POST['db'];
-        $GLOBALS['table'] = $_POST['table'];
+        $GLOBALS['db'] = 'cvv';
+        $GLOBALS['table'] = 'enums';
+
+        $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['db', null, 'cvv'],
+            ['table', null, 'enums'],
+            ['column', null, 'set'],
+            ['curr_value', null, 'b&c'],
+        ]);
 
         $GLOBALS['containerBuilder']->setParameter('db', $GLOBALS['db']);
         $GLOBALS['containerBuilder']->setParameter('table', $GLOBALS['table']);
         /** @var EnumValuesController $sqlController */
         $sqlController = $GLOBALS['containerBuilder']->get(EnumValuesController::class);
-        $sqlController($this->createStub(ServerRequest::class));
+        $sqlController($request);
 
         $this->assertResponseWasSuccessfull();
 
diff --git a/test/classes/Controllers/Table/ReplaceControllerTest.php b/test/classes/Controllers/Table/ReplaceControllerTest.php
index 9b7de4797c..ed35390bcd 100644
--- a/test/classes/Controllers/Table/ReplaceControllerTest.php
+++ b/test/classes/Controllers/Table/ReplaceControllerTest.php
@@ -75,7 +75,6 @@ class ReplaceControllerTest extends AbstractTestCase
         $_POST['db'] = $GLOBALS['db'];
         $_POST['table'] = $GLOBALS['table'];
         $_POST['ajax_request'] = 'true';
-        $_POST['sql_query'] = '';
         $_POST['clause_is_unique'] = 1;
         $_POST['where_clause'] = [
             '`test`.`ser` = 2',
@@ -106,6 +105,11 @@ class ReplaceControllerTest extends AbstractTestCase
             ],
         ];
 
+        $request = $this->createStub(ServerRequest::class);
+        $request->method('getParsedBodyParam')->willReturnMap([
+            ['sql_query', null, ''],
+        ]);
+
         $dummyDbi = $this->createDbiDummy();
         $dbi = $this->createDatabaseInterface($dummyDbi);
         $relation = new Relation($dbi);
@@ -121,7 +125,6 @@ class ReplaceControllerTest extends AbstractTestCase
             $dbi
         );
 
-        $request = $this->createStub(ServerRequest::class);
         $sqlController = new SqlController(
             $response,
             $template,