diff options
Diffstat (limited to 'railties/test')
5 files changed, 10 insertions, 4 deletions
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index b2533e5315..41e1e1dce2 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -20,7 +20,7 @@ class HelperGeneratorTest < GeneratorsTestCase def test_logs_if_the_test_framework_cannot_be_found content = run_generator ["admin", "--test-framework=unknown"] - assert_match /Could not find and invoke 'unknown:generators:helper'/, content + assert_match /Could not find and invoke 'unknown'/, content end def test_check_class_collision diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 3e5dc60361..5d21da3dd1 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -36,7 +36,7 @@ class MailerGeneratorTest < GeneratorsTestCase def test_logs_if_the_template_engine_cannot_be_found content = run_generator ["notifier", "foo", "bar", "--template-engine=unknown"] - assert_match /Could not find and invoke 'unknown:generators:mailer'/, content + assert_match /Could not find and invoke 'unknown'/, content end def test_actions_are_turned_into_methods diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index 425c4f581a..904f77242d 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -22,6 +22,12 @@ class ModelGeneratorTest < GeneratorsTestCase assert_no_file "test/fixtures/accounts.yml" end + def test_fixtures_are_skipped_if_fixture_replacement_is_given + content = run_generator ["account", "-r", "fixjour"] + assert_match /Could not find and invoke 'fixjour'/, content + assert_no_file "test/fixtures/accounts.yml" + end + def test_check_class_collision content = capture(:stderr){ run_generator ["object"] } assert_match /The name 'Object' is either already used in your application or reserved/, content diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb index e2b027028a..3707b70c7e 100644 --- a/railties/test/generators/observer_generator_test.rb +++ b/railties/test/generators/observer_generator_test.rb @@ -23,7 +23,7 @@ class ObserverGeneratorTest < GeneratorsTestCase def test_logs_if_the_test_framework_cannot_be_found content = run_generator ["account", "--test-framework=unknown"] - assert_match /Could not find and invoke 'unknown:generators:observer'/, content + assert_match /Could not find and invoke 'unknown'/, content end protected diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 3f2b27c518..9e7b597739 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -27,7 +27,7 @@ class PluginGeneratorTest < GeneratorsTestCase def test_logs_if_the_test_framework_cannot_be_found content = run_generator ["plugin_fu", "--test-framework=unknown"] - assert_match /Could not find and invoke 'unknown:generators:plugin'/, content + assert_match /Could not find and invoke 'unknown'/, content end def test_creates_tasks_if_required |