From e0843136405e26a13405567d65fe7e5cc40dfcff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 26 Jun 2009 09:53:53 +0200 Subject: Added HelperGenerator. --- railties/test/generators/helper_generator_test.rb | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 railties/test/generators/helper_generator_test.rb (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb new file mode 100644 index 0000000000..506889e4a7 --- /dev/null +++ b/railties/test/generators/helper_generator_test.rb @@ -0,0 +1,36 @@ +require 'abstract_unit' +require 'generators/generators_test_helper' +require 'generators/rails/helper/helper_generator' +require 'generators/test_unit/helper/helper_generator' + +ObjectHelper = Class.new + +class HelperGeneratorTest < GeneratorsTestCase + + def test_helper_skeleton_is_created + run_generator + assert_file "app/helpers/admin_helper.rb", /module AdminHelper/ + end + + def test_invokes_default_test_framework + run_generator + assert_file "test/unit/helpers/admin_helper_test.rb" + end + + def test_logs_if_the_test_framework_cannot_be_found + content = run_generator ["admin", "--test-framework=unknown"] + assert_match /Could not find and invoke 'unknown:generators:helper'/, content + end + + def test_check_class_collision + content = capture(:stderr){ run_generator ["object"] } + assert_match /The name 'ObjectHelper' is either already used in your application or reserved/, content + end + + protected + + def run_generator(args=["admin"]) + silence(:stdout) { Rails::Generators::HelperGenerator.start args, :root => destination_root } + end + +end -- cgit v1.2.3 From 6bd101188e3396317d93d2d0692587d577ad9662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 26 Jun 2009 10:03:05 +0200 Subject: Class collision checks. --- railties/test/generators/helper_generator_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 506889e4a7..56e66a7c41 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -14,7 +14,7 @@ class HelperGeneratorTest < GeneratorsTestCase def test_invokes_default_test_framework run_generator - assert_file "test/unit/helpers/admin_helper_test.rb" + assert_file "test/unit/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/ end def test_logs_if_the_test_framework_cannot_be_found -- cgit v1.2.3 From 2f3681dfc24e51698b9b900a5d03950da4508d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 26 Jun 2009 10:40:02 +0200 Subject: Clean up class collisions check and a class method helper. --- railties/test/generators/helper_generator_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 56e66a7c41..9b2f277f54 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -4,6 +4,7 @@ require 'generators/rails/helper/helper_generator' require 'generators/test_unit/helper/helper_generator' ObjectHelper = Class.new +AnotherObjectHelperTest = Class.new class HelperGeneratorTest < GeneratorsTestCase @@ -27,6 +28,11 @@ class HelperGeneratorTest < GeneratorsTestCase assert_match /The name 'ObjectHelper' is either already used in your application or reserved/, content end + def test_check_class_collision_on_tests + content = capture(:stderr){ run_generator ["another_object"] } + assert_match /The name 'AnotherObjectHelperTest' is either already used in your application or reserved/, content + end + protected def run_generator(args=["admin"]) -- cgit v1.2.3 From 8c5622f0d4d3b5c6bce52b0eb22756a83060b1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 27 Jun 2009 13:03:07 +0200 Subject: Initial scratch of model generators. --- railties/test/generators/helper_generator_test.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 9b2f277f54..b2533e5315 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -33,6 +33,25 @@ class HelperGeneratorTest < GeneratorsTestCase assert_match /The name 'AnotherObjectHelperTest' is either already used in your application or reserved/, content end + def test_namespaced_and_not_namespaced_helpers + run_generator ["products"] + + # We have to require the generated helper to show the problem because + # the test helpers just check for generated files and contents but + # do not actually load them. But they have to be loaded (as in a real environment) + # to make the second generator run fail + require "#{destination_root}/app/helpers/products_helper" + + assert_nothing_raised do + begin + run_generator ["admin::products"] + ensure + # cleanup + Object.send(:remove_const, :ProductsHelper) + end + end + end + protected def run_generator(args=["admin"]) -- cgit v1.2.3 From acaeaf308a071d9892f8d555be0697c45558ef4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 27 Jun 2009 14:03:35 +0200 Subject: Add a fixture replacement hook to TestUnit model generator. --- railties/test/generators/helper_generator_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index b2533e5315..41e1e1dce2 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -20,7 +20,7 @@ class HelperGeneratorTest < GeneratorsTestCase def test_logs_if_the_test_framework_cannot_be_found content = run_generator ["admin", "--test-framework=unknown"] - assert_match /Could not find and invoke 'unknown:generators:helper'/, content + assert_match /Could not find and invoke 'unknown'/, content end def test_check_class_collision -- cgit v1.2.3 From d1c404ee90ea7470d662517aa7a2d312a61c8c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 3 Jul 2009 12:10:09 +0200 Subject: Added lookup to generators. --- railties/test/generators/helper_generator_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 41e1e1dce2..3b240a96c5 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' require 'generators/generators_test_helper' require 'generators/rails/helper/helper_generator' -require 'generators/test_unit/helper/helper_generator' ObjectHelper = Class.new AnotherObjectHelperTest = Class.new -- cgit v1.2.3 From 09c288f0c5b5f9da4473bb321cccb766d9f59d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 8 Jul 2009 12:55:50 +0200 Subject: Add the new generators environment and update commands. --- railties/test/generators/helper_generator_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 3b240a96c5..02148ee1ce 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -18,8 +18,8 @@ class HelperGeneratorTest < GeneratorsTestCase end def test_logs_if_the_test_framework_cannot_be_found - content = run_generator ["admin", "--test-framework=unknown"] - assert_match /Could not find and invoke 'unknown'/, content + content = run_generator ["admin", "--test-framework=rspec"] + assert_match /rspec \[not found\]/, content end def test_check_class_collision -- cgit v1.2.3 From a06c825b464758a0c22f8b089a596e46f1bba5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 14 Jul 2009 22:20:43 +0200 Subject: Updated vendored Thor to 0.11.1 and update Rails::Generators. --- railties/test/generators/helper_generator_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/generators/helper_generator_test.rb') diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb index 02148ee1ce..3d655016f1 100644 --- a/railties/test/generators/helper_generator_test.rb +++ b/railties/test/generators/helper_generator_test.rb @@ -54,7 +54,7 @@ class HelperGeneratorTest < GeneratorsTestCase protected def run_generator(args=["admin"]) - silence(:stdout) { Rails::Generators::HelperGenerator.start args, :root => destination_root } + silence(:stdout) { Rails::Generators::HelperGenerator.start args, :destination_root => destination_root } end end -- cgit v1.2.3