From 7d3f312b4c9c39e189c22b8ef22057cf8583052b Mon Sep 17 00:00:00 2001 From: KevBurnsJr Date: Sun, 12 Jun 2011 17:20:03 -0700 Subject: [PATCH 1/3] Adding test for delimiter switching in partials --- test/MustacheTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/MustacheTest.php b/test/MustacheTest.php index 21714a7..3bbb0e3 100644 --- a/test/MustacheTest.php +++ b/test/MustacheTest.php @@ -147,6 +147,15 @@ class MustacheTest extends PHPUnit_Framework_TestCase { $this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin'))); $this->assertEquals('Zappa, Frank', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa'))); } + + /** + * @group partials + */ + public function testRenderDelimitersInPartials() { + $m = new Mustache('{{>stache}}', null, array('stache' => '{{=<% %>=}}{{first_name}} {{last_name}}<%={{ }}=%>')); + $this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin'))); + $this->assertEquals('{{first_name}} {{last_name}}', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa'))); + } /** * Mustache should allow newlines (and other whitespace) in comments and all other tags. From c2f1201c5c5fdce2d3d405d46e77635813e9e479 Mon Sep 17 00:00:00 2001 From: KevBurnsJr Date: Sun, 12 Jun 2011 17:27:05 -0700 Subject: [PATCH 2/3] Oops, fixing test. --- test/MustacheTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/MustacheTest.php b/test/MustacheTest.php index 3bbb0e3..a1fdded 100644 --- a/test/MustacheTest.php +++ b/test/MustacheTest.php @@ -153,7 +153,7 @@ class MustacheTest extends PHPUnit_Framework_TestCase { */ public function testRenderDelimitersInPartials() { $m = new Mustache('{{>stache}}', null, array('stache' => '{{=<% %>=}}{{first_name}} {{last_name}}<%={{ }}=%>')); - $this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin'))); + $this->assertEquals('{{first_name}} {{last_name}}', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin'))); $this->assertEquals('{{first_name}} {{last_name}}', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa'))); } From 1acae92de2c9d18cbc68c51e68cad31143734ff2 Mon Sep 17 00:00:00 2001 From: KevBurnsJr Date: Sun, 12 Jun 2011 20:26:38 -0700 Subject: [PATCH 3/3] Creating new Test to prove error --- test/MustacheTest.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/MustacheTest.php b/test/MustacheTest.php index a1fdded..ad81c0c 100644 --- a/test/MustacheTest.php +++ b/test/MustacheTest.php @@ -151,10 +151,13 @@ class MustacheTest extends PHPUnit_Framework_TestCase { /** * @group partials */ - public function testRenderDelimitersInPartials() { - $m = new Mustache('{{>stache}}', null, array('stache' => '{{=<% %>=}}{{first_name}} {{last_name}}<%={{ }}=%>')); - $this->assertEquals('{{first_name}} {{last_name}}', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin'))); - $this->assertEquals('{{first_name}} {{last_name}}', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa'))); + public function testRenderDelimitersInSections() { + $m = new Mustache('{{#a}}{{=<% %>=}}{{b}} c<%={{ }}=%>{{/a}}'); + $this->assertEquals('{{b}} c', $m->render(null, array( + 'a' => array( + array('b' => 'Do Not Render') + ) + ))); } /**