lib/spec/integration/dsl/caching.rb lib/spec/integration/extensions/action_controller/base.rb lib/spec/integration/extensions/action_controller/caching.rb lib/spec/integration/matchers/caching.rb spec/dsl/caching_spec.rb spec/matchers/caching_spec.rb @@ -1,4 +1,4 @@ -Copyright (c) 2007, Adam Williams and John W. Long. +Copyright (c) 2007-2009, Adam Williams and John W. Long. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -16,4 +16,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. + + +Cache testing portions taken from http://github.com/avdgaag/rspec-caching-test-plugin +Copyright (c) 2008 Arjan van der Gaag, released under the MIT license \ No newline at end of file LICENSE @@ -1,6 +1,8 @@ require 'spec' require 'spec/rails' -require 'spec/integration/extensions' +require 'spec/integration/extensions/action_controller/base' +require 'spec/integration/extensions/action_controller/caching' +require 'spec/integration/extensions/hash' require 'spec/integration/matchers' require 'spec/integration/dsl' require 'spec/integration/example/integration_example_group' @@ -8,4 +10,6 @@ require 'spec/integration/example/integration_example_group' module Spec # :nodoc: module Integration # :nodoc: end -end \ No newline at end of file +end + +ActionController::Base.cache_store = Spec::Integration::Extensions::ActionController::Caching::TestStore.new \ No newline at end of file lib/spec/integration.rb @@ -1,3 +1,4 @@ +require 'spec/integration/dsl/caching' require 'spec/integration/dsl/navigation' require 'spec/integration/dsl/form' lib/spec/integration/dsl.rb @@ -2,14 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "submit_form", :type => :integration do it 'should submit the form' do - with_routing do |set| - set.draw do |map| - map.connect '/', :controller => 'integration_dsl', :action => 'form' - get '/' - submit_form :key => 'value' - response.should_not be_nil - end - end + get '/form' + submit_form :key => 'value' + response.should_not be_nil end end spec/dsl/form_spec.rb @@ -2,14 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "An integration spec", :type => :integration do it "should provide all the normal integration support" do - with_routing do |set| - set.draw do |map| - map.root :controller => 'integration_dsl' - get "/" - response.should_not be_nil - open_session.should_not == @integration_session - end - end + get "/" + response.should_not be_nil + open_session.should_not == @integration_session with_routing do |set| set.draw do |map| spec/dsl/integration_spec_spec.rb @@ -22,13 +22,10 @@ end describe "have_navigated_successfully", :type => :integration do it "should report the exception in the failure message" do - with_routing do |set|; set.draw do |map| - map.connect '/exploding', :controller => 'integration_dsl', :action => 'exploding' - get '/exploding' - lambda do - response.should have_navigated_successfully - end.should raise_error(Spec::Expectations::ExpectationNotMetError, /This will blow up!/) - end; end + get '/exploding' + lambda do + response.should have_navigated_successfully + end.should raise_error(Spec::Expectations::ExpectationNotMetError, /This will blow up!/) end end spec/dsl/navigation_spec.rb @@ -1,9 +1,15 @@ class IntegrationDslController < ApplicationController + caches_action :caching_action + def form - render :text => %{<form action="/" method="post"><input type='hidden' name='key' /></form>} + render :text => %{<form action="/form" method="post"><input type='hidden' name='key' /></form>} end def exploding raise "This will blow up!" end + + def caching_action + render :text => Time.now.to_s + end end \ No newline at end of file spec/integration_dsl_controller.rb @@ -14,4 +14,14 @@ require 'action_mailer' require 'rails/version' require 'spec/integration' -require 'integration_dsl_controller' \ No newline at end of file +require 'integration_dsl_controller' + +ActionController::Routing::Routes.draw do |map| + map.with_options :controller => 'integration_dsl' do |dsl| + dsl.root + dsl.connect '/caching_action', :action => 'caching_action' + dsl.connect '/exploding', :action => 'exploding' + dsl.connect '/form', :action => 'form' + end +end + spec/spec_helper.rb lib/spec/integration/extensions.rb lib/spec/integration/extensions/action_controller.rb 34f177eee7705d7e7a70ef8cddd7a3b1e89937a6 Adam Williams adam@thewilliams.ws http://github.com/aiwilliams/spec_integration/commit/5a46ebd0d5a08ee1283b5b8c50f00a7d99478ac2 5a46ebd0d5a08ee1283b5b8c50f00a7d99478ac2 2009-03-11T14:27:18-07:00 2009-03-11T14:27:18-07:00 Action cache testing. See with_caching and cache_action. 0f45e6cef4911dc2f0cb10915ef8b9c46865b06b Adam Williams adam@thewilliams.ws