Merge branch 'master' of git://github.com/lifo/docrails

1 files changed, 0 insertions, 46 deletions

diff --git a/actionpack/test/controller/new_base/etag_test.rb b/actionpack/test/controller/new_base/etag_test.rb
deleted file mode 100644
index 2bca5aec6a..0000000000
--- a/actionpack/test/controller/new_base/etag_test.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'abstract_unit'
-
-module Etags
-  class BasicController < ActionController::Base
-    self.view_paths = [ActionView::FixtureResolver.new(
-      "etags/basic/base.html.erb" => "Hello from without_layout.html.erb",
-      "layouts/etags.html.erb"    => "teh <%= yield %> tagz"
-    )]
-
-    def without_layout
-      render :action => "base"
-    end
-
-    def with_layout
-      render :action => "base", :layout => "etags"
-    end
-  end
-
-  class EtagTest < Rack::TestCase
-    describe "Rendering without any special etag options returns an etag that is an MD5 hash of its text"
-
-    test "an action without a layout" do
-      get "/etags/basic/without_layout"
-
-      body = "Hello from without_layout.html.erb"
-      assert_body body
-      assert_header "Etag", etag_for(body)
-      assert_status 200
-    end
-
-    test "an action with a layout" do
-      get "/etags/basic/with_layout"
-
-      body = "teh Hello from without_layout.html.erb tagz"
-      assert_body body
-      assert_header "Etag", etag_for(body)
-      assert_status 200
-    end
-
-    private
-
-    def etag_for(text)
-      %("#{Digest::MD5.hexdigest(text)}")
-    end
-  end
-end