Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units

1 files changed, 6 insertions, 11 deletions

diff --git a/tests/codeigniter/libraries/Session_test.php b/tests/codeigniter/libraries/Session_test.php
index 135f71806..60d3a5b30 100644
--- a/tests/codeigniter/libraries/Session_test.php
+++ b/tests/codeigniter/libraries/Session_test.php
@@ -30,15 +30,11 @@ class Session_test extends CI_TestCase {
 
 		// Establish necessary support classes
 		$obj = new stdClass;
-		$classes = array(
-			'config' => 'cfg',
-			'load' => 'load',
-			'input' => 'in'
-		);
-		foreach ($classes as $name => $abbr) {
-			$class = $this->ci_core_class($abbr);
-			$obj->$name = new $class;
-		}
+		$cfg = $this->ci_core_class('cfg');
+		$obj->config = new $cfg();
+		$ldr = $this->ci_core_class('load');
+		$obj->load = new $ldr();
+		$obj->input = new Mock_Core_Input(NULL, NULL);
 		$this->ci_instance($obj);
 
 		// Attach session instance locally
@@ -401,5 +397,4 @@ class Session_test extends CI_TestCase {
 		$this->session->native->sess_destroy();
 		$this->assertNull($this->session->native->userdata($key));
 	}
-}
-
+}
\ No newline at end of file