Skip to content

Commit

Permalink
Remove fixture files with Windows incompatible filenames
Browse files Browse the repository at this point in the history
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
  • Loading branch information
pixeltrix committed Feb 20, 2012
1 parent 03db636 commit a786236
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 39 deletions.
115 changes: 88 additions & 27 deletions actionpack/test/dispatch/static_test.rb
@@ -1,4 +1,5 @@
require 'abstract_unit'
require 'rbconfig'

module StaticTests
def test_serves_dynamic_content
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -81,4 +142,4 @@ def setup
end

include StaticTests
end
end
1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo!bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo$bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo&bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo'bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo(bar).html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo*bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo+bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo,bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo:bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo;bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo=bar.html

This file was deleted.

1 change: 0 additions & 1 deletion actionpack/test/fixtures/public/foo/foo@bar.html

This file was deleted.

0 comments on commit a786236

Please sign in to comment.