diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-07-15 15:00:39 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-07-15 15:00:39 +0000 |
| commit | c0771fe7d8f8a4fb9e86fba40d096b6f04f34e7d (patch) | |
| tree | 0b3baa51769224f8d5d6aed270e7e9d87325efa4 /actionpack/test/controller/routing_test.rb | |
| parent | f45d8d81bfdef59ce81295322ec2c3c89ca1ed8f (diff) | |
| download | rails-c0771fe7d8f8a4fb9e86fba40d096b6f04f34e7d.tar.gz rails-c0771fe7d8f8a4fb9e86fba40d096b6f04f34e7d.tar.bz2 rails-c0771fe7d8f8a4fb9e86fba40d096b6f04f34e7d.zip | |
Fix assert_routing with nested controllers. Closes #1582 and #1386.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 23d741a58f..cec1b0313d 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1,4 +1,5 @@ require File.dirname(__FILE__) + '/../abstract_unit' +require File.dirname(__FILE__) + '/fake_controllers' require 'test/unit' require 'stringio' @@ -94,28 +95,6 @@ class CodeGeneratorTests < Test::Unit::TestCase end end -# XXX Extract to test/controller/fake_controllers.rb -module Object::Controllers - def self.const_available?(*args) - const_defined?(*args) - end - - class ContentController - end - module Admin - def self.const_available?(*args) - const_defined?(*args) - end - - class UserController - end - - class NewsFeedController - end - end -end - - class RecognitionTests < Test::Unit::TestCase attr_accessor :generator alias :g :generator |