Fix failing tests

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Nov 13, 2014 · 3e1455a · 3e1455a
1 parent 183aae0
commit 3e1455a
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php
@@ -1601,7 +1601,7 @@ public function testGetRowInfoForSpecialLinks(
      *
      * @return array parameters and output
      */
-    public function dataProviderForTestGetShowAllButtonForTableNavigation()
+    public function dataProviderForTestGetShowAllCheckboxForTableNavigation()
     {
         return array(
             array(
@@ -1610,15 +1610,17 @@ public function dataProviderForTestGetShowAllButtonForTableNavigation()
                 'tbl_structure.php',
                 'SELECT * FROM `user`',
                 "\n"
-                . '<td><form action="sql.php" method="post"><input type="hidden" '
-                . 'name="db" value="mysql" /><input type="hidden" name="table" '
-                . 'value="user" /><input type="hidden" name="lang" value="en" />'
-                . '<input type="hidden" name="token" value="token" /><input type="'
-                . 'hidden" name="sql_query" value="SELECT * FROM `user`" /><input '
-                . 'type="hidden" name="pos" value="0" /><input type="hidden" name='
-                . '"session_max_rows" value="all" /><input type="hidden" name='
-                . '"goto" value="tbl_structure.php" /><input type="submit" name='
-                . '"navig" value="Show all" /></form></td>'
+                . '<td><form action="sql.php" method="post">'
+                . '<input type="hidden" name="db" value="mysql" />'
+                . '<input type="hidden" name="table" value="user" />'
+                . '<input type="hidden" name="lang" value="en" />'
+                . '<input type="hidden" name="token" value="token" />'
+                . '<input type="hidden" name="sql_query" value="SELECT * FROM `user`" />'
+                . '<input type="hidden" name="pos" value="0" />'
+                . '<input type="hidden" name="session_max_rows" value="all" />'
+                . '<input type="hidden" name="goto" value="tbl_structure.php" />'
+                . '<input type="checkbox" name="navig" class="showAllRows" value="all" />'
+                . '<label for="navig">Show all</label></form></td>'
             )
         );
     }
@@ -1635,9 +1637,9 @@ public function dataProviderForTestGetShowAllButtonForTableNavigation()
      *
      * @return void
      *
-     * @dataProvider dataProviderForTestGetShowAllButtonForTableNavigation
+     * @dataProvider dataProviderForTestGetShowAllCheckboxForTableNavigation
      */
-    public function testGetShowAllButtonForTableNavigation(
+    public function testGetShowAllCheckboxForTableNavigation(
         $db, $table, $goto, $html_sql_query, $output
     ) {
         $this->object->__set('db', $db);
@@ -1647,8 +1649,8 @@ public function testGetShowAllButtonForTableNavigation(
         $this->assertEquals(
             $output,
             $this->_callPrivateFunction(
-                '_getShowAllButtonForTableNavigation',
-                array($html_sql_query)
+                '_getShowAllCheckboxForTableNavigation',
+                array(false, $html_sql_query)
             )
         );
     }