aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-06-26 10:49:43 +0200
committerJosé Valim <jose.valim@gmail.com>2009-06-26 11:59:14 +0200
commitd40bd851190dd734a09965979c8ade285e51d52c (patch)
treecdc0b3ce15a5984fd1dc7a1bf18c4c42ff2ae2cc /railties
parent2f3681dfc24e51698b9b900a5d03950da4508d2c (diff)
downloadrails-d40bd851190dd734a09965979c8ade285e51d52c.tar.gz
rails-d40bd851190dd734a09965979c8ade285e51d52c.tar.bz2
rails-d40bd851190dd734a09965979c8ade285e51d52c.zip
Small fixes.
Diffstat (limited to 'railties')
-rwxr-xr-xrailties/bin/gen2
-rw-r--r--railties/lib/generators/rails/integration_test/integration_test_generator.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/bin/gen b/railties/bin/gen
index 8dc6ba3cb0..036b1d8275 100755
--- a/railties/bin/gen
+++ b/railties/bin/gen
@@ -23,7 +23,7 @@ if ARGV.size == 0
puts "Please select a generator."
puts "Builtin: #{rails.join(', ')}."
- puts "Others: #{others.join(', ')}."
+ puts "Others: #{others.join(', ')}." unless others.empty?
exit
elsif ARGV.size == 1
diff --git a/railties/lib/generators/rails/integration_test/integration_test_generator.rb b/railties/lib/generators/rails/integration_test/integration_test_generator.rb
index 7071d5ec50..b45ef1597c 100644
--- a/railties/lib/generators/rails/integration_test/integration_test_generator.rb
+++ b/railties/lib/generators/rails/integration_test/integration_test_generator.rb
@@ -1,7 +1,7 @@
module Rails
module Generators
class IntegrationTestGenerator < NamedBase
- check_class_collisions :suffix => "Test"
+ check_class_collision :suffix => "Test"
def create_test_files
template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")