diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 09:56:33 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 09:56:33 -0700 |
commit | a6e94547e84ae692a084a95f2c3ba02d513edf3e (patch) | |
tree | 2507f9a52310a089481169d3a31797ee9ea7bbfe /actionpack/test | |
parent | 2fdddcee6fbc9f588285d8e5670303ffb533f170 (diff) | |
download | rails-a6e94547e84ae692a084a95f2c3ba02d513edf3e.tar.gz rails-a6e94547e84ae692a084a95f2c3ba02d513edf3e.tar.bz2 rails-a6e94547e84ae692a084a95f2c3ba02d513edf3e.zip |
use the request object since we have it
stop hardcoding hash keys and use the accessors provided on the request
object.
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 8 | ||||
-rw-r--r-- | actionpack/test/journey/router_test.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 051431ce26..ccc3839212 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -3368,15 +3368,13 @@ end class TestAltApp < ActionDispatch::IntegrationTest class AltRequest - attr_accessor :path_parameters + attr_accessor :path_parameters, :path_info, :script_name def initialize(env) @path_parameters = {} @env = env - end - - def path_info - "/" + @path_info = "/" + @script_name = "" end def request_method diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb index 9a8d644f7b..98cd6b0d34 100644 --- a/actionpack/test/journey/router_test.rb +++ b/actionpack/test/journey/router_test.rb @@ -12,7 +12,9 @@ module ActionDispatch def setup @app = StubDispatcher.new @routes = Routes.new - @router = Router.new(@routes, {}) + @router = Router.new(@routes, { + :request_class => ActionDispatch::Request + }) @formatter = Formatter.new(@routes) end |