From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Mar 2021 21:14:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3152'
X-Git-Tag: live~1701
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cd99ff26fd3ba039c418e9d23dfcf4bf57a4f970?hp=580b7bfc0c6c70d87a59661c583fdf55c3d13dda

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

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index b98523805..d6bd6c3ee 100644
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -5,6 +5,7 @@ Sanitize::Config::OSM = Sanitize::Config.merge(
   :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
index 5b590bc3e..fc9355717 100644
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -58,6 +58,12 @@ class RichTextTest < ActiveSupport::TestCase
       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 @@ class RichTextTest < ActiveSupport::TestCase
     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