Merge remote-tracking branch 'upstream/pull/3152'

openstreetmap · Mar 24, 2021 · cd99ff2 · cd99ff2
2 parents 580b7bf + bb2afc3
commit cd99ff2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
@@ -5,6 +5,7 @@
   :remove_contents => %w[script style],
   :transformers => lambda do |env|
     env[:node].remove_class
+    env[:node].kwattr_remove("style", nil)
     env[:node].add_class("table table-sm w-auto") if env[:node_name] == "table"
   end
 )
diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
@@ -58,6 +58,12 @@ def test_html_to_html
       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
@@ -163,11 +169,16 @@ def test_markdown_to_html
     end
 
     r = RichText.new("markdown", "Click Me\n{:.btn.btn-warning}")
-    # raise r.to_html
     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