From 702b659f45067be790d54abd17c01868a6498327 Mon Sep 17 00:00:00 2001 From: Juanito Fatas Date: Tue, 1 Sep 2015 10:08:37 +0800 Subject: [PATCH 1/3] Fix #flash_messages --- lib/rails_utils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rails_utils.rb b/lib/rails_utils.rb index 51a7883..97dbeb0 100644 --- a/lib/rails_utils.rb +++ b/lib/rails_utils.rb @@ -52,7 +52,7 @@ def flash_messages(options = {}) next if message.blank? next if key.to_s == 'timedout' - content_tag(:div, content_tag(:button, options[:button_html] || "x", type: "button", class: options[:button_class] || "close", "data-dismiss" => "alert") + message, class: "#{flash_class(key)} fade in #{options[:class]}") + content_tag(:div, content_tag(:button, options[:button_html] || "x", type: "button", class: options[:button_class] || "close", "data-dismiss" => "alert") + message.html_safe, class: "#{flash_class(key)} fade in #{options[:class]}") end.join("\n").html_safe end From 24e5ead78735cd44643f95393dbfe3cd525dfd10 Mon Sep 17 00:00:00 2001 From: Juanito Fatas Date: Tue, 1 Sep 2015 10:25:22 +0800 Subject: [PATCH 2/3] Add tests for 702b659 --- test/rails_utils_test.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/rails_utils_test.rb b/test/rails_utils_test.rb index 46b0ca7..43fb2a5 100644 --- a/test/rails_utils_test.rb +++ b/test/rails_utils_test.rb @@ -265,5 +265,23 @@ def set_flash(key, message) set_flash :timedout, "not important" view.flash_messages.must_equal "" end + + it "should be `html_safe`ed" do + set_flash :alert, "not important" + + view.flash_messages.html_safe?.must_equal true + end + + it "each message of flash should call html_safe" do + set_flash :alert, Minitest::Mock.new + + messages = view.flash.instance_variable_get(:@flashes).values.each do |message| + message.expect :blank?, false + message.expect :html_safe, "test" + message.expect :html_safe?, true + end + + view.flash_messages.must_equal "
test
" + end end end From f6f2df15ca5f637d58bab89ae3f430cf1a4f6a0d Mon Sep 17 00:00:00 2001 From: Juanito Fatas Date: Tue, 1 Sep 2015 11:51:14 +0800 Subject: [PATCH 3/3] Add #23 to CHANGELOG. [ci skip] --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0d23b1..142b2b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### Unreleased +- [Pull Request 23](https://github.com/winston/rails_utils/pull/23) - Fix #flash_messages not properly apply `html_safe`ed. + ### Version 3.3.3 - [Pull Request 21](https://github.com/winston/rails_utils/pull/21) - Fix page controller class bug for nested-level controllers - by @allenwq.