aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-30 20:47:01 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-30 20:52:08 -0300
commite5f2b0d75f29cd7d9e11e8008d410caf48ab1078 (patch)
tree5937f7c450ae15652b8fc0aa80445560bce6ec08 /actionpack
parent60d8e4ac28726d04d029b25cff82181a9b0ab5c3 (diff)
downloadrails-e5f2b0d75f29cd7d9e11e8008d410caf48ab1078.tar.gz
rails-e5f2b0d75f29cd7d9e11e8008d410caf48ab1078.tar.bz2
rails-e5f2b0d75f29cd7d9e11e8008d410caf48ab1078.zip
Revert "Merge pull request #2647 from dmathieu/no_rescue"
This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb8
-rw-r--r--actionpack/test/abstract_unit.rb6
2 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 7a2bf8bef6..062aa4dae5 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -58,8 +58,12 @@ module Sprockets
private
def debug_assets?
- config = Rails.application.config.assets
- config.allow_debugging && (config.debug || params[:debug_assets])
+ begin
+ config = Rails.application.config.assets
+ config.allow_debugging && (config.debug || params[:debug_assets])
+ rescue NoMethodError
+ false
+ end
end
# Override to specify an alternative prefix for asset path generation.
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index aa7a01f6c9..24d071df39 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -142,11 +142,7 @@ class RoutedRackApp
end
class BasicController
- attr_accessor :request, :params
-
- def initialize
- @params = {}
- end
+ attr_accessor :request
def config
@config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|