Merge remote-tracking branch 'KevBurnsJr/fixing_delimiters' into feature/delimiter-cleanup

Conflicts:
	Mustache.php
	test/MustacheTest.php
This commit is contained in:
Justin Hileman
2011-06-13 04:03:38 -04:00
2 changed files with 8 additions and 2 deletions
+1 -1
View File
@@ -408,7 +408,7 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
public function testStickyDelimiters() {
$m = new Mustache(null, array('result' => 'FAIL'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}{{ result }}[[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]]'));
$this->assertEquals('{{#result}}{{/result}}', $m->render('{{=[[ ]]=}}{{#result}}{{/result}}[[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]][[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{#result}}{{=[[ ]]=}}{{ result }}[[/result]][[^result]][[={{ }}=]][[ result ]]{{/result}}'));
}