Merge branch 'master' of https://github.com/rails/rails

1 files changed, 39 insertions, 0 deletions

diff --git a/railties/test/generators/generator_generator_test.rb b/railties/test/generators/generator_generator_test.rb
index 26f975a191..f4c975fc18 100644
--- a/railties/test/generators/generator_generator_test.rb
+++ b/railties/test/generators/generator_generator_test.rb
@@ -17,4 +17,43 @@ class GeneratorGeneratorTest < Rails::Generators::TestCase
     assert_file "lib/generators/awesome/awesome_generator.rb",
                 /class AwesomeGenerator < Rails::Generators::NamedBase/
   end
+
+  def test_namespaced_generator_skeleton
+    run_generator ["rails/awesome"]
+
+    %w(
+      lib/generators/rails/awesome
+      lib/generators/rails/awesome/USAGE
+      lib/generators/rails/awesome/templates
+    ).each{ |path| assert_file path }
+
+    assert_file "lib/generators/rails/awesome/awesome_generator.rb",
+                /class Rails::AwesomeGenerator < Rails::Generators::NamedBase/
+  end
+
+  def test_generator_skeleton_is_created_without_file_name_namespace
+    run_generator ["awesome", "--namespace", "false"]
+
+    %w(
+      lib/generators/
+      lib/generators/USAGE
+      lib/generators/templates
+    ).each{ |path| assert_file path }
+
+    assert_file "lib/generators/awesome_generator.rb",
+                /class AwesomeGenerator < Rails::Generators::NamedBase/
+  end
+
+  def test_namespaced_generator_skeleton_without_file_name_namespace
+    run_generator ["rails/awesome", "--namespace", "false"]
+
+    %w(
+      lib/generators/rails
+      lib/generators/rails/USAGE
+      lib/generators/rails/templates
+    ).each{ |path| assert_file path }
+
+    assert_file "lib/generators/rails/awesome_generator.rb",
+                /class Rails::AwesomeGenerator < Rails::Generators::NamedBase/
+  end
 end