diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-29 18:36:28 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-29 18:36:28 +0200 |
commit | 9a865ee25ea01c68015b46e69ca0589f0024a0d5 (patch) | |
tree | 3d8ea245cb7e344fe309a7a2226c7018821a48e7 /railties/lib/rails/generators/test_unit | |
parent | 94ced0854370490d3da91fd77b247c1b0922ac99 (diff) | |
download | rails-9a865ee25ea01c68015b46e69ca0589f0024a0d5.tar.gz rails-9a865ee25ea01c68015b46e69ca0589f0024a0d5.tar.bz2 rails-9a865ee25ea01c68015b46e69ca0589f0024a0d5.zip |
Revert "Reorganized app/test directory. [#3057 state:resolved]"
This reverts commit a0dc6755db71b33aebccdb95fd0dd7097c934c04.
Diffstat (limited to 'railties/lib/rails/generators/test_unit')
-rw-r--r-- | railties/lib/rails/generators/test_unit/controller/controller_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/helper/helper_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/integration/integration_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb (renamed from railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/model/model_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/observer/observer_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb index db99e55e9e..20f3bd8965 100644 --- a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb +++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb @@ -8,7 +8,7 @@ module TestUnit def create_test_files template 'functional_test.rb', - File.join('test/controllers', class_path, "#{file_name}_controller_test.rb") + File.join('test/functional', class_path, "#{file_name}_controller_test.rb") end end end diff --git a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb index d4c287540c..4ea80bf7be 100644 --- a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb +++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb @@ -6,7 +6,7 @@ module TestUnit check_class_collision :suffix => "HelperTest" def create_helper_files - template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb") + template 'helper_test.rb', File.join('test/unit/helpers', class_path, "#{file_name}_helper_test.rb") end end end 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 af45998bc1..32d0fac029 100644 --- a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb +++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb @@ -6,7 +6,7 @@ module TestUnit check_class_collision :suffix => "Test" def create_test_files - template 'integration_test.rb', File.join('test/controllers', class_path, "#{file_name}_test.rb") + template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb") end end end diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb index 894d24049c..1a49286d41 100644 --- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb @@ -7,7 +7,7 @@ module TestUnit check_class_collision :suffix => "Test" def create_test_files - template "controller_test.rb", File.join('test/controllers', class_path, "#{file_name}_test.rb") + template "functional_test.rb", File.join('test/functional', class_path, "#{file_name}_test.rb") end end end diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb index 80ac7f0feb..80ac7f0feb 100644 --- a/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb +++ b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb diff --git a/railties/lib/rails/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb index 17c431ae81..609b815683 100644 --- a/railties/lib/rails/generators/test_unit/model/model_generator.rb +++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb @@ -9,7 +9,7 @@ module TestUnit check_class_collision :suffix => "Test" def create_test_file - template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb") + template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb") end hook_for :fixture_replacement diff --git a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb index 5db111ec68..6cc1158c21 100644 --- a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb +++ b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb @@ -6,7 +6,7 @@ module TestUnit check_class_collision :suffix => "ObserverTest" def create_test_files - template 'unit_test.rb', File.join('test/observers', class_path, "#{file_name}_observer_test.rb") + template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_observer_test.rb") end end end diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb index 5d1ac1dde4..c0315c7fe6 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb @@ -11,7 +11,7 @@ module TestUnit def create_test_files template 'functional_test.rb', - File.join('test/controllers', controller_class_path, "#{controller_file_name}_controller_test.rb") + File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb") end end end |