diff options
| author | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
|---|---|---|
| committer | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
| commit | e041a50f2917f82950f9e5666f966d8992afd45d (patch) | |
| tree | 9f4d2e3aa88f28dba9d7a1d24d46977e0642a1eb /railties/lib/rails/generators/test_unit/integration/integration_generator.rb | |
| parent | 3e6b2f5d38e0f31db3fb0fcd3bbab92666a0e3e2 (diff) | |
| parent | ae27acb342c575ce19d5ad78cb13ba23f826fab1 (diff) | |
| download | rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.gz rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.bz2 rails-e041a50f2917f82950f9e5666f966d8992afd45d.zip | |
Merge branch 'master' of https://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/callbacks.rb
Diffstat (limited to 'railties/lib/rails/generators/test_unit/integration/integration_generator.rb')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/integration/integration_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb index 427d128275..e004835bd5 100644 --- a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb +++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb @@ -3,7 +3,7 @@ require 'rails/generators/test_unit' module TestUnit # :nodoc: module Generators # :nodoc: class IntegrationGenerator < Base # :nodoc: - check_class_collision :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") |