Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

2016-01-19 09:00:15 +01:00 · 2016-01-19 09:00:15 +01:00 · 62f3c7e3cf
commit 62f3c7e3cf
parent 0ef9cfc300 7db4672aeb
1 changed files with 4 additions and 2 deletions
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@ -69,9 +69,11 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
    {

        $_REQUEST['db_collation'] = 'db1';
+        $html = PMA_getHtmlForRenameDatabase("pma");
+        $this->assertContains('db_operations.php', $html);
        $this->assertRegExp(
-            '/.*db_operations.php(.|[\n])*db_rename([\n]|.)*Rename database to.*/m',
-            PMA_getHtmlForRenameDatabase("pma")
+            '/.*db_rename.*Rename database to.*/',
+            $html
        );
    }