ref #602 added tests for shortcodes

timber · Jul 29, 2015 · e215afe · e215afe
1 parent 07a71c0
commit e215afe
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 37 deletions.
diff --git a/lib/timber-post.php b/lib/timber-post.php
@@ -229,7 +229,6 @@ function get_preview($len = 50, $force = false, $readmore = 'Read More', $strip
 		}
 		if (!strlen($text)) {
 			$text = TimberHelper::trim_words($this->get_content(), $len, false);
-			$text = do_shortcode($text);
 			$trimmed = true;
 		}
 		if (!strlen(trim($text))) {

diff --git a/tests/test-timber-post-preview.php b/tests/test-timber-post-preview.php
@@ -0,0 +1,60 @@
+<?php
+
+	class TestTimberPostPreview extends WP_UnitTestCase {
+
+		function testDoubleEllipsis(){
+			$post_id = $this->factory->post->create();
+			$post = new TimberPost($post_id);
+			$post->post_excerpt = 'this is super dooper trooper long words';
+			$prev = $post->get_preview(3, true);
+			$this->assertEquals(1, substr_count($prev, '&hellip;'));
+		}
+
+		function testGetPreview() {
+			global $wp_rewrite;
+			$struc = false;
+			$wp_rewrite->permalink_structure = $struc;
+			update_option('permalink_structure', $struc);
+			$post_id = $this->factory->post->create(array('post_content' => 'this is super dooper trooper long words'));
+			$post = new TimberPost($post_id);
+
+			// no excerpt
+			$post->post_excerpt = '';
+			$preview = $post->get_preview(3);
+			$this->assertRegExp('/this is super &hellip;  <a href="http:\/\/example.org\/\?p=\d+" class="read-more">Read More<\/a>/', $preview);
+
+			// excerpt set, force is false, no read more
+			$post->post_excerpt = 'this is excerpt longer than three words';
+			$preview = $post->get_preview(3, false, '');
+			$this->assertEquals($preview, $post->post_excerpt);
+
+			// custom read more set
+			$post->post_excerpt = '';
+			$preview = $post->get_preview(3, false, 'Custom more');
+			$this->assertRegExp('/this is super &hellip;  <a href="http:\/\/example.org\/\?p=\d+" class="read-more">Custom more<\/a>/', $preview);
+
+			// content with <!--more--> tag, force false
+			$post->post_content = 'this is super dooper<!--more--> trooper long words';
+			$preview = $post->get_preview(2, false, '');
+			$this->assertEquals('this is super dooper', $preview);
+		}
+
+		function testShortcodesInPreviewFromContent() {
+			add_shortcode('mythang', function($text) {
+				return 'mythangy';
+			});
+			$pid = $this->factory->post->create( array('post_content' => 'jared [mythang]', 'post_excerpt' => '') );
+			$post = new TimberPost( $pid );
+			$this->assertEquals('jared mythangy &hellip;  <a href="'.$post->link().'" class="read-more">Read More</a>', $post->get_preview());
+		}
+
+		function testShortcodesInPreviewFromContentWithMoreTag() {
+			add_shortcode('duck', function($text) {
+				return 'Quack!';
+			});
+			$pid = $this->factory->post->create( array('post_content' => 'jared [duck] <!--more--> joojoo', 'post_excerpt' => '') );
+			$post = new TimberPost( $pid );
+			$this->assertEquals('jared Quack! <a href="'.$post->link().'" class="read-more">Read More</a>', $post->get_preview());
+		}
+
+	}
diff --git a/tests/test-timber-post.php b/tests/test-timber-post.php
@@ -236,14 +236,6 @@ function testUpdate(){
 			$this->assertEquals($rand, $post->test_meta);
 		}
 
-		function testDoubleEllipsis(){
-			$post_id = $this->factory->post->create();
-			$post = new TimberPost($post_id);
-			$post->post_excerpt = 'this is super dooper trooper long words';
-			$prev = $post->get_preview(3, true);
-			$this->assertEquals(1, substr_count($prev, '&hellip;'));
-		}
-
 		function testCanEdit(){
 			wp_set_current_user(1);
 			$post_id = $this->factory->post->create(array('post_author' => 1));
@@ -252,34 +244,7 @@ function testCanEdit(){
 			wp_set_current_user(0);
 		}
 
-		function testGetPreview() {
-			global $wp_rewrite;
-			$struc = false;
-			$wp_rewrite->permalink_structure = $struc;
-			update_option('permalink_structure', $struc);
-			$post_id = $this->factory->post->create(array('post_content' => 'this is super dooper trooper long words'));
-			$post = new TimberPost($post_id);
-
-			// no excerpt
-			$post->post_excerpt = '';
-			$preview = $post->get_preview(3);
-			$this->assertRegExp('/this is super &hellip;  <a href="http:\/\/example.org\/\?p=\d+" class="read-more">Read More<\/a>/', $preview);
-
-			// excerpt set, force is false, no read more
-			$post->post_excerpt = 'this is excerpt longer than three words';
-			$preview = $post->get_preview(3, false, '');
-			$this->assertEquals($preview, $post->post_excerpt);
-
-			// custom read more set
-			$post->post_excerpt = '';
-			$preview = $post->get_preview(3, false, 'Custom more');
-			$this->assertRegExp('/this is super &hellip;  <a href="http:\/\/example.org\/\?p=\d+" class="read-more">Custom more<\/a>/', $preview);
-
-			// content with <!--more--> tag, force false
-			$post->post_content = 'this is super dooper<!--more--> trooper long words';
-			$preview = $post->get_preview(2, false, '');
-			$this->assertEquals('this is super dooper', $preview);
-		}
+
 
 		function testTitle(){
 			$title = 'Fifteen Million Merits';