Changeset 930 in tests for trunk/tests/shortcode.php

Timestamp:

07/20/2012 12:57:44 PM (14 years ago)

Author:

nacin

Message:

Add shortcode tests for shortcodes with hyphens. props aaroncampbell, kovshenin, see #WP17657.

File:

• trunk/tests/shortcode.php (modified) (4 diffs)

trunk/tests/shortcode.php

@@ -5 +5 @@
 class Tests_Shortcode extends WP_UnitTestCase {
 
-        protected $shortcodes = array( 'footag', 'bartag', 'baztag', 'dumptag' );
+        protected $shortcodes = array( 'test-shortcode-tag', 'footag', 'bartag', 'baztag', 'dumptag', 'hyphen', 'hyphen-foo', 'hyphen-foo-bar' );
 
         function setUp() {
                 parent::setUp();
-                add_shortcode('test-shortcode-tag', array(&$this, '_shortcode_tag'));
 
                 foreach ( $this->shortcodes as $shortcode )
-                        add_shortcode( $shortcode, array( $this, '_shortcode_' . $shortcode ) );
+                        add_shortcode( $shortcode, array( $this, '_shortcode_' . str_replace( '-', '_', $shortcode ) ) );
 
                 $this->atts = null;
@@ -25 +24 @@
                 foreach ( $this->shortcodes as $shortcode )
                         unset( $shortcode_tags[ $shortcode ] );
-                unset( $shortcode_tags['test-shortcode-tag'] );
+        }
+
+        function _shortcode_test_shortcode_tag( $atts, $content = null, $tagname = null ) {
+                $this->atts = $atts;
+                $this->content = $content;
+                $this->tagname = $tagname;
         }
 
@@ -55 +59 @@
         }
 
-        function _shortcode_tag($atts, $content=NULL, $tagname=NULL) {
-                $this->atts = $atts;
-                $this->content = $content;
-                $this->tagname = $tagname;
+        function _shortcode_hyphen() {
+                return __FUNCTION__;
+        }
+
+        function _shortcode_hyphen_foo() {
+                return __FUNCTION__;
+        }
+
+        function _shortcode_hyphen_foo_bar() {
+                return __FUNCTION__;
         }
 
@@ -76 +86 @@
                 $out = do_shortcode('[not-a-shortcode-tag]');
                 $this->assertEquals( '[not-a-shortcode-tag]', $out );
+        }
+
+        /**
+         * @ticket 17657
+         */
+        function test_tag_hyphen_not_tag() {
+                $out = do_shortcode( '[dumptag-notreal]' );
+                $this->assertEquals( '[dumptag-notreal]', $out );
+        }
+
+        function test_tag_underscore_not_tag() {
+                $out = do_shortcode( '[dumptag_notreal]' );
+                $this->assertEquals( '[dumptag_notreal]', $out );
+        }
+
+        function test_tag_not_tag() {
+                $out = do_shortcode( '[dumptagnotreal]' );
+                $this->assertEquals( '[dumptagnotreal]', $out );
+        }
+
+        /**
+         * @ticket 17657
+         */
+        function test_tag_hyphen() {
+                $this->assertEquals( '_shortcode_hyphen', do_shortcode( '[hyphen]' ) );
+                $this->assertEquals( '_shortcode_hyphen_foo', do_shortcode( '[hyphen-foo]' ) );
+                $this->assertEquals( '_shortcode_hyphen_foo_bar', do_shortcode( '[hyphen-foo-bar]' ) );
+                $this->assertEquals( '[hyphen-baz]', do_shortcode( '[hyphen-baz]' ) );
+                $this->assertEquals( '[hyphen-foo-bar-baz]', do_shortcode( '[hyphen-foo-bar-baz]' ) );
         }