diff options
| author | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-05-13 11:17:45 +0400 |
|---|---|---|
| committer | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-05-13 11:17:45 +0400 |
| commit | f04a4f8989ff3204eda8a18f00735acfae1385cb (patch) | |
| tree | d8fba6a19d5719fe24e24ae130955c22c3ee9f85 /test | |
| parent | dd237eb9243dee3d2fcca7a65e338ab9938137c7 (diff) | |
| parent | 791c08bef3f08b1f0c13681799c72dd89948b6eb (diff) | |
Resolve conflicts due to changes in some method names
Diffstat (limited to 'test')
| -rw-r--r-- | test/libraries/common/PMA_getDivForSliderEffect_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/libraries/common/PMA_getDivForSliderEffect_test.php b/test/libraries/common/PMA_getDivForSliderEffect_test.php index ce272d530e..79cb68c6cd 100644 --- a/test/libraries/common/PMA_getDivForSliderEffect_test.php +++ b/test/libraries/common/PMA_getDivForSliderEffect_test.php @@ -22,7 +22,7 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase $id = "test_id"; $message = "test_message"; - $this->expectOutputString('<div id="' . $id . '" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' '); + $this->expectOutputString('<div id="' . $id . '" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">'); PMA_getDivForSliderEffect($id, $message); } @@ -34,7 +34,7 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase $id = "test_id"; $message = "test_message"; - $this->expectOutputString('<div id="' . $id . '" style="display: none; overflow:auto;" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">' . "\n" . ' '); + $this->expectOutputString('<div id="' . $id . '" style="display: none; overflow:auto;" class="pma_auto_slider" title="' . htmlspecialchars($message) . '">'); PMA_getDivForSliderEffect($id, $message); } |