diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-02 11:39:59 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-02 11:40:11 -0200 |
| commit | 921576b1d946b2aa2713aec6d58c8a557b24607f (patch) | |
| tree | d17d5ed53f3372e9fddb79d910fab4f811f71bb7 | |
| parent | 4b65d4975529a5fe99d19c33e81270c053ee008a (diff) | |
| download | rails-921576b1d946b2aa2713aec6d58c8a557b24607f.tar.gz rails-921576b1d946b2aa2713aec6d58c8a557b24607f.tar.bz2 rails-921576b1d946b2aa2713aec6d58c8a557b24607f.zip | |
Merge pull request #17862 from lucasmazza/lm-hide-action
`_generate_paths_by_default` should always be private.
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index c2cacbd288..f3144dc2d3 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -522,6 +522,8 @@ module ActionDispatch define_method(:_generate_paths_by_default) do supports_path end + + private :_generate_paths_by_default end end diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 57c076eac6..2d69ceed3a 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -21,6 +21,7 @@ PROCESS_COUNT = (ENV['N'] || 4).to_i require 'active_support/testing/autorun' require 'abstract_controller' +require 'abstract_controller/railties/routes_helpers' require 'action_controller' require 'action_view' require 'action_view/testing/resolvers' @@ -260,7 +261,7 @@ end module ActionController class Base # This stub emulates the Railtie including the URL helpers from a Rails application - include SharedTestRoutes.url_helpers + extend AbstractController::Railties::RoutesHelpers.with(SharedTestRoutes) include SharedTestRoutes.mounted_helpers self.view_paths = FIXTURE_LOAD_PATH |