diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-03-11 14:38:13 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-03-11 14:42:47 -0700 |
| commit | 12cce89c89b48b15dcf2fcdb41feaaa5b7c06991 (patch) | |
| tree | 76215233a352817fa4c44aa1e85f2b9ea302ba22 /actionview/lib/action_view/view_paths.rb | |
| parent | f500e27df5ea9205c63daa624c4e9027cb1f1fde (diff) | |
| download | rails-12cce89c89b48b15dcf2fcdb41feaaa5b7c06991.tar.gz rails-12cce89c89b48b15dcf2fcdb41feaaa5b7c06991.tar.bz2 rails-12cce89c89b48b15dcf2fcdb41feaaa5b7c06991.zip | |
Break up a circular require between AP/AV
Right now referencing the constant `AbstractController::Rendering`
causes `ActionView::Base` to be loaded, and thus the load hooks for
action_view are run. If that load hook references any part of action
view that then references action controller (such as
`ActionView::TestCase`), the constant `AbstractController::Rendering`
will attempt to be autoloaded and blow up.
With this change, `ActionView::LoadPaths` no longer requires
`ActionView::Base` (which it had no reason to require). There was a
needed class from `AbstractController::Base` in the Rendering module,
which I've moved into its own file so we don't need to load
all of `AbstractController::Base` there.
This commit fixes
https://github.com/rails/rails-controller-testing/issues/21
Diffstat (limited to 'actionview/lib/action_view/view_paths.rb')
| -rw-r--r-- | actionview/lib/action_view/view_paths.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionview/lib/action_view/view_paths.rb b/actionview/lib/action_view/view_paths.rb index b46fe06b01..717d6866c5 100644 --- a/actionview/lib/action_view/view_paths.rb +++ b/actionview/lib/action_view/view_paths.rb @@ -1,5 +1,3 @@ -require 'action_view/base' - module ActionView module ViewPaths extend ActiveSupport::Concern |