Use phpmyadmin's secondary tabs instead of jQuery tabs

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 9 insertions, 26 deletions

diff --git a/test/libraries/PMA_server_plugins_test.php b/test/libraries/PMA_server_plugins_test.php
index 300dadfec0..38412bc92d 100644
--- a/test/libraries/PMA_server_plugins_test.php
+++ b/test/libraries/PMA_server_plugins_test.php
@@ -79,7 +79,6 @@ class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
          */
 
         $plugins = array();
-        $modules = array();
 
         $row = array();
         $row["plugin_name"] = "plugin_name1";
@@ -92,22 +91,10 @@ class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
         $row["module_description"] = "module_description1";
         $row["is_active"] = true;
         $plugins[$row['plugin_type']][] = $row;
-        $modules[$row['module_name']]['info'] = $row;
-        $modules[$row['module_name']]['plugins'][$row['plugin_type']][] = $row;
 
-        $html = PMA_getPluginAndModuleInfo($plugins, $modules);
+        $html = PMA_getPluginTab($plugins);
 
-        //validate 1: PMA_getPluginTab
-        $this->assertContains(
-            '<a href="#plugins_plugins">Plugins</a>',
-            $html
-        );
-        //validate 2: PMA_getModuleTab
-        $this->assertContains(
-            '<a href="#plugins_modules">Modules</a>',
-            $html
-        );
-        //validate 3:Items
+        //validate 1:Items
         $this->assertContains(
             '<th>Plugin</th>',
             $html
@@ -117,18 +104,10 @@ class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            '<th>Plugin</th>',
-            $html
-        );
-        $this->assertContains(
             '<th>Library</th>',
             $html
         );
         $this->assertContains(
-            '<th>Plugin</th>',
-            $html
-        );
-        $this->assertContains(
             '<th>Version</th>',
             $html
         );
@@ -141,12 +120,16 @@ class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //validate 4: one Item HTML
+        //validate 2: one Item HTML
         $this->assertContains(
             '<th>plugin_name1</th>',
             $html
         );
         $this->assertContains(
+            '<td>module_name1</td>',
+            $html
+        );
+        $this->assertContains(
             '<td>module_library1</td>',
             $html
         );
@@ -155,11 +138,11 @@ class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            '<td>module_description1</td>',
+            '<td>module_author1</td>',
             $html
         );
         $this->assertContains(
-            '<td>module_author1</td>',
+            '<td>module_license1</td>',
             $html
         );
     }