Move Rails::Static into ActionDispatch

4 files changed, 38 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
new file mode 100644
index 0000000000..e6957bb0ea
--- /dev/null
+++ b/actionpack/test/dispatch/static_test.rb
@@ -0,0 +1,35 @@
+require 'abstract_unit'
+
+class StaticTest < ActiveSupport::TestCase
+  DummyApp = lambda { |env|
+    [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]]
+  }
+  App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public")
+
+  test "serves dynamic content" do
+    assert_equal "Hello, World!", get("/nofile")
+  end
+
+  test "serves static index at root" do
+    assert_equal "/index.html", get("/index.html")
+    assert_equal "/index.html", get("/index")
+    assert_equal "/index.html", get("/")
+  end
+
+  test "serves static file in directory" do
+    assert_equal "/foo/bar.html", get("/foo/bar.html")
+    assert_equal "/foo/bar.html", get("/foo/bar/")
+    assert_equal "/foo/bar.html", get("/foo/bar")
+  end
+
+  test "serves static index file in directory" do
+    assert_equal "/foo/index.html", get("/foo/index.html")
+    assert_equal "/foo/index.html", get("/foo/")
+    assert_equal "/foo/index.html", get("/foo")
+  end
+
+  private
+    def get(path)
+      Rack::MockRequest.new(App).request("GET", path).body
+    end
+end
diff --git a/actionpack/test/fixtures/public/foo/bar.html b/actionpack/test/fixtures/public/foo/bar.html
new file mode 100644
index 0000000000..9a35646205
--- /dev/null
+++ b/actionpack/test/fixtures/public/foo/bar.html
@@ -0,0 +1 @@
+/foo/bar.html
\ No newline at end of file
diff --git a/actionpack/test/fixtures/public/foo/index.html b/actionpack/test/fixtures/public/foo/index.html
new file mode 100644
index 0000000000..497a2e898f
--- /dev/null
+++ b/actionpack/test/fixtures/public/foo/index.html
@@ -0,0 +1 @@
+/foo/index.html
\ No newline at end of file
diff --git a/actionpack/test/fixtures/public/index.html b/actionpack/test/fixtures/public/index.html
new file mode 100644
index 0000000000..525950ba6b
--- /dev/null
+++ b/actionpack/test/fixtures/public/index.html
@@ -0,0 +1 @@
+/index.html
\ No newline at end of file