aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-05-28 22:12:13 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-05-28 22:12:13 -0500
commit03ee41948d53457f8147fce87acee1dcbf8abb8f (patch)
tree678938e8f7c2ec3029a5973ee7eefcde4bd5fd70 /actionpack
parentfc63e8074a4ae47a422a05567c905b6fd8c0b2aa (diff)
parentb1bc553385524373cab759a64e0bb650afda6d98 (diff)
downloadrails-03ee41948d53457f8147fce87acee1dcbf8abb8f.tar.gz
rails-03ee41948d53457f8147fce87acee1dcbf8abb8f.tar.bz2
rails-03ee41948d53457f8147fce87acee1dcbf8abb8f.zip
Merge pull request #15399 from tgxworld/remove_todo_router_test
Remove TODO.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/journey/router_test.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 1a2106a3c5..f298808be8 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -4,18 +4,10 @@ require 'abstract_unit'
module ActionDispatch
module Journey
class TestRouter < ActiveSupport::TestCase
- # TODO : clean up routing tests so we don't need this hack
- class StubDispatcher < Routing::RouteSet::Dispatcher
- def initialize
- super({})
- end
- def dispatcher?; true; end
- end
-
attr_reader :routes
def setup
- @app = StubDispatcher.new
+ @app = Routing::RouteSet::Dispatcher.new({})
@routes = Routes.new
@router = Router.new(@routes)
@formatter = Formatter.new(@routes)
@@ -566,8 +558,6 @@ module ActionDispatch
end
end
- RailsEnv = Struct.new(:env)
-
def rails_env env, klass = ActionDispatch::Request
klass.new env
end