From 0702e04e0d671227259f71f614adfe3f35f88b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 15 Jul 2009 11:33:36 +0200 Subject: Refactored some generators to make use of improved invocations on thor. --- railties/lib/generators/test_unit/plugin/plugin_generator.rb | 2 +- .../generators/test_unit/plugin/templates/%file_name%_test.rb.tt | 8 ++++++++ .../test_unit/plugin/templates/test/%file_name%_test.rb.tt | 8 -------- .../lib/generators/test_unit/plugin/templates/test/test_helper.rb | 3 --- railties/lib/generators/test_unit/plugin/templates/test_helper.rb | 3 +++ 5 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt delete mode 100644 railties/lib/generators/test_unit/plugin/templates/test/%file_name%_test.rb.tt delete mode 100644 railties/lib/generators/test_unit/plugin/templates/test/test_helper.rb create mode 100644 railties/lib/generators/test_unit/plugin/templates/test_helper.rb (limited to 'railties/lib/generators/test_unit/plugin') diff --git a/railties/lib/generators/test_unit/plugin/plugin_generator.rb b/railties/lib/generators/test_unit/plugin/plugin_generator.rb index fd8c4cb413..05adf58c4f 100644 --- a/railties/lib/generators/test_unit/plugin/plugin_generator.rb +++ b/railties/lib/generators/test_unit/plugin/plugin_generator.rb @@ -6,7 +6,7 @@ module TestUnit check_class_collision :suffix => "Test" def create_test_files - directory 'test', "vendor/plugins/#{file_name}/test" + directory '.', 'test' end end end diff --git a/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt b/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt new file mode 100644 index 0000000000..3e0bc29d3a --- /dev/null +++ b/railties/lib/generators/test_unit/plugin/templates/%file_name%_test.rb.tt @@ -0,0 +1,8 @@ +require 'test_helper' + +class <%= class_name %>Test < ActiveSupport::TestCase + # Replace this with your real tests. + test "the truth" do + assert true + end +end diff --git a/railties/lib/generators/test_unit/plugin/templates/test/%file_name%_test.rb.tt b/railties/lib/generators/test_unit/plugin/templates/test/%file_name%_test.rb.tt deleted file mode 100644 index 3e0bc29d3a..0000000000 --- a/railties/lib/generators/test_unit/plugin/templates/test/%file_name%_test.rb.tt +++ /dev/null @@ -1,8 +0,0 @@ -require 'test_helper' - -class <%= class_name %>Test < ActiveSupport::TestCase - # Replace this with your real tests. - test "the truth" do - assert true - end -end diff --git a/railties/lib/generators/test_unit/plugin/templates/test/test_helper.rb b/railties/lib/generators/test_unit/plugin/templates/test/test_helper.rb deleted file mode 100644 index cf148b8b47..0000000000 --- a/railties/lib/generators/test_unit/plugin/templates/test/test_helper.rb +++ /dev/null @@ -1,3 +0,0 @@ -require 'rubygems' -require 'active_support' -require 'active_support/test_case' \ No newline at end of file diff --git a/railties/lib/generators/test_unit/plugin/templates/test_helper.rb b/railties/lib/generators/test_unit/plugin/templates/test_helper.rb new file mode 100644 index 0000000000..cf148b8b47 --- /dev/null +++ b/railties/lib/generators/test_unit/plugin/templates/test_helper.rb @@ -0,0 +1,3 @@ +require 'rubygems' +require 'active_support' +require 'active_support/test_case' \ No newline at end of file -- cgit v1.2.3