aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/testing/assertions.rb
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2013-10-22 13:17:52 +0200
committerRobin Dupret <robin.dupret@gmail.com>2013-10-22 14:13:14 +0200
commit52b252614e275da799b6a15cebbfd067c59987d1 (patch)
tree941a7fc64fc84da3442b66338805829c16f6d16d /railties/lib/rails/generators/testing/assertions.rb
parent99044beb8163d42d6f0bcf26c7215e209e7f2bc7 (diff)
downloadrails-52b252614e275da799b6a15cebbfd067c59987d1.tar.gz
rails-52b252614e275da799b6a15cebbfd067c59987d1.tar.bz2
rails-52b252614e275da799b6a15cebbfd067c59987d1.zip
Make the application name snake cased when it contains spaces
The application name is used to fill the `database.yml` and `session_store.rb` files ; previously, if the provided name contained whitespaces, it led to unexpected names in these files. Since Shellwords.escape adds backslashes to escape spaces, the app_name should remove them and replace any space with an underscore (just like periods previously). Also improve the assert_file helper to work with paths containing spaces using String#shellescape.
Diffstat (limited to 'railties/lib/rails/generators/testing/assertions.rb')
-rw-r--r--railties/lib/rails/generators/testing/assertions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb
index 6267b2f2ee..cc88e830dd 100644
--- a/railties/lib/rails/generators/testing/assertions.rb
+++ b/railties/lib/rails/generators/testing/assertions.rb
@@ -21,7 +21,7 @@ module Rails
# end
# end
def assert_file(relative, *contents)
- absolute = File.expand_path(relative, destination_root)
+ absolute = File.expand_path(relative, destination_root).shellescape
assert File.exists?(absolute), "Expected file #{relative.inspect} to exist, but does not"
read = File.read(absolute) if block_given? || !contents.empty?