From e8b07dc340441d4d15889cb14ee9f0f00a1ecd30 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 10 Mar 2009 11:19:32 -0500 Subject: Ensure public folder structure is setup correctly if the tests are ran out of order, fixes tests in 0c9bbf8 --- railties/test/fixtures/public/foo/bar.html | 1 + railties/test/fixtures/public/foo/index.html | 1 + railties/test/fixtures/public/index.html | 1 + railties/test/public/foo/bar.html | 1 - railties/test/public/foo/index.html | 1 - railties/test/public/index.html | 1 - railties/test/rack_static_test.rb | 8 ++++++++ 7 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 railties/test/fixtures/public/foo/bar.html create mode 100644 railties/test/fixtures/public/foo/index.html create mode 100644 railties/test/fixtures/public/index.html delete mode 100644 railties/test/public/foo/bar.html delete mode 100644 railties/test/public/foo/index.html delete mode 100644 railties/test/public/index.html diff --git a/railties/test/fixtures/public/foo/bar.html b/railties/test/fixtures/public/foo/bar.html new file mode 100644 index 0000000000..9a35646205 --- /dev/null +++ b/railties/test/fixtures/public/foo/bar.html @@ -0,0 +1 @@ +/foo/bar.html \ No newline at end of file diff --git a/railties/test/fixtures/public/foo/index.html b/railties/test/fixtures/public/foo/index.html new file mode 100644 index 0000000000..497a2e898f --- /dev/null +++ b/railties/test/fixtures/public/foo/index.html @@ -0,0 +1 @@ +/foo/index.html \ No newline at end of file diff --git a/railties/test/fixtures/public/index.html b/railties/test/fixtures/public/index.html new file mode 100644 index 0000000000..525950ba6b --- /dev/null +++ b/railties/test/fixtures/public/index.html @@ -0,0 +1 @@ +/index.html \ No newline at end of file diff --git a/railties/test/public/foo/bar.html b/railties/test/public/foo/bar.html deleted file mode 100644 index 9a35646205..0000000000 --- a/railties/test/public/foo/bar.html +++ /dev/null @@ -1 +0,0 @@ -/foo/bar.html \ No newline at end of file diff --git a/railties/test/public/foo/index.html b/railties/test/public/foo/index.html deleted file mode 100644 index 497a2e898f..0000000000 --- a/railties/test/public/foo/index.html +++ /dev/null @@ -1 +0,0 @@ -/foo/index.html \ No newline at end of file diff --git a/railties/test/public/index.html b/railties/test/public/index.html deleted file mode 100644 index 525950ba6b..0000000000 --- a/railties/test/public/index.html +++ /dev/null @@ -1 +0,0 @@ -/index.html \ No newline at end of file diff --git a/railties/test/rack_static_test.rb b/railties/test/rack_static_test.rb index 5449751002..ad673f6f19 100644 --- a/railties/test/rack_static_test.rb +++ b/railties/test/rack_static_test.rb @@ -4,6 +4,14 @@ require 'action_controller' require 'rails/rack' class RackStaticTest < ActiveSupport::TestCase + def setup + FileUtils.cp_r "#{RAILS_ROOT}/fixtures/public", "#{RAILS_ROOT}/public" + end + + def teardown + FileUtils.rm_rf "#{RAILS_ROOT}/public" + end + DummyApp = lambda { |env| [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] } -- cgit v1.2.3