@@ -36,7 +36,7 @@ end private def no_cache - headers 'Pragma' => 'no-cache', + response.headers.merge! 'Pragma' => 'no-cache', 'Cache-Control' => 'no-store', 'Expires' => (Time.now - 5.years).rfc2822 end app/controllers/application.rb @@ -34,7 +34,7 @@ module Castronaut ticket_granting_ticket = Castronaut::Models::TicketGrantingTicket.find_by_ticket(ticket_granting_ticket_cookie) cookies.delete 'tgt' - controller.delete_cookie('tgt') + controller.response.delete_cookie('tgt') if ticket_granting_ticket Castronaut::Models::ProxyGrantingTicket.clean_up_proxy_granting_tickets_for(ticket_granting_ticket.username) lib/castronaut/presenters/logout.rb @@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_hel describe Castronaut::Presenters::Logout do before do - @controller = stub('controller', :params => {}, :erb => nil, :request => stub('request', :cookies => {}, :env => { 'REMOTE_ADDR' => '10.1.1.1'})) + @controller = stub('controller', :params => {}, :erb => nil, :request => stub('request', :cookies => {}, :env => { 'REMOTE_ADDR' => '10.1.1.1'}), :response => stub({})) end describe "initialization" do @@ -30,7 +30,7 @@ describe Castronaut::Presenters::Logout do describe "representing" do - before { @controller.stub!(:delete_cookie) } + before { @controller.response.stub!(:delete_cookie) } it "attempts to find the ticket granting ticket using the ticket granting ticket cookie" do Castronaut::Models::TicketGrantingTicket.should_receive(:find_by_ticket).and_return(nil) @@ -76,7 +76,7 @@ describe Castronaut::Presenters::Logout do end it "deletes the tgt cookie from the controller" do - @controller.should_receive(:delete_cookie).with('tgt') + @controller.response.should_receive(:delete_cookie).with('tgt') Castronaut::Presenters::Logout.new(@controller).represent! end spec/castronaut/presenters/logout_spec.rb cdeb5d00b302d8ead987ca9a9988989ecd709344 Aaron Bedra aaron@thinkrelevance.com http://github.com/relevance/castronaut/commit/aa667810fb39e9ddaee04ea895cac2fef782edd4 aa667810fb39e9ddaee04ea895cac2fef782edd4 2009-05-22T07:12:24-07:00 2009-05-22T07:12:24-07:00 fixing deprication warnings f1b2961e3f5f70102d7e27974b4ae67e342a9983 Aaron Bedra aaron@thinkrelevance.com