aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base/etag_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-22 21:40:14 +0200
committerJosé Valim <jose.valim@gmail.com>2010-10-03 21:25:22 +0200
commit74dd8a3681c6984ea35c879f88c6a87521b58ec2 (patch)
tree4952e210123b31c4149cf1747a00c619be5d3fa5 /actionpack/test/controller/new_base/etag_test.rb
parent50215f9525b6b5e3bfe703724b9f68177ed8565d (diff)
downloadrails-74dd8a3681c6984ea35c879f88c6a87521b58ec2.tar.gz
rails-74dd8a3681c6984ea35c879f88c6a87521b58ec2.tar.bz2
rails-74dd8a3681c6984ea35c879f88c6a87521b58ec2.zip
Move ETag and ConditionalGet logic from AD::Response to the middleware stack.
Diffstat (limited to 'actionpack/test/controller/new_base/etag_test.rb')
-rw-r--r--actionpack/test/controller/new_base/etag_test.rb46
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