diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-10 02:53:19 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-10 02:53:19 -0800 |
| commit | 909e5cc32d0bd47dad2f5c5404670a074a9dabbd (patch) | |
| tree | e4b5b324f471392ca2cb37888eeb2688d0795aa3 | |
| parent | c778f4e84b314289a7dc3f99a14dbb19ef072505 (diff) | |
| parent | 49349089ad38b403bf3f395ebf8fbc44cd232b49 (diff) | |
| download | rails-909e5cc32d0bd47dad2f5c5404670a074a9dabbd.tar.gz rails-909e5cc32d0bd47dad2f5c5404670a074a9dabbd.tar.bz2 rails-909e5cc32d0bd47dad2f5c5404670a074a9dabbd.zip | |
Merge pull request #3591 from tylercoville/fix-plugin-new
Fixed error with 'rails generate new plugin' where the .gitignore was not
3 files changed, 12 insertions, 4 deletions
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 4baa2110e7..f5c8ccf940 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 @@ -39,7 +39,7 @@ module Rails end def gitignore - copy_file "gitignore", ".gitignore" + template "gitignore", ".gitignore" end def lib diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore index 1463de6dfb..92bd3c614b 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore +++ b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore @@ -1,6 +1,6 @@ .bundle/ log/*.log pkg/ -test/dummy/db/*.sqlite3 -test/dummy/log/*.log -test/dummy/tmp/
\ No newline at end of file +<%= dummy_path %>/db/*.sqlite3 +<%= dummy_path %>/log/*.log +<%= dummy_path %>/tmp/
\ No newline at end of file diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 9183945619..b70f9f4d9c 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -236,6 +236,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "spec/dummy/config/application.rb" assert_no_file "test" end + + def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path + FileUtils.cd(Rails.root) + run_generator([destination_root, "--dummy_path", "spec/dummy" "--skip-test-unit"]) + assert_file ".gitignore" do |contents| + assert_match(/spec\/dummy/, contents) + end + end def test_skipping_test_unit run_generator [destination_root, "--skip-test-unit"] |