Move csrf_verify() call out of CI_Input

3 files changed, 6 insertions, 5 deletions

diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php
index 5b7830dd8..edbe9da4a 100644
--- a/tests/codeigniter/libraries/Form_validation_test.php
+++ b/tests/codeigniter/libraries/Form_validation_test.php
@@ -13,8 +13,8 @@ class Form_validation_test extends CI_TestCase {
 		// Same applies for lang
 		$lang = $this->getMockBuilder('CI_Lang')->setMethods(array('load'))->getMock();
 
-		$security = new Mock_Core_Security();
-		$input = new Mock_Core_Input($security);
+		$security = new Mock_Core_Security('UTF-8');
+		$input = new CI_Input($security);
 
 		$this->ci_instance_var('lang', $lang);
 		$this->ci_instance_var('load', $loader);
diff --git a/tests/codeigniter/libraries/Session_test.php b/tests/codeigniter/libraries/Session_test.php
index 76a4fcc98..840df076a 100644
--- a/tests/codeigniter/libraries/Session_test.php
+++ b/tests/codeigniter/libraries/Session_test.php
@@ -37,7 +37,8 @@ return;
 		$ci = $this->ci_instance();
 		$ldr = $this->ci_core_class('load');
 		$ci->load = new $ldr();
-		$ci->input = new Mock_Core_Input(NULL, NULL);
+		$security = new Mock_Core_Security('UTF-8');
+		$ci->input = new CI_Input($security);
 
 		// Make sure string helper is available
 		$this->ci_vfs_clone('system/helpers/string_helper.php');
@@ -437,4 +438,4 @@ return;
 		$this->assertNull($this->session->native->userdata($key));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/codeigniter/libraries/Upload_test.php b/tests/codeigniter/libraries/Upload_test.php
index 8bac597b3..74a7d2c22 100644
--- a/tests/codeigniter/libraries/Upload_test.php
+++ b/tests/codeigniter/libraries/Upload_test.php
@@ -6,7 +6,7 @@ class Upload_test extends CI_TestCase {
 	{
 		$ci = $this->ci_instance();
 		$ci->upload = new CI_Upload();
-		$ci->security = new Mock_Core_Security();
+		$ci->security = new Mock_Core_Security('UTF-8');
 		$ci->lang = $this->getMockBuilder('CI_Lang')->setMethods(array('load', 'line'))->getMock();
 		$ci->lang->expects($this->any())->method('line')->will($this->returnValue(FALSE));
 		$this->upload = $ci->upload;