From a7862366ff7251682f494f589e1203005d3fa125 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Mon, 20 Feb 2012 04:46:45 +0000 Subject: [PATCH] Remove fixture files with Windows incompatible filenames Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. --- actionpack/test/dispatch/static_test.rb | 115 ++++++++++++++---- .../test/fixtures/public/foo/foo!bar.html | 1 - .../test/fixtures/public/foo/foo$bar.html | 1 - .../test/fixtures/public/foo/foo&bar.html | 1 - .../test/fixtures/public/foo/foo'bar.html | 1 - .../test/fixtures/public/foo/foo(bar).html | 1 - .../test/fixtures/public/foo/foo*bar.html | 1 - .../test/fixtures/public/foo/foo+bar.html | 1 - .../test/fixtures/public/foo/foo,bar.html | 1 - .../test/fixtures/public/foo/foo:bar.html | 1 - .../test/fixtures/public/foo/foo;bar.html | 1 - .../test/fixtures/public/foo/foo=bar.html | 1 - .../test/fixtures/public/foo/foo@bar.html | 1 - 13 files changed, 88 insertions(+), 39 deletions(-) delete mode 100644 actionpack/test/fixtures/public/foo/foo!bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo$bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo&bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo'bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo(bar).html delete mode 100644 actionpack/test/fixtures/public/foo/foo*bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo+bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo,bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo:bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo;bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo=bar.html delete mode 100644 actionpack/test/fixtures/public/foo/foo@bar.html diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index ec69d50d26d89..949deefa9dccb 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require 'rbconfig' module StaticTests def test_serves_dynamic_content @@ -30,32 +31,84 @@ def test_serves_static_index_file_in_directory assert_html "/foo/index.html", get("/foo") end - def test_serves_static_file_with_encoded_pchar - assert_html "/foo/foo!bar.html", get("/foo/foo%21bar.html") - assert_html "/foo/foo$bar.html", get("/foo/foo%24bar.html") - assert_html "/foo/foo&bar.html", get("/foo/foo%26bar.html") - assert_html "/foo/foo'bar.html", get("/foo/foo%27bar.html") - assert_html "/foo/foo(bar).html", get("/foo/foo%28bar%29.html") - assert_html "/foo/foo*bar.html", get("/foo/foo%2Abar.html") - assert_html "/foo/foo+bar.html", get("/foo/foo%2Bbar.html") - assert_html "/foo/foo,bar.html", get("/foo/foo%2Cbar.html") - assert_html "/foo/foo;bar.html", get("/foo/foo%3Bbar.html") - assert_html "/foo/foo:bar.html", get("/foo/foo%3Abar.html") - assert_html "/foo/foo@bar.html", get("/foo/foo%40bar.html") - end - - def test_serves_static_file_with_unencoded_pchar - assert_html "/foo/foo!bar.html", get("/foo/foo!bar.html") - assert_html "/foo/foo$bar.html", get("/foo/foo$bar.html") - assert_html "/foo/foo&bar.html", get("/foo/foo&bar.html") - assert_html "/foo/foo'bar.html", get("/foo/foo'bar.html") - assert_html "/foo/foo(bar).html", get("/foo/foo(bar).html") - assert_html "/foo/foo*bar.html", get("/foo/foo*bar.html") - assert_html "/foo/foo+bar.html", get("/foo/foo+bar.html") - assert_html "/foo/foo,bar.html", get("/foo/foo,bar.html") - assert_html "/foo/foo;bar.html", get("/foo/foo;bar.html") - assert_html "/foo/foo:bar.html", get("/foo/foo:bar.html") - assert_html "/foo/foo@bar.html", get("/foo/foo@bar.html") + def test_serves_static_file_with_exclamation_mark_in_filename + with_static_file "/foo/foo!bar.html" do |file| + assert_html file, get("/foo/foo%21bar.html") + assert_html file, get("/foo/foo!bar.html") + end + end + + def test_serves_static_file_with_dollar_sign_in_filename + with_static_file "/foo/foo$bar.html" do |file| + assert_html file, get("/foo/foo%24bar.html") + assert_html file, get("/foo/foo$bar.html") + end + end + + def test_serves_static_file_with_ampersand_in_filename + with_static_file "/foo/foo&bar.html" do |file| + assert_html file, get("/foo/foo%26bar.html") + assert_html file, get("/foo/foo&bar.html") + end + end + + def test_serves_static_file_with_apostrophe_in_filename + with_static_file "/foo/foo'bar.html" do |file| + assert_html file, get("/foo/foo%27bar.html") + assert_html file, get("/foo/foo'bar.html") + end + end + + def test_serves_static_file_with_parentheses_in_filename + with_static_file "/foo/foo(bar).html" do |file| + assert_html file, get("/foo/foo%28bar%29.html") + assert_html file, get("/foo/foo(bar).html") + end + end + + def test_serves_static_file_with_plus_sign_in_filename + with_static_file "/foo/foo+bar.html" do |file| + assert_html file, get("/foo/foo%2Bbar.html") + assert_html file, get("/foo/foo+bar.html") + end + end + + def test_serves_static_file_with_comma_in_filename + with_static_file "/foo/foo,bar.html" do |file| + assert_html file, get("/foo/foo%2Cbar.html") + assert_html file, get("/foo/foo,bar.html") + end + end + + def test_serves_static_file_with_semi_colon_in_filename + with_static_file "/foo/foo;bar.html" do |file| + assert_html file, get("/foo/foo%3Bbar.html") + assert_html file, get("/foo/foo;bar.html") + end + end + + def test_serves_static_file_with_at_symbol_in_filename + with_static_file "/foo/foo@bar.html" do |file| + assert_html file, get("/foo/foo%40bar.html") + assert_html file, get("/foo/foo@bar.html") + end + end + + # Windows doesn't allow \ / : * ? " < > | in filenames + unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ + def test_serves_static_file_with_colon + with_static_file "/foo/foo:bar.html" do |file| + assert_html file, get("/foo/foo%3Abar.html") + assert_html file, get("/foo/foo:bar.html") + end + end + + def test_serves_static_file_with_asterisk + with_static_file "/foo/foo*bar.html" do |file| + assert_html file, get("/foo/foo%2Abar.html") + assert_html file, get("/foo/foo*bar.html") + end + end end private @@ -68,6 +121,14 @@ def assert_html(body, response) def get(path) Rack::MockRequest.new(@app).request("GET", path) end + + def with_static_file(file) + path = "#{FIXTURE_LOAD_PATH}/public" + file + File.open(path, "wb+") { |f| f.write(file) } + yield file + ensure + File.delete(path) + end end class StaticTest < ActiveSupport::TestCase @@ -81,4 +142,4 @@ def setup end include StaticTests -end \ No newline at end of file +end diff --git a/actionpack/test/fixtures/public/foo/foo!bar.html b/actionpack/test/fixtures/public/foo/foo!bar.html deleted file mode 100644 index 2928f2717fafe..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo!bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo!bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo$bar.html b/actionpack/test/fixtures/public/foo/foo$bar.html deleted file mode 100644 index 4f837df01da85..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo$bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo$bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo&bar.html b/actionpack/test/fixtures/public/foo/foo&bar.html deleted file mode 100644 index c194e8de87b84..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo&bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo&bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo'bar.html b/actionpack/test/fixtures/public/foo/foo'bar.html deleted file mode 100644 index 25c3275736bc7..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo'bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo'bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo(bar).html b/actionpack/test/fixtures/public/foo/foo(bar).html deleted file mode 100644 index 94fa4cb944cf4..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo(bar).html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo(bar).html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo*bar.html b/actionpack/test/fixtures/public/foo/foo*bar.html deleted file mode 100644 index 79d5194c8d94f..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo*bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo*bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo+bar.html b/actionpack/test/fixtures/public/foo/foo+bar.html deleted file mode 100644 index 0fdc2ecabcfed..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo+bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo+bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo,bar.html b/actionpack/test/fixtures/public/foo/foo,bar.html deleted file mode 100644 index f040fce197f45..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo,bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo,bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo:bar.html b/actionpack/test/fixtures/public/foo/foo:bar.html deleted file mode 100644 index 7900a2642bc49..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo:bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo:bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo;bar.html b/actionpack/test/fixtures/public/foo/foo;bar.html deleted file mode 100644 index 224837695476f..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo;bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo;bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo=bar.html b/actionpack/test/fixtures/public/foo/foo=bar.html deleted file mode 100644 index 206f69e286e26..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo=bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo=bar.html \ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo@bar.html b/actionpack/test/fixtures/public/foo/foo@bar.html deleted file mode 100644 index 4e8e90f9b8e78..0000000000000 --- a/actionpack/test/fixtures/public/foo/foo@bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/foo@bar.html \ No newline at end of file