Merge branch 'refs/heads/develop' into feature/form_error_msgs

Conflicts:
	system/language/english/form_validation_lang.php
	user_guide_src/source/libraries/form_validation.rst

Signed-off-by: Eric Roberts <eric@cryode.com>

1 files changed, 28 insertions, 35 deletions

diff --git a/tests/codeigniter/libraries/Parser_test.php b/tests/codeigniter/libraries/Parser_test.php
index c3d88fa85..394c22692 100644
--- a/tests/codeigniter/libraries/Parser_test.php
+++ b/tests/codeigniter/libraries/Parser_test.php
@@ -1,73 +1,70 @@
 <?php
 
 class Parser_test extends CI_TestCase {
-	
+
 	public function set_up()
 	{
-		$obj = new StdClass;
-		$obj->parser = new Mock_Libraries_Parser();
-		
-		$this->ci_instance($obj);
-		
-		$this->parser = $obj->parser;
+		$this->parser = new Mock_Libraries_Parser();
+		$this->ci_instance_var('parser', $this->parser);
 	}
+
 	// --------------------------------------------------------------------
-	
+
 	public function test_set_delimiters()
 	{
 		// Make sure default delimiters are there
 		$this->assertEquals('{', $this->parser->l_delim);
 		$this->assertEquals('}', $this->parser->r_delim);
-		
+
 		// Change them to square brackets
 		$this->parser->set_delimiters('[', ']');
-		
+
 		// Make sure they changed
 		$this->assertEquals('[', $this->parser->l_delim);
 		$this->assertEquals(']', $this->parser->r_delim);
-		
+
 		// Reset them
 		$this->parser->set_delimiters();
-		
+
 		// Make sure default delimiters are there
 		$this->assertEquals('{', $this->parser->l_delim);
 		$this->assertEquals('}', $this->parser->r_delim);
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	public function test_parse_simple_string()
 	{
 		$data = array(
 			'title' => 'Page Title',
 			'body' => 'Lorem ipsum dolor sit amet.'
 		);
-		
+
 		$template = "{title}\n{body}";
-		
+
 		$result = implode("\n", $data);
-		
+
 		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	public function test_parse()
 	{
 		$this->_parse_no_template();
 		$this->_parse_var_pair();
 		$this->_mismatched_var_pair();
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	private function _parse_no_template()
 	{
 		$this->assertFalse($this->parser->parse_string('', '', TRUE));
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	private function _parse_var_pair()
 	{
 		$data = array(
@@ -78,16 +75,14 @@ class Parser_test extends CI_TestCase {
 						'flying'		=> 'no'),
 			)
 		);
-		
+
 		$template = "{title}\n{powers}{invisibility}\n{flying}{/powers}";
-		
-		$result = "Super Heroes\nyes\nno";
-		
-		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));	
+
+		$this->assertEquals("Super Heroes\nyes\nno", $this->parser->parse_string($template, $data, TRUE));
 	}
-	
+
 	// --------------------------------------------------------------------
-	
+
 	private function _mismatched_var_pair()
 	{
 		$data = array(
@@ -98,13 +93,11 @@ class Parser_test extends CI_TestCase {
 						'flying'		=> 'no'),
 			)
 		);
-		
+
 		$template = "{title}\n{powers}{invisibility}\n{flying}";
-		
 		$result = "Super Heroes\n{powers}{invisibility}\n{flying}";
-		
-		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));			
+
+		$this->assertEquals($result, $this->parser->parse_string($template, $data, TRUE));
 	}
 
-	// --------------------------------------------------------------------
 }
\ No newline at end of file