Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2022-06-10 06:40:13 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2022-06-10 06:40:13 +0300
commit065d6d618cfbe2864e1576e8ec88cfad0fba4551 (patch)
tree07dc7d72f38709822552a0e2d3cce07987d92f24 /test
parent11e34a6fecedeef63ecc24051ff48dadc331f9ac (diff)
parent3412fb2c03c4d3fdac0b97ed8445340d99e77b48 (diff)
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'test')
-rw-r--r--test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php4
-rw-r--r--test/classes/Controllers/Server/Status/ProcessesControllerTest.php2
-rw-r--r--test/classes/Stubs/DbiDummy.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
index 8835e2deb0..f4ac71e9f9 100644
--- a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
@@ -46,7 +46,7 @@ class RefreshControllerTest extends AbstractTestCase
'User' => 'User1',
'Host' => 'Host1',
'Id' => 'Id1',
- 'db' => 'db1',
+ 'Db' => 'db1',
'Command' => 'Command1',
'Info' => 'Info1',
'State' => 'State1',
@@ -95,7 +95,7 @@ class RefreshControllerTest extends AbstractTestCase
//validate 4: $process['db']
$this->assertStringContainsString(
- __('None'),
+ $process['Db'],
$html
);
diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
index 324d9cc64e..2102ba3bce 100644
--- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
+++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
@@ -77,7 +77,7 @@ class ProcessesControllerTest extends AbstractTestCase
$_POST['full'] = '1';
$_POST['column_name'] = 'Database';
- $_POST['order_by_field'] = 'db';
+ $_POST['order_by_field'] = 'Db';
$_POST['sort_order'] = 'ASC';
$this->dummyDbi->addSelectDb('mysql');
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
index 325c64de12..ea2718645d 100644
--- a/test/classes/Stubs/DbiDummy.php
+++ b/test/classes/Stubs/DbiDummy.php
@@ -2334,7 +2334,7 @@ class DbiDummy implements DbiExtension
'result' => [['Id1', 'User1', 'Host1', 'db1', 'Command1', 'Time1', 'State1', 'Info1']],
],
[
- 'query' => 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ORDER BY `db` ASC',
+ 'query' => 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ORDER BY `Db` ASC',
'columns' => ['Id', 'User', 'Host', 'db', 'Command', 'Time', 'State', 'Info'],
'result' => [['Id1', 'User1', 'Host1', 'db1', 'Command1', 'Time1', 'State1', 'Info1']],
],