diff options
| author | Jean Boussier <jean.boussier@gmail.com> | 2014-11-28 14:58:10 -0500 |
|---|---|---|
| committer | Jean Boussier <jean.boussier@gmail.com> | 2014-11-29 09:24:43 -0500 |
| commit | f413cbee8dd702e2cae550c04b16e6c98411aeab (patch) | |
| tree | f89d841643f81e4829e5af20b50e080d583be882 /actionpack | |
| parent | ee614af6fa6c9e8cac70bcfd7d3583d0b4ff907b (diff) | |
| download | rails-f413cbee8dd702e2cae550c04b16e6c98411aeab.tar.gz rails-f413cbee8dd702e2cae550c04b16e6c98411aeab.tar.bz2 rails-f413cbee8dd702e2cae550c04b16e6c98411aeab.zip | |
Pure rack apps can be mounted with a name
See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 8 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing/inspector_test.rb | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index a8be77f46d..5040aa82b2 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -580,13 +580,7 @@ module ActionDispatch raise "A rack application must be specified" unless path rails_app = rails_app? app - - if rails_app - options[:as] ||= app.railtie_name - else - # non rails apps can't have an :as - options[:as] = nil - end + options[:as] ||= app.railtie_name if rails_app target_as = name_for_action(options[:as], path) options[:via] ||= :all diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb index ff33dd5652..5910f364cc 100644 --- a/actionpack/test/dispatch/routing/inspector_test.rb +++ b/actionpack/test/dispatch/routing/inspector_test.rb @@ -235,7 +235,7 @@ module ActionDispatch assert_equal [ "Prefix Verb URI Pattern Controller#Action", - " /foo #{RackApp.name} {:constraint=>( my custom constraint )}" + " foo /foo #{RackApp.name} {:constraint=>( my custom constraint )}" ], output end |