From 9a865ee25ea01c68015b46e69ca0589f0024a0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 29 Mar 2010 18:36:28 +0200 Subject: Revert "Reorganized app/test directory. [#3057 state:resolved]" This reverts commit a0dc6755db71b33aebccdb95fd0dd7097c934c04. --- .../app/templates/test/controllers/.empty_directory | 0 .../app/templates/test/functional/.empty_directory | 0 .../app/templates/test/helpers/.empty_directory | 0 .../app/templates/test/integration/.empty_directory | 0 .../rails/app/templates/test/models/.empty_directory | 0 .../rails/app/templates/test/unit/.empty_directory | 0 .../test_unit/controller/controller_generator.rb | 2 +- .../generators/test_unit/helper/helper_generator.rb | 2 +- .../test_unit/integration/integration_generator.rb | 2 +- .../generators/test_unit/mailer/mailer_generator.rb | 2 +- .../test_unit/mailer/templates/controller_test.rb | 20 -------------------- .../test_unit/mailer/templates/functional_test.rb | 20 ++++++++++++++++++++ .../generators/test_unit/model/model_generator.rb | 2 +- .../test_unit/observer/observer_generator.rb | 2 +- .../test_unit/scaffold/scaffold_generator.rb | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory create mode 100644 railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory create mode 100644 railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory create mode 100644 railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory delete mode 100644 railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb create mode 100644 railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb (limited to 'railties/lib/rails/generators') diff --git a/railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory new file mode 100644 index 0000000000..e69de29bb2 diff --git a/railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory new file mode 100644 index 0000000000..e69de29bb2 diff --git a/railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory new file mode 100644 index 0000000000..e69de29bb2 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/controller_test.rb deleted file mode 100644 index 80ac7f0feb..0000000000 --- a/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'test_helper' - -class <%= class_name %>Test < ActionMailer::TestCase -<% for action in actions -%> - test "<%= action %>" do - mail = <%= class_name %>.<%= action %> - assert_equal <%= action.to_s.humanize.inspect %>, mail.subject - assert_equal ["to@example.org"], mail.to - assert_equal ["from@example.com"], mail.from - assert_match "Hi", mail.body.encoded - end - -<% end -%> -<% if actions.blank? -%> - # replace this with your real tests - test "the truth" do - assert true - end -<% end -%> -end diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb new file mode 100644 index 0000000000..80ac7f0feb --- /dev/null +++ b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb @@ -0,0 +1,20 @@ +require 'test_helper' + +class <%= class_name %>Test < ActionMailer::TestCase +<% for action in actions -%> + test "<%= action %>" do + mail = <%= class_name %>.<%= action %> + assert_equal <%= action.to_s.humanize.inspect %>, mail.subject + assert_equal ["to@example.org"], mail.to + assert_equal ["from@example.com"], mail.from + assert_match "Hi", mail.body.encoded + end + +<% end -%> +<% if actions.blank? -%> + # replace this with your real tests + test "the truth" do + assert true + end +<% end -%> +end 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 -- cgit v1.2.3