Merge branch 'master' into glitch-soc/merge-upstream

2018-10-29 14:09:54 +01:00
parent a942ad3062 3fd808ab26
commit f16d66c5c8
4 changed files with 20 additions and 18 deletions
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@ -514,7 +514,7 @@ RSpec.describe Formatter do
    subject { Formatter.instance.sanitize(html, Sanitize::Config::MASTODON_STRICT) }

    it 'sanitizes' do
-      is_expected.to eq 'alert("Hello")'
+      is_expected.to eq ''
    end
  end
 end