From a1fa756e17a2522d69a828ce59b801709483a34f Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 4 Sep 2011 17:43:58 -0300 Subject: * is not allowed in windows file names. Closes #2574 #2847 --- actionpack/test/controller/render_test.rb | 2 +- actionpack/test/fixtures/test/hello,world.erb | 1 + actionpack/test/fixtures/test/hello_w*rld.erb | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 actionpack/test/fixtures/test/hello,world.erb delete mode 100644 actionpack/test/fixtures/test/hello_w*rld.erb (limited to 'actionpack/test') diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 6bcd606bf4..c46755417f 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -410,7 +410,7 @@ class TestController < ActionController::Base end def render_with_explicit_escaped_template - render :template => "test/hello_w*rld" + render :template => "test/hello,world" end def render_with_explicit_string_template diff --git a/actionpack/test/fixtures/test/hello,world.erb b/actionpack/test/fixtures/test/hello,world.erb new file mode 100644 index 0000000000..bc8fa5e0ca --- /dev/null +++ b/actionpack/test/fixtures/test/hello,world.erb @@ -0,0 +1 @@ +Hello w*rld! \ No newline at end of file diff --git a/actionpack/test/fixtures/test/hello_w*rld.erb b/actionpack/test/fixtures/test/hello_w*rld.erb deleted file mode 100644 index bc8fa5e0ca..0000000000 --- a/actionpack/test/fixtures/test/hello_w*rld.erb +++ /dev/null @@ -1 +0,0 @@ -Hello w*rld! \ No newline at end of file -- cgit v1.2.3