From d1c404ee90ea7470d662517aa7a2d312a61c8c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 3 Jul 2009 12:10:09 +0200 Subject: Added lookup to generators. --- railties/test/generators/controller_generator_test.rb | 9 +++------ railties/test/generators/generators_test_helper.rb | 1 + railties/test/generators/helper_generator_test.rb | 1 - railties/test/generators/mailer_generator_test.rb | 2 -- railties/test/generators/migration_generator_test.rb | 1 - railties/test/generators/model_generator_test.rb | 2 -- railties/test/generators/observer_generator_test.rb | 2 -- railties/test/generators/plugin_generator_test.rb | 5 ++--- railties/test/generators/resource_generator_test.rb | 12 ------------ .../test/generators/scaffold_controller_generator_test.rb | 5 ----- railties/test/generators/scaffold_generator_test.rb | 14 -------------- .../test/generators/session_migration_generator_test.rb | 1 - 12 files changed, 6 insertions(+), 49 deletions(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb index e3fe2594b9..29169f225b 100644 --- a/railties/test/generators/controller_generator_test.rb +++ b/railties/test/generators/controller_generator_test.rb @@ -1,12 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/erb/controller/controller_generator' require 'generators/rails/controller/controller_generator' -require 'generators/rails/helper/helper_generator' -require 'generators/test_unit/controller/controller_generator' -require 'generators/test_unit/helper/helper_generator' - -ObjectController = Class.new class ControllerGeneratorTest < GeneratorsTestCase @@ -21,8 +15,11 @@ class ControllerGeneratorTest < GeneratorsTestCase end def test_check_class_collision + Object.send :const_set, :ObjectController, Class.new content = capture(:stderr){ run_generator ["object"] } assert_match /The name 'ObjectController' is either already used in your application or reserved/, content + ensure + Object.send :remove_const, :ObjectController end # No need to spec content since it's already spec'ed on helper generator. diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index 578753e070..782118aeb0 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -1,5 +1,6 @@ require 'test/unit' require 'fileutils' +require 'mocha' $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib" require 'generators' diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 41e1e1dce2..3b240a96c5 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' require 'generators/rails/helper/helper_generator' -require 'generators/test_unit/helper/helper_generator' ObjectHelper = Class.new AnotherObjectHelperTest = Class.new diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 5d21da3dd1..8532667d15 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -1,8 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/erb/mailer/mailer_generator' require 'generators/rails/mailer/mailer_generator' -require 'generators/test_unit/mailer/mailer_generator' class MailerGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb index 547ca6a9e3..e756d0a9fa 100644 --- a/railties/test/generators/migration_generator_test.rb +++ b/railties/test/generators/migration_generator_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/active_record/migration/migration_generator' require 'generators/rails/migration/migration_generator' class MigrationGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index c0768bba7b..d076244abd 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -1,8 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/active_record/model/model_generator' require 'generators/rails/model/model_generator' -require 'generators/test_unit/model/model_generator' class ModelGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb index 3707b70c7e..d97486d957 100644 --- a/railties/test/generators/observer_generator_test.rb +++ b/railties/test/generators/observer_generator_test.rb @@ -1,8 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/active_record/observer/observer_generator' require 'generators/rails/observer/observer_generator' -require 'generators/test_unit/observer/observer_generator' class ObserverGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index f9adf6ea14..b9f09d5163 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' require 'generators/rails/plugin/plugin_generator' -require 'generators/test_unit/plugin/plugin_generator' class PluginGeneratorTest < GeneratorsTestCase @@ -32,12 +31,12 @@ class PluginGeneratorTest < GeneratorsTestCase end def test_creates_tasks_if_required - run_generator ["plugin_fu", "--with-tasks"] + run_generator ["plugin_fu", "--tasks"] assert_file "vendor/plugins/plugin_fu/tasks/plugin_fu_tasks.rake" end def test_creates_generator_if_required - run_generator ["plugin_fu", "--with-generator"] + run_generator ["plugin_fu", "--generator"] assert_file "vendor/plugins/plugin_fu/generators/plugin_fu/templates" flag = /class PluginFuGenerator < Rails::Generators::NamedBase/ diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb index a4cbb1894e..7b03ca31ec 100644 --- a/railties/test/generators/resource_generator_test.rb +++ b/railties/test/generators/resource_generator_test.rb @@ -2,18 +2,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' require 'generators/rails/resource/resource_generator' -# Model -require 'generators/active_record/model/model_generator' -require 'generators/rails/model/model_generator' -require 'generators/test_unit/model/model_generator' - -# Controller -require 'generators/erb/controller/controller_generator' -require 'generators/rails/controller/controller_generator' -require 'generators/rails/helper/helper_generator' -require 'generators/test_unit/controller/controller_generator' -require 'generators/test_unit/helper/helper_generator' - class ResourceGeneratorTest < GeneratorsTestCase def setup diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb index 60c1145310..46b37d0cde 100644 --- a/railties/test/generators/scaffold_controller_generator_test.rb +++ b/railties/test/generators/scaffold_controller_generator_test.rb @@ -1,11 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/active_record' -require 'generators/erb/scaffold/scaffold_generator' -require 'generators/rails/helper/helper_generator' require 'generators/rails/scaffold_controller/scaffold_controller_generator' -require 'generators/test_unit/scaffold/scaffold_generator' -require 'generators/test_unit/helper/helper_generator' class ScaffoldControllerGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb index dfa11fd84b..2e5d4b609e 100644 --- a/railties/test/generators/scaffold_generator_test.rb +++ b/railties/test/generators/scaffold_generator_test.rb @@ -1,20 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/active_record' require 'generators/rails/scaffold/scaffold_generator' -require 'generators/rails/stylesheets/stylesheets_generator' - -# Model -require 'generators/active_record/model/model_generator' -require 'generators/rails/model/model_generator' -require 'generators/test_unit/model/model_generator' - -# Controller -require 'generators/erb/scaffold/scaffold_generator' -require 'generators/rails/scaffold_controller/scaffold_controller_generator' -require 'generators/rails/helper/helper_generator' -require 'generators/test_unit/scaffold/scaffold_generator' -require 'generators/test_unit/helper/helper_generator' class ScaffoldGeneratorTest < GeneratorsTestCase diff --git a/railties/test/generators/session_migration_generator_test.rb b/railties/test/generators/session_migration_generator_test.rb index 05b51b1566..7eefbe51e6 100644 --- a/railties/test/generators/session_migration_generator_test.rb +++ b/railties/test/generators/session_migration_generator_test.rb @@ -1,6 +1,5 @@ require 'abstract_unit' require 'generators/generators_test_helper' -require 'generators/active_record/session_migration/session_migration_generator' require 'generators/rails/session_migration/session_migration_generator' class SessionMigrationGeneratorTest < GeneratorsTestCase -- cgit v1.2.3