Merge pull request #9 from choonkeat/master

Fix #winston/rails_utils/7 do not render flash[:timedout]
winston · Nov 5, 2014 · 239a13f · 239a13f
2 parents 44951ef + dd05551
commit 239a13f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/rails_utils.rb b/lib/rails_utils.rb
@@ -36,6 +36,7 @@ def javascript_initialization
     def flash_messages(options = {})
       flash.collect do |key, message|
         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]}")
       end.join("\n").html_safe

diff --git a/test/rails_utils_test.rb b/test/rails_utils_test.rb
@@ -206,5 +206,10 @@ def set_flash(key, message)
       end
     end
 
+    it "should skip flash[:timedout]" do
+      set_flash :timedout, "not important"
+      view.flash_messages.must_equal ""
+    end
+
   end
 end