From f29ce1f35670866cb86faedeabb28a33215a143f Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 13 Jul 2005 02:12:00 +0000
Subject: r3023@asus: jeremy | 2005-07-12 23:43:39 -0700 Remove superfluous
inherited override in Dependencies. r3024@asus: jeremy | 2005-07-12
23:54:28 -0700 Make test the default railties rake target. r3025@asus:
jeremy | 2005-07-12 23:55:27 -0700 Encapsulate dispatch call in dispatcher
test. r3026@asus: jeremy | 2005-07-12 23:56:14 -0700 Expand dispatcher
mock to match full method signature for process. r3027@asus: jeremy |
2005-07-12 23:57:24 -0700 Look for app-specific generators in
RAILS_ROOT/generators instead of RAILS_ROOT/script/generators. r3028@asus:
jeremy | 2005-07-13 00:00:47 -0700 Update changelog.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
railties/test/dispatcher_test.rb | 7 +++++--
railties/test/generators/working/working_generator.rb | 2 ++
railties/test/mocks/dispatcher.rb | 2 +-
railties/test/rails_generator_test.rb | 4 ++--
railties/test/script/generators/working/working_generator.rb | 2 --
5 files changed, 10 insertions(+), 7 deletions(-)
create mode 100644 railties/test/generators/working/working_generator.rb
delete mode 100644 railties/test/script/generators/working/working_generator.rb
(limited to 'railties/test')
diff --git a/railties/test/dispatcher_test.rb b/railties/test/dispatcher_test.rb
index ba41b93b24..caf36fc9e9 100644
--- a/railties/test/dispatcher_test.rb
+++ b/railties/test/dispatcher_test.rb
@@ -35,7 +35,7 @@ class DispatcherTest < Test::Unit::TestCase
def test_ac_subclasses_cleared_on_reset
Object.class_eval(ACTION_CONTROLLER_DEF)
assert_equal 1, ActionController::Base.subclasses.length
- Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output)
+ dispatch
GC.start # force the subclass to be collected
assert_equal 0, ActionController::Base.subclasses.length
@@ -44,13 +44,16 @@ class DispatcherTest < Test::Unit::TestCase
def test_am_subclasses_cleared_on_reset
Object.class_eval(ACTION_MAILER_DEF)
assert_equal 1, ActionMailer::Base.subclasses.length
- Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output)
+ dispatch
GC.start # force the subclass to be collected
assert_equal 0, ActionMailer::Base.subclasses.length
end
private
+ def dispatch
+ Dispatcher.dispatch(CGI.new, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, @output)
+ end
def setup_minimal_environment
value = Dependencies::LoadingModule.root
diff --git a/railties/test/generators/working/working_generator.rb b/railties/test/generators/working/working_generator.rb
new file mode 100644
index 0000000000..465b34319a
--- /dev/null
+++ b/railties/test/generators/working/working_generator.rb
@@ -0,0 +1,2 @@
+class WorkingGenerator < Rails::Generator::NamedBase
+end
diff --git a/railties/test/mocks/dispatcher.rb b/railties/test/mocks/dispatcher.rb
index 6561a13581..3391f398bf 100644
--- a/railties/test/mocks/dispatcher.rb
+++ b/railties/test/mocks/dispatcher.rb
@@ -4,7 +4,7 @@ class Dispatcher
attr_accessor :raise_exception
attr_accessor :dispatch_hook
- def dispatch(cgi)
+ def dispatch(cgi, session_options = nil, output = $stdout)
dispatch_hook.call(cgi) if dispatch_hook
sleep(time_to_sleep || 0)
raise raise_exception, "Something died" if raise_exception
diff --git a/railties/test/rails_generator_test.rb b/railties/test/rails_generator_test.rb
index 5934bb3e7b..3f63509384 100644
--- a/railties/test/rails_generator_test.rb
+++ b/railties/test/rails_generator_test.rb
@@ -44,7 +44,7 @@ class RailsGeneratorTest < Test::Unit::TestCase
end
def test_lookup_missing_generator
- assert_raise(LoadError) {
+ assert_raise(MissingSourceFile) {
Rails::Generator::Base.lookup('missing_generator').klass
}
end
@@ -68,7 +68,7 @@ class RailsGeneratorTest < Test::Unit::TestCase
def test_generator_spec
spec = Rails::Generator::Base.lookup('working')
assert_equal 'working', spec.name
- assert_equal "#{RAILS_ROOT}/script/generators/working", spec.path
+ assert_equal "#{RAILS_ROOT}/generators/working", spec.path
assert_equal :app, spec.source
assert_nothing_raised { assert_match /WorkingGenerator$/, spec.klass.name }
end
diff --git a/railties/test/script/generators/working/working_generator.rb b/railties/test/script/generators/working/working_generator.rb
deleted file mode 100644
index 465b34319a..0000000000
--- a/railties/test/script/generators/working/working_generator.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class WorkingGenerator < Rails::Generator::NamedBase
-end
--
cgit v1.2.3