From b567947d38a20960aade96f9179ad6bc21f22646 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:34:31 -0500
Subject: Moving tests/codeigniter/helpers/Array_helper_test.php to be lower
 cased.

Adding html_helper_test.php as well.
---
 tests/codeigniter/helpers/html_helper_test.php | 67 ++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 tests/codeigniter/helpers/html_helper_test.php

(limited to 'tests/codeigniter/helpers/html_helper_test.php')

diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
new file mode 100644
index 000000000..3b7f2b342
--- /dev/null
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -0,0 +1,67 @@
+<?php
+
+require_once(BASEPATH.'helpers/html_helper.php');
+
+class Html_helper_test extends PHPUnit_Framework_TestCase
+{
+	public function testHeading()
+	{
+		$this->assertEquals('<h1>foobar</h1>', heading('foobar'));
+	}
+
+	// ------------------------------------------------------------------------
+	
+	public function testUl()
+	{
+		$expect = <<<EOH
+<ul>
+  <li>foo</li>
+  <li>bar</li>
+</ul>
+
+EOH;
+
+		$expect = ltrim($expect);
+
+		$list = array('foo', 'bar');
+		
+		$this->assertEquals($expect, ul($list));
+
+
+		$expect = <<<EOH
+<ul class="test">
+  <li>foo</li>
+  <li>bar</li>
+</ul>
+
+EOH;
+
+		$expect = ltrim($expect);
+
+		$list = array('foo', 'bar');
+
+		$this->assertEquals($expect, ul($list, ' class="test"'));
+
+		$this->assertEquals($expect, ul($list, array('class' => 'test')));
+	}
+	
+	// ------------------------------------------------------------------------
+
+	public function testNBS()
+	{
+		$this->assertEquals('&nbsp;&nbsp;&nbsp;', nbs(3));
+	}
+
+	// ------------------------------------------------------------------------
+	
+	public function testMeta()
+	{
+		$this->assertEquals("<meta name=\"test\" content=\"foo\" />\n", meta('test', 'foo'));
+		
+		$expect = "<meta name=\"foo\" content=\"\" />\n";
+		
+		$this->assertEquals($expect, meta(array('name' => 'foo')));
+		
+	}
+	
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From b4d93dbab7253f98613ab10e75e0ed20f06eaf19 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Thu, 21 Apr 2011 14:42:33 -0500
Subject: Updating helper test classes to extend CI_TestCase

---
 tests/codeigniter/helpers/html_helper_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/codeigniter/helpers/html_helper_test.php')

diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 3b7f2b342..8c0e53301 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -2,7 +2,7 @@
 
 require_once(BASEPATH.'helpers/html_helper.php');
 
-class Html_helper_test extends PHPUnit_Framework_TestCase
+class Html_helper_test extends CI_TestCase
 {
 	public function testHeading()
 	{
-- 
cgit v1.2.3-24-g4f1b


From 68286a4dcc1ed4d904ad992173c1b3621bf6fced Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Thu, 21 Apr 2011 22:00:33 -0400
Subject: Reworked unit tests to match rest of framework and added a few more.

---
 tests/codeigniter/helpers/html_helper_test.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'tests/codeigniter/helpers/html_helper_test.php')

diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 8c0e53301..706874f9e 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -4,14 +4,25 @@ require_once(BASEPATH.'helpers/html_helper.php');
 
 class Html_helper_test extends CI_TestCase
 {
-	public function testHeading()
+	
+	// ------------------------------------------------------------------------
+	
+	public function test_br()
+	{
+		$this->assertEquals('<br /><br />', br(2));
+	}
+	
+	// ------------------------------------------------------------------------
+	
+	public function test_heading()
 	{
 		$this->assertEquals('<h1>foobar</h1>', heading('foobar'));
+		$this->assertEquals('<h2 class="bar">foobar</h2>', heading('foobar', 2, 'class="bar"'));
 	}
 
 	// ------------------------------------------------------------------------
 	
-	public function testUl()
+	public function test_Ul()
 	{
 		$expect = <<<EOH
 <ul>
@@ -47,14 +58,14 @@ EOH;
 	
 	// ------------------------------------------------------------------------
 
-	public function testNBS()
+	public function test_NBS()
 	{
 		$this->assertEquals('&nbsp;&nbsp;&nbsp;', nbs(3));
 	}
 
 	// ------------------------------------------------------------------------
 	
-	public function testMeta()
+	public function test_meta()
 	{
 		$this->assertEquals("<meta name=\"test\" content=\"foo\" />\n", meta('test', 'foo'));
 		
-- 
cgit v1.2.3-24-g4f1b


From 92ff07ee199d17a4dccd84114da8b66a95a4f56d Mon Sep 17 00:00:00 2001
From: Greg Aker <greg@gregaker.net>
Date: Sat, 20 Aug 2011 16:57:48 -0500
Subject: Updating error in html_helper test_Ul

---
 tests/codeigniter/helpers/html_helper_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/codeigniter/helpers/html_helper_test.php')

diff --git a/tests/codeigniter/helpers/html_helper_test.php b/tests/codeigniter/helpers/html_helper_test.php
index 706874f9e..553fc2bb1 100644
--- a/tests/codeigniter/helpers/html_helper_test.php
+++ b/tests/codeigniter/helpers/html_helper_test.php
@@ -51,7 +51,7 @@ EOH;
 
 		$list = array('foo', 'bar');
 
-		$this->assertEquals($expect, ul($list, ' class="test"'));
+		$this->assertEquals($expect, ul($list, 'class="test"'));
 
 		$this->assertEquals($expect, ul($list, array('class' => 'test')));
 	}
-- 
cgit v1.2.3-24-g4f1b