Pass more options to test/dummy in 'plugin new' generator

4 files changed, 29 insertions, 16 deletions

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 1b3673e96e..0bf5ee86b1 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -8,6 +8,9 @@ require 'uri'
 module Rails
   module Generators
     class AppBase < Base
+      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+      JAVASCRIPTS = %w( prototype jquery )
+
       attr_accessor :rails_template
       add_shebang_option!
 
@@ -26,10 +29,17 @@ module Rails
         class_option :skip_git,           :type => :boolean, :aliases => "-G", :default => false,
                                           :desc => "Skip Git ignores and keeps"
 
-        skip_active_record_desc = "Skip Active Record files"
-        skip_active_record_desc << " for dummy application" if name == "plugin"
         class_option :skip_active_record, :type => :boolean, :aliases => "-O", :default => false,
-                                          :desc => skip_active_record_desc
+                                          :desc => "Skip Active Record files"
+
+        class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
+                                          :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+
+        class_option :javascript,         :type => :string, :aliases => "-j", :default => "prototype",
+                                          :desc => "Preconfigure for selected javascript library (options: #{JAVASCRIPTS.join('/')})"
+
+        class_option :skip_javascript,    :type => :boolean, :aliases => "-J", :default => false,
+                                          :desc => "Skip javascript files"
 
         class_option :dev,                :type => :boolean, :default => false,
                                           :desc => "Setup the #{name} with Gemfile pointing to your Rails checkout"
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 6fdc51bd94..ef24cf1e05 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -154,23 +154,11 @@ module Rails
                         plugin runner test]
 
     class AppGenerator < AppBase
-      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
-      JAVASCRIPTS = %w( prototype jquery )
-
       add_shared_options_for "application"
 
-      class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
-                                        :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
-
-      class_option :javascript,         :type => :string, :aliases => "-j", :default => "prototype",
-                                        :desc => "Preconfigure for selected javascript library (options: #{JAVASCRIPTS.join('/')})"
-
       class_option :skip_test_unit,     :type => :boolean, :aliases => "-T", :default => false,
                                         :desc => "Skip Test::Unit files"
 
-      class_option :skip_javascript,    :type => :boolean, :aliases => "-J", :default => false,
-                                        :desc => "Skip javascript files"
-
       # Add bin/rails options
       class_option :version,            :type => :boolean, :aliases => "-v", :group => :rails,
                                         :desc => "Show Rails version number and quit"
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index d361c490a3..b514554da7 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -45,7 +45,7 @@ module Rails
     end
 
     def generate_test_dummy
-      opts = (options || {}).slice("skip_active_record")
+      opts = (options || {}).slice(:skip_active_record, :skip_javascript, :database, :javascript)
 
       invoke Rails::Generators::AppGenerator,
         [ File.expand_path(dummy_path, destination_root) ], opts
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index f833411e3a..53e1dd6708 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -63,6 +63,21 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_file "test/dummy/config/database.yml"
   end
 
+  def test_ensure_that_database_option_is_passed_to_app_generator
+    run_generator [destination_root, "--database", "postgresql"]
+    assert_file "test/dummy/config/database.yml", /postgres/
+  end
+
+  def test_ensure_that_javascript_option_is_passed_to_app_generator
+    run_generator [destination_root, "--javascript", "jquery"]
+    assert_file "test/dummy/public/javascripts/jquery.js"
+  end
+
+  def test_ensure_that_skip_javascript_option_is_passed_to_app_generator
+    run_generator [destination_root, "--skip_javascript"]
+    assert_no_file "test/dummy/public/javascripts/prototype.js"
+  end
+
   def test_template_from_dir_pwd
     FileUtils.cd(Rails.root)
     assert_match /It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"])