Merge pull request #2228 from Empact/helper_tags_in_mailers

Simple fix to the NoMethodError noted in #2177.

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.

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