spec/integration/sinatra/Rakefile spec/integration/sinatra/app.rb spec/integration/sinatra/test/test_helper.rb spec/integration/sinatra/test/webrat_test.rb spec/private/sinatra/sinatra_session_spec.rb @@ -2,15 +2,27 @@ require 'webrat/rack' require 'sinatra' require 'sinatra/test/methods' +class Sinatra::Application + # Override this to prevent Sinatra from barfing on the options passed from RSpec + def self.load_default_options_from_command_line! + end +end + +disable :run +disable :reload + module Webrat class SinatraSession < RackSession #:nodoc: include Sinatra::Test::Methods + attr_reader :request, :response + %w(get head post put delete).each do |verb| define_method(verb) do |*args| # (path, data, headers = nil) path, data, headers = *args - params = data.merge({:env => headers || {}}) + params = data.merge(:env => headers || {}) self.__send__("#{verb}_it", path, params) + request_page(response.location, :get, {}) while response.redirect? end end end lib/webrat/sinatra.rb @@ -1,15 +1,2 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') -require "webrat/sinatra" - -class Sinatra::Application - # Override this to prevent Sinatra from barfing on the options passed from RSpec - def self.load_default_options_from_command_line! - end -end - -Sinatra::Application.default_options.merge!( - :env => :test, - :run => false, - :raise_errors => true, - :logging => false -) \ No newline at end of file +require "webrat/sinatra" \ No newline at end of file spec/private/sinatra/helper.rb spec/private/sinatra/sinatra_spec.rb e19b1cc323e8df657a357bfeefe3f68745f80938 499dcefefe929e58a3adf802410dc5bb94a70862 Josh Knowles joshknowles@gmail.com http://github.com/brynary/webrat/commit/c3120833b0a4fab942e1430088e513783304b2a0 c3120833b0a4fab942e1430088e513783304b2a0 2009-01-04T18:57:25-08:00 2009-01-04T18:57:25-08:00 Merge branch 'foca/master' 1639304da18df87958b4eed6a2210709da17e3df Josh Knowles joshknowles@gmail.com