@@ -33,7 +33,7 @@ class SiteController < ApplicationController expires_in self.class.cache_timeout, :public => true, :private => false else expires_in nil, :private => true, "no-cache" => true - headers['ETag'] = nil + headers['ETag'] = '' end end app/controllers/site_controller.rb @@ -27,4 +27,16 @@ Feature: Serving pages from front-end When I go to page '/first' And I go to page '/first' Then I should get an "X-Accel-Redirect" header in the response - \ No newline at end of file + + Scenario: page caching enabled + Given I have page caching on + When I go to page '/first' + Then I should get an "ETag" header in the response + And The "Cache-Control" header should be "public" + + Scenario: page caching disabled + Given I have page caching off + When I go to page '/first' + Then I should not get an "ETag" header in the response + And The "Cache-Control" header should be "private" + features/page_serving.feature @@ -35,10 +35,31 @@ Given /^I have turned on X\-Sendfile headers$/ do Radiant::Cache.use_x_sendfile = true end -Then /^I should get an "([^\"]*)" header in the response$/ do |header_key| - response.headers.to_hash[header_key].should be +Then /^I should( not)? get an "([^\"]*)" header in the response$/ do |status, header_key| + if status.nil? + response.headers.to_hash[header_key].should_not be_empty + else + response.headers.to_hash[header_key].should be_empty + end end Given /^I have turned on X\-Accel\-Redirect headers$/ do Radiant::Cache.use_x_accel_redirect = "/cache" end + +Given /^I have page caching (on|off)$/ do |status| + set_page_cache status +end + +Then /^The "([^\"]*)" header should be "([^\"]*)"$/ do |header_key, value| + response.headers.to_hash[header_key].should =~ Regexp.new(value) +end + +def set_page_cache(status) + Page.class_eval %{ + def cache? + #{status != 'off'} + end + }, __FILE__, __LINE__ +end + features/step_definitions/page_serving_steps.rb 5dc7d486ff3a4d348452a70524a67cc9a8e978dd David Cato git@crunchyfrog.net http://github.com/radiant/radiant/commit/3a96364749f19a7ca49f90ca9d91d0e3eb305242 3a96364749f19a7ca49f90ca9d91d0e3eb305242 2009-06-06T09:37:24-07:00 2009-05-26T21:45:47-07:00 Don't allow a nil ETag Response header values cannnot be nil, so when page caching is disabled the ETag header should be set to an empty string rather than nil. d1eab7febca5a3afc31c03783227b75b2c678c99 Sean Cribbs seancribbs@gmail.com