From 79afd62136d5c28237f3ac64704aeb29a8c145f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 6 Jan 2016 11:58:43 +0100 Subject: [PATCH] Simplify test to avoid need fo multiline regexp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/libraries/PMA_operations_test.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php index f62457c335..7d942ca713 100644 --- a/test/libraries/PMA_operations_test.php +++ b/test/libraries/PMA_operations_test.php @@ -77,9 +77,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 ); }