diff options
| author | Dmitry Vorotilin <d.vorotilin@gmail.com> | 2012-09-01 15:58:24 +0400 |
|---|---|---|
| committer | Dmitry Vorotilin <d.vorotilin@gmail.com> | 2012-09-01 16:22:40 +0400 |
| commit | 3a6e8e464c0d8b77d11fbfcf3d650423b060394c (patch) | |
| tree | d255d82fa056cb77168b771641383655f0b086b8 /actionpack/lib/action_controller | |
| parent | 5f99bdbec2d3ffab416795ac48e350863e0e17d7 (diff) | |
| download | rails-3a6e8e464c0d8b77d11fbfcf3d650423b060394c.tar.gz rails-3a6e8e464c0d8b77d11fbfcf3d650423b060394c.tar.bz2 rails-3a6e8e464c0d8b77d11fbfcf3d650423b060394c.zip | |
Sprockets-rails tests fail
Method invalid_asset_host! was delegated to controller but sprockets
compile assets in their own scope without controller. And if we set asset_host
with second parameter it should raise error through invalid_asset_host!.
But since controller is nil it cannot be reached.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/asset_paths.rb | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0d79e046a1..f829f5e8a2 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -183,8 +183,8 @@ module ActionController MODULES = [ AbstractController::Layouts, AbstractController::Translation, + AbstractController::AssetPaths, - AssetPaths, Helpers, HideActions, UrlFor, diff --git a/actionpack/lib/action_controller/metal/asset_paths.rb b/actionpack/lib/action_controller/metal/asset_paths.rb deleted file mode 100644 index 3c1c95c042..0000000000 --- a/actionpack/lib/action_controller/metal/asset_paths.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'action_controller/metal/exceptions' - -module ActionController - module AssetPaths - extend ActiveSupport::Concern - - include AbstractController::AssetPaths - - def invalid_asset_host!(help_message) - raise ActionController::RoutingError, "This asset host cannot be computed without a request in scope. #{help_message}" - end - end -end |