diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-25 06:29:00 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-25 06:29:00 -0700 |
| commit | 903f1f90358f736f6a520df8bdc4fbea86f4b0a6 (patch) | |
| tree | 252bd3c7b41e7e54235aae15c36e238e2fa216d6 | |
| parent | 41eac9b3f6b4a38de3b4c38e5b8d9f0e6b3cb08a (diff) | |
| parent | 22be5ca8b91b1ee8bf2aeb8ae29a64a45968ac24 (diff) | |
| download | rails-903f1f90358f736f6a520df8bdc4fbea86f4b0a6.tar.gz rails-903f1f90358f736f6a520df8bdc4fbea86f4b0a6.tar.bz2 rails-903f1f90358f736f6a520df8bdc4fbea86f4b0a6.zip | |
Merge pull request #1298 from flippingbits/add_test_files_to_gemspec
Add test files to engine's gemspec
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec | 3 | ||||
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 11 |
2 files changed, 13 insertions, 1 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 15299ddb9f..56b06829d8 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec +++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec @@ -5,5 +5,8 @@ Gem::Specification.new do |s| s.summary = "Insert <%= camelized %> summary." s.description = "Insert <%= camelized %> description." s.files = Dir["{app,config,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] +<% unless options.skip_test_unit? -%> + s.test_files = Dir["test/**/*"] +<% end -%> s.version = "0.0.1" end diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 1b01c9dbc1..b93e33f61a 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -173,6 +173,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase run_generator assert_file "bukkits.gemspec", /s.name = "bukkits"/ assert_file "bukkits.gemspec", /s.files = Dir\["\{app,config,lib\}\/\*\*\/\*"\]/ + assert_file "bukkits.gemspec", /s.test_files = Dir\["test\/\*\*\/\*"\]/ assert_file "bukkits.gemspec", /s.version = "0.0.1"/ end @@ -187,7 +188,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "spec/dummy/config/application.rb" assert_no_file "test/dummy" end - + def test_creating_dummy_without_tests_but_with_dummy_path run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"] assert_file "spec/dummy" @@ -195,6 +196,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_no_file "test" end + def test_skipping_test_unit + run_generator [destination_root, "--skip-test-unit"] + assert_no_file "test" + assert_file "bukkits.gemspec" do |contents| + assert_no_match /s.test_files = Dir\["test\/\*\*\/\*"\]/, contents + end + end + def test_skipping_gemspec run_generator [destination_root, "--skip-gemspec"] assert_no_file "bukkits.gemspec" |