summaryrefslogtreecommitdiffstats
path: root/tests/codeigniter
diff options
context:
space:
mode:
authorAhmad Anbar <aanbar@gmail.com>2015-01-12 11:36:45 +0100
committerAhmad Anbar <aanbar@gmail.com>2015-01-12 11:36:45 +0100
commit6db62ab0ad0e223806a1367e12b1884b48dc65d7 (patch)
treefe3257e417dab12f1f4053308a5a281d0640b721 /tests/codeigniter
parentc8e1de74b139dc7f3e776f7ebf98495ec5b780a6 (diff)
parent5350f056698168061ffde1ba62e8db1715101446 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'tests/codeigniter')
-rw-r--r--tests/codeigniter/core/Output_test.php23
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/codeigniter/core/Output_test.php b/tests/codeigniter/core/Output_test.php
index a06c17045..887c077d7 100644
--- a/tests/codeigniter/core/Output_test.php
+++ b/tests/codeigniter/core/Output_test.php
@@ -3,19 +3,20 @@
class Output_test extends CI_TestCase {
public $output;
- protected $_output_data = <<<HTML
-<html>
- <head>
- <title>Basic HTML</title>
- </head>
- <body>
- Test
- </body>
-</html>
-HTML;
+ protected $_output_data = '';
public function set_up()
{
+ $this->_output_data =<<<HTML
+ <html>
+ <head>
+ <title>Basic HTML</title>
+ </head>
+ <body>
+ Test
+ </body>
+ </html>
+HTML;
$this->ci_set_config('charset', 'UTF-8');
$output = $this->ci_core_class('output');
$this->output = new $output();
@@ -59,4 +60,4 @@ HTML;
);
}
-} \ No newline at end of file
+}