Class collision checks.

railties/lib/generators/rails/integration_test/integration_test_generator.rb

@@ -2,7 +2,7 @@ module Rails
   module Generators
     class IntegrationTestGenerator < NamedBase
       def check_class_collisions
-        class_collisions class_name, "#{class_name}Test"
+        class_collisions "#{class_name}Test"
       end
 
       def create_test_files

railties/lib/generators/rails/performance_test/performance_test_generator.rb

@@ -2,7 +2,7 @@ module Rails
   module Generators
     class PerformanceTestGenerator < NamedBase
       def check_class_collisions
-        class_collisions class_name, "#{class_name}Test"
+        class_collisions "#{class_name}Test"
       end
 
       def create_test_files

railties/lib/generators/test_unit/helper/helper_generator.rb

@@ -2,7 +2,7 @@ module TestUnit
   module Generators
     class HelperGenerator < Base
       def check_class_collisions
-        class_collisions "#{class_name}Helper"
+        class_collisions "#{class_name}HelperTest"
       end
 
       def create_helper_files

railties/lib/generators/test_unit/mailer/mailer_generator.rb

@@ -4,7 +4,7 @@ class MailerGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "method method"
 
       def check_class_collisions
-        class_collisions class_name, "#{class_name}Test"
+        class_collisions "#{class_name}Test"
       end
 
       def create_test_files

railties/test/generators/helper_generator_test.rb

@@ -14,7 +14,7 @@ def test_helper_skeleton_is_created
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/unit/helpers/admin_helper_test.rb"
+    assert_file "test/unit/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
   end
 
   def test_logs_if_the_test_framework_cannot_be_found