Merge pull request #195 from c0nst4ntin/152-richtextastext-only-inclu…

…de-newline-when-there-are-multiple-blocks fix (#152): remove last new line from rich text blocks
prismicio-community · Nov 22, 2022 · 94709c5 · 94709c5
2 parents 29cd0d7 + ecbffbf
commit 94709c5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/Prismic/Dom/RichText.php b/src/Prismic/Dom/RichText.php
@@ -32,7 +32,7 @@ public static function asText($richText)
             }
         }
 
-        return $result;
+        return trim($result);
     }
 
     /**

diff --git a/tests/Prismic/Dom/RichTextTest.php b/tests/Prismic/Dom/RichTextTest.php
@@ -20,9 +20,29 @@ protected function setUp(): void
 
     public function testAsText()
     {
-        $expected = "The title\n";
-        $actual = RichText::asText($this->richText->title);
-        $this->assertEquals($expected, $actual);
+        $expected = (
+            "Heading 1\n".
+            "Heading 2\n".
+            "Heading 3\n".
+            "Heading 4\n".
+            "Heading 5\n".
+            "Heading 6\n".
+            "Paragraph em and strong\n".
+            "Paragraph Web link and media link\n".
+            "Preformatted block\n".
+            "Help\n".
+            "Revolver\n".
+            "Abbey Road\n".
+            "John\n".
+            "Paul\n".
+            "George\n".
+            "Ringo"
+        );
+
+        $this->assertEquals($expected, RichText::asText($this->richText->description));
+        $this->assertEquals($expected, RichText::asText($this->richText->description, $this->linkResolver));
+
+        $this->assertStringEndsNotWith("\n", RichText::asText($this->richText->description));
     }
 
     public function testAsHtml()
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ public static function asText($richText) @@
                 }
             }
-            return $result;
+            return trim($result);
         }
         /**
@@ Expand Down @@