From 53b17e9ad08ada8709f6610d33d1bf624e5ef2d0 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 28 Feb 2011 11:52:00 -0200
Subject: javascript_include_tag shouldn't raise if you register an expansion
 key with nil value

---
 .../helpers/asset_tag_helpers/javascript_tag_helpers.rb      |  2 +-
 .../helpers/asset_tag_helpers/stylesheet_tag_helpers.rb      |  2 +-
 actionpack/test/template/asset_tag_helper_test.rb            | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index b9126af944..82bbfcc7d2 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -69,7 +69,7 @@ module ActionView
           def register_javascript_expansion(expansions)
             js_expansions = JavascriptIncludeTag.expansions
             expansions.each do |key, values|
-              js_expansions[key] = (js_expansions[key] || []) | Array(values) if values
+              js_expansions[key] = (js_expansions[key] || []) | Array(values)
             end
           end
         end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index f3e041de95..a48c87b49a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -46,7 +46,7 @@ module ActionView
           def register_stylesheet_expansion(expansions)
             style_expansions = StylesheetIncludeTag.expansions
             expansions.each do |key, values|
-              style_expansions[key] = (style_expansions[key] || []) | Array(values) if values
+              style_expansions[key] = (style_expansions[key] || []) | Array(values)
             end
           end
         end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index f3f628f31b..1bf748af14 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -302,9 +302,13 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal  %(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>), javascript_include_tag(:can_merge)
   end
 
+  def test_custom_javascript_expansions_with_undefined_symbol
+    assert_raise(ArgumentError) { javascript_include_tag('first', :unknown, 'last') }
+  end
+
   def test_custom_javascript_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => nil
-    assert_raise(ArgumentError) { javascript_include_tag('first', :monkey, 'last') }
+    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
   end
 
   def test_custom_javascript_expansions_with_empty_array_value
@@ -384,9 +388,13 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal  %(<link href="/stylesheets/london.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('london', :cities)
   end
 
+  def test_custom_stylesheet_expansions_with_unknown_symbol
+    assert_raise(ArgumentError) { stylesheet_link_tag('first', :unknown, 'last') }
+  end
+
   def test_custom_stylesheet_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => nil
-    assert_raise(ArgumentError) { stylesheet_link_tag('first', :monkey, 'last') }
+    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" type="text/css" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
   end
 
   def test_custom_stylesheet_expansions_with_empty_array_value
-- 
cgit v1.2.3