diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2012-06-08 19:09:18 +0200 |
---|---|---|
committer | Piotr Sarnacki <drogus@gmail.com> | 2012-06-08 19:09:18 +0200 |
commit | 523820f81b057d102e3c0d0de2fb03a1c7333174 (patch) | |
tree | 0dedba7d9a5baf13a42bbc078748a9b91ec4c960 /railties | |
parent | 7495b262cf9c1046595d8967d898d197d9764b9c (diff) | |
download | rails-523820f81b057d102e3c0d0de2fb03a1c7333174.tar.gz rails-523820f81b057d102e3c0d0de2fb03a1c7333174.tar.bz2 rails-523820f81b057d102e3c0d0de2fb03a1c7333174.zip |
Don't add sqlite3 to gemspec with -O on rails plugin new
(closes #6672)
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec | 2 | ||||
-rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec index 82ffeebb86..568ed653b7 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec +++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec @@ -22,6 +22,8 @@ Gem::Specification.new do |s| <% if full? && !options[:skip_javascript] -%> # s.add_dependency "<%= "#{options[:javascript]}-rails" %>" <% end -%> +<% unless options[:skip_active_record] -%> s.add_development_dependency "<%= gem_for_database %>" +<% end -%> end diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index f7dffe9a5c..9e362a6695 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -82,6 +82,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "bukkits.gemspec", /mysql/ end + def test_dont_generate_development_dependency + run_generator [destination_root, "--skip-active-record"] + + assert_file "bukkits.gemspec" do |contents| + assert_no_match(/s.add_development_dependency "sqlite3"/, contents) + end + end + def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] assert_file "test/dummy/config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ |