diff options
author | José Valim <jose.valim@gmail.com> | 2010-10-03 21:48:32 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-10-03 21:48:32 +0200 |
commit | 5f292c944155851df7e493f153cfb9d64c964388 (patch) | |
tree | 6adf5e0ff2c9fd6a198cd7faf30d294700a57096 /actionpack/test/controller/new_base | |
parent | 5836af8f8b0eb3c569c66792abf50a0485bb6f22 (diff) | |
parent | 653acac069e66f53b791caa4838a1e25de905f31 (diff) | |
download | rails-5f292c944155851df7e493f153cfb9d64c964388.tar.gz rails-5f292c944155851df7e493f153cfb9d64c964388.tar.bz2 rails-5f292c944155851df7e493f153cfb9d64c964388.zip |
Merge branch 'racksession'
Diffstat (limited to 'actionpack/test/controller/new_base')
-rw-r--r-- | actionpack/test/controller/new_base/etag_test.rb | 46 |
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 |