Merge pull request #20605 from dcrec1/assert_file

assert_file understands paths with special characters

4 files changed, 15 insertions, 2 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index c099ae2ec5..7367f0a813 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   `assert_file` understands paths with special characters
+    (eg. `v0.1.4~alpha+nightly`).
+
+    *Diego Carrion*
+
 *   Remove ContentLength middleware from the defaults.  If you want it, just
     add it as a middleware in your config.
 
diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb
index bd069e4bd0..17af6eddfa 100644
--- a/railties/lib/rails/generators/testing/assertions.rb
+++ b/railties/lib/rails/generators/testing/assertions.rb
@@ -23,7 +23,7 @@ module Rails
         #     end
         #   end
         def assert_file(relative, *contents)
-          absolute = File.expand_path(relative, destination_root).shellescape
+          absolute = File.expand_path(relative, destination_root)
           assert File.exist?(absolute), "Expected file #{relative.inspect} to exist, but does not"
 
           read = File.read(absolute) if block_given? || !contents.empty?
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index fc05127fb5..daf362357c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -499,7 +499,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_application_name_with_spaces
-    path = File.join(destination_root, "foo bar".shellescape)
+    path = File.join(destination_root, "foo bar")
 
     # This also applies to MySQL apps but not with SQLite
     run_generator [path, "-d", 'postgresql']
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index 423ece277e..5f4171d44b 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -122,5 +122,13 @@ module RailtiesTests
         assert_no_file "app/helpers/foo_bar/topics_helper.rb"
       end
     end
+
+    def test_assert_file_with_special_characters
+      path = "#{app_path}/tmp"
+      file_name = "#{path}/v0.1.4~alpha+nightly"
+      FileUtils.mkdir_p path
+      FileUtils.touch file_name
+      assert_file file_name
+    end
   end
 end