From 09c288f0c5b5f9da4473bb321cccb766d9f59d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 8 Jul 2009 12:55:50 +0200
Subject: Add the new generators environment and update commands.

---
 railties/test/generators/helper_generator_test.rb   | 4 ++--
 railties/test/generators/mailer_generator_test.rb   | 4 ++--
 railties/test/generators/model_generator_test.rb    | 2 +-
 railties/test/generators/observer_generator_test.rb | 4 ++--
 railties/test/generators/plugin_generator_test.rb   | 4 ++--
 railties/test/initializer_test.rb                   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index 3b240a96c5..02148ee1ce 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -18,8 +18,8 @@ class HelperGeneratorTest < GeneratorsTestCase
   end
 
   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'/, content
+    content = run_generator ["admin", "--test-framework=rspec"]
+    assert_match /rspec \[not found\]/, 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 8532667d15..d3bb1cd13f 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -33,8 +33,8 @@ class MailerGeneratorTest < GeneratorsTestCase
   end
 
   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'/, content
+    content = run_generator ["notifier", "foo", "bar", "--template-engine=haml"]
+    assert_match /haml \[not found\]/, 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 30fc837834..62e1c5ab9e 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -108,7 +108,7 @@ class ModelGeneratorTest < GeneratorsTestCase
 
   def test_fixture_is_skipped_if_fixture_replacement_is_given
     content = run_generator ["account", "-r", "factory_girl"]
-    assert_match /Could not find and invoke 'factory_girl'/, content
+    assert_match /factory_girl \[not found\]/, content
     assert_no_file "test/fixtures/accounts.yml"
   end
 
diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb
index d97486d957..65e18eb942 100644
--- a/railties/test/generators/observer_generator_test.rb
+++ b/railties/test/generators/observer_generator_test.rb
@@ -20,8 +20,8 @@ class ObserverGeneratorTest < GeneratorsTestCase
   end
 
   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'/, content
+    content = run_generator ["account", "--test-framework=rspec"]
+    assert_match /rspec \[not found\]/, content
   end
 
   protected
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 2b41f85a2d..bfec671d31 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -26,8 +26,8 @@ class PluginGeneratorTest < GeneratorsTestCase
   end
 
   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'/, content
+    content = run_generator ["plugin_fu", "--test-framework=rspec"]
+    assert_match /rspec \[not found\]/, content
   end
 
   def test_creates_tasks_if_required
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 0a423b4da2..240bf31ab0 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -352,7 +352,7 @@ class InitializerGeneratorsTests < Test::Unit::TestCase
   def test_generators_are_not_invoked_with_other_environments
     @configuration.generators.test_framework = :rspec
     @initializer.run(:initialize_generators)
-    assert_equal "test_unit", Rails::Generators.options[:test_framework]
+    assert_equal :test_unit, Rails::Generators.options[:test_framework]
   end
 
   protected
-- 
cgit v1.2.3