diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-23 20:40:12 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-23 20:40:12 -0700 |
| commit | 9327b4de5880f4e8633d834c0f331cc2fca327f1 (patch) | |
| tree | 82c33309f9c7661dbf8b89adc24c91f62d8339a5 /actionpack | |
| parent | cdc4274931c2d6bafdf2b97f7e4ecedf89a8202e (diff) | |
| parent | 1f898981751906e14a5dd3cd6dae68f97dd60a24 (diff) | |
| download | rails-9327b4de5880f4e8633d834c0f331cc2fca327f1.tar.gz rails-9327b4de5880f4e8633d834c0f331cc2fca327f1.tar.bz2 rails-9327b4de5880f4e8633d834c0f331cc2fca327f1.zip | |
Merge pull request #2228 from Empact/helper_tags_in_mailers
Simple fix to the NoMethodError noted in #2177.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index a95e7c0649..ec3d36d5ad 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -72,6 +72,8 @@ module Sprockets def debug_assets? params[:debug_assets] == '1' || params[:debug_assets] == 'true' + rescue NoMethodError + false end # Override to specify an alternative prefix for asset path generation. diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index f11d1bba15..6ee110f549 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -12,7 +12,6 @@ class SprocketsHelperTest < ActionView::TestCase super @controller = BasicController.new - @controller.stubs(:params).returns({}) @request = Class.new do def protocol() 'http://' end |