aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Sprenger <stefan.sprenger@dkd.de>2011-05-24 12:43:55 +0200
committerStefan Sprenger <stefan.sprenger@dkd.de>2011-05-24 12:43:55 +0200
commite366cd7f91436ed1a781cdf879357eb0c3bec09d (patch)
tree0d06985f2f4b110065986c4f4ee44d37556f0a4a
parentab0d2f2d628afa0df32294ca4702998190c4311c (diff)
parentb8118ef492b68e95e71285e9a19f9c701a7d3c36 (diff)
downloadrails-e366cd7f91436ed1a781cdf879357eb0c3bec09d.tar.gz
rails-e366cd7f91436ed1a781cdf879357eb0c3bec09d.tar.bz2
rails-e366cd7f91436ed1a781cdf879357eb0c3bec09d.zip
Merge branch 'master' of https://github.com/rails/rails
-rw-r--r--railties/test/generators/plugin_new_generator_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 49537d6511..779e362d75 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -170,8 +170,9 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
end
def test_creating_gemspec
+ run_generator
assert_file "bukkits.gemspec", /s.name = "bukkits"/
- assert_file "bukkits.gemspec", /s.files = Dir["{app,config,lib}\/**\/*"]/
+ assert_file "bukkits.gemspec", /s.files = Dir\["\{app,config,lib\}\/\*\*\/\*"\]/
assert_file "bukkits.gemspec", /s.version = "0.0.1"/
end