Make static faster as we don't have to serve multiple paths anymore.

2 files changed, 1 insertions, 55 deletions

diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 655745a848..2ebbed4414 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -47,35 +47,4 @@ class StaticTest < ActiveSupport::TestCase
   end
 
   include StaticTests
-end
-
-class MultipleDirectorisStaticTest < ActiveSupport::TestCase
-  DummyApp = lambda { |env|
-    [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]]
-  }
-  App = ActionDispatch::Static.new(DummyApp,
-            { "/"     => "#{FIXTURE_LOAD_PATH}/public",
-              "/blog" => "#{FIXTURE_LOAD_PATH}/blog_public",
-              "/foo"  => "#{FIXTURE_LOAD_PATH}/non_existing_dir"
-            })
-
-  def setup
-    @app = App
-  end
-
-  include StaticTests
-
-  test "serves files from other mounted directories" do
-    assert_html "/blog/index.html", get("/blog/index.html")
-    assert_html "/blog/index.html", get("/blog/index")
-    assert_html "/blog/index.html", get("/blog/")
-
-    assert_html "/blog/blog.html", get("/blog/blog/")
-    assert_html "/blog/blog.html", get("/blog/blog.html")
-    assert_html "/blog/blog.html", get("/blog/blog")
-
-    assert_html "/blog/subdir/index.html", get("/blog/subdir/index.html")
-    assert_html "/blog/subdir/index.html", get("/blog/subdir/")
-    assert_html "/blog/subdir/index.html", get("/blog/subdir")
-  end
-end
+end
\ No newline at end of file
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 1bf748af14..4a93def5a8 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -477,15 +477,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="#{expected_path}" />), image_tag("rails.png")
   end
 
-  def test_env_asset_path
-    @controller.config.asset_path = "/assets%s"
-    def @controller.env; @_env ||= {} end
-    @controller.env["action_dispatch.asset_path"] = "/omg%s"
-
-    expected_path = "/assets/omg/images/rails.png"
-    assert_equal %(<img alt="Rails" src="#{expected_path}" />), image_tag("rails.png")
-  end
-
   def test_proc_asset_id
     @controller.config.asset_path = Proc.new do |asset_path|
       "/assets.v12345#{asset_path}"
@@ -495,20 +486,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="#{expected_path}" />), image_tag("rails.png")
   end
 
-  def test_env_proc_asset_path
-    @controller.config.asset_path = Proc.new do |asset_path|
-      "/assets.v12345#{asset_path}"
-    end
-
-    def @controller.env; @_env ||= {} end
-    @controller.env["action_dispatch.asset_path"] = Proc.new do |asset_path|
-      "/omg#{asset_path}"
-    end
-
-    expected_path = "/assets.v12345/omg/images/rails.png"
-    assert_equal %(<img alt="Rails" src="#{expected_path}" />), image_tag("rails.png")
-  end
-
   def test_image_tag_interpreting_email_cid_correctly
     # An inline image has no need for an alt tag to be automatically generated from the cid:
     assert_equal '<img src="cid:thi%25%25sis@acontentid" />', image_tag("cid:thi%25%25sis@acontentid")