Permalink
Browse files

MINOR Fixed tests to use commas as delimiter for shortcodes, also tes…

…t spaces still work as well
  • Loading branch information...
1 parent 49267db commit 0df958f81d1ad94a1a778c8967fba9a857784ccc @halkyon halkyon committed Mar 9, 2012
Showing with 12 additions and 7 deletions.
  1. +12 −7 tests/parsers/ShortcodeParserTest.php
@@ -20,12 +20,12 @@ public function setUp() {
public function testNotRegisteredShortcode() {
$this->assertEquals('[not_shortcode]', $this->parser->parse('[not_shortcode]'));
$this->assertEquals('[not_shortcode /]', $this->parser->parse('[not_shortcode /]'));
- $this->assertEquals('[not_shortcode foo="bar"]', $this->parser->parse('[not_shortcode foo="bar"]'));
+ $this->assertEquals('[not_shortcode,foo="bar"]', $this->parser->parse('[not_shortcode,foo="bar"]'));
$this->assertEquals('[not_shortcode]a[/not_shortcode]', $this->parser->parse('[not_shortcode]a[/not_shortcode]'));
}
public function testSimpleTag() {
- $tests = array('[test_shortcode]', '[test_shortcode ]', '[test_shortcode/]', '[test_shortcode /]');
+ $tests = array('[test_shortcode]', '[test_shortcode ]', '[test_shortcode,]', '[test_shortcode/]', '[test_shortcode /]');
foreach($tests as $test) {
$this->parser->parse($test);
@@ -38,9 +38,9 @@ public function testSimpleTag() {
public function testOneArgument() {
$tests = array (
- '[test_shortcode foo="bar"]',
- "[test_shortcode foo='bar']",
- '[test_shortcode foo = "bar" /]'
+ '[test_shortcode,foo="bar"]',
+ "[test_shortcode,foo='bar']",
+ '[test_shortcode,foo = "bar" /]'
);
foreach($tests as $test) {
@@ -53,7 +53,7 @@ public function testOneArgument() {
}
public function testMultipleArguments() {
- $this->parser->parse('[test_shortcode foo = "bar" bar=\'foo\' baz="buz"]');
+ $this->parser->parse('[test_shortcode,foo = "bar",bar=\'foo\',baz="buz"]');
$this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', 'baz' => 'buz'), $this->arguments);
$this->assertEquals('', $this->contents);
@@ -69,7 +69,7 @@ public function testEnclosing() {
}
public function testEnclosingWithArguments() {
- $this->parser->parse('[test_shortcode foo = "bar" bar=\'foo\' baz="buz"]foo[/test_shortcode]');
+ $this->parser->parse('[test_shortcode,foo = "bar",bar=\'foo\',baz="buz"]foo[/test_shortcode]');
$this->assertEquals(array('foo' => 'bar', 'bar' => 'foo', 'baz' => 'buz'), $this->arguments);
$this->assertEquals('foo', $this->contents);
@@ -86,6 +86,11 @@ public function testUnquotedArguments() {
$this->assertEquals(array('foo' => 'bar', 'baz' => 'buz'), $this->arguments);
}
+ public function testSpacesForDelimiter() {
+ $this->assertEquals('', $this->parser->parse('[test_shortcode foo=bar baz = buz]'));
+ $this->assertEquals(array('foo' => 'bar', 'baz' => 'buz'), $this->arguments);
+ }
+
public function testSelfClosingTag() {
$this->assertEquals (
'morecontent',

0 comments on commit 0df958f

Please sign in to comment.