Merge branch 'master' into HEAD

[rails.git] / test / lib / rich_text_test.rb

diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index 80cf0ae37e30c3fa293e9aae862c2ea6f63300b1..9d00d658d5bac697b3e4a8bce6e4bfb01fc52469 100644 (file)
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -47,6 +47,23 @@ class RichTextTest < ActiveSupport::TestCase
       assert_select "style", false
       assert_select "p", /^foo *baz$/
     end
       assert_select "style", false
       assert_select "p", /^foo *baz$/
     end

+
+    r = RichText.new("html", "<table><tr><td>column</td></tr></table>")
+    assert_html r do
+      assert_select "table[class='table table-sm w-auto']"
+    end
+
+    r = RichText.new("html", "<p class='btn btn-warning'>Click Me</p>")
+    assert_html r do
+      assert_select "p[class='btn btn-warning']", false
+      assert_select "p", /^Click Me$/
+    end
+
+    r = RichText.new("html", "<p style='color:red'>Danger</p>")
+    assert_html r do
+      assert_select "p[style='color:red']", false
+      assert_select "p", /^Danger$/
+    end

   end
 
   def test_html_to_text
   end
 
   def test_html_to_text


@@ -145,6 +162,23 @@ class RichTextTest < ActiveSupport::TestCase
     assert_html r do
       assert_select "pre", /^\s*foo bar baz\s*$/
     end
     assert_html r do
       assert_select "pre", /^\s*foo bar baz\s*$/
     end

+
+    r = RichText.new("markdown", "|column|column")
+    assert_html r do
+      assert_select "table[class='table table-sm w-auto']"
+    end
+
+    r = RichText.new("markdown", "Click Me\n{:.btn.btn-warning}")
+    assert_html r do
+      assert_select "p[class='btn btn-warning']", false
+      assert_select "p", /^Click Me$/
+    end
+
+    r = RichText.new("markdown", "<p style='color:red'>Danger</p>")
+    assert_html r do
+      assert_select "p[style='color:red']", false
+      assert_select "p", /^Danger$/
+    end

   end
 
   def test_markdown_to_text
   end
 
   def test_markdown_to_text


@@ -190,7 +224,7 @@ class RichTextTest < ActiveSupport::TestCase
 
   def assert_html(richtext, &block)
     html = richtext.to_html
 
   def assert_html(richtext, &block)
     html = richtext.to_html

-    assert html.html_safe?
+    assert_predicate html, :html_safe?

     root = Nokogiri::HTML::DocumentFragment.parse(html)
     assert_select root, "*" do
       yield block
     root = Nokogiri::HTML::DocumentFragment.parse(html)
     assert_select root, "*" do
       yield block