brynary-webrat 0.3.2.2 → 0.4.0

data/lib/webrat/sinatra.rb

@@ -2,20 +2,28 @@ 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 || {}})
+        data = data.inject({}) {|data, (key,value)| data[key] = Rack::Utils.unescape(value); data }
+        params = data.merge(:env => headers || {})
         self.__send__("#{verb}_it", path, params)
-        follow! while @response.redirect?
       end
     end
-    
   end
 end
-
-Webrat.configuration.mode = :sinatra

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brynary-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-25 00:00:00 -08:00
+date: 2009-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.6
+        version: 1.1.0
     version: 
 description: Webrat. Ruby Acceptance Testing for Web applications
 email: bryan@brynary.com
@@ -87,9 +87,8 @@ files:
 - lib/webrat/core_extensions/nil_to_param.rb
 - lib/webrat/mechanize.rb
 - lib/webrat/merb.rb
+- lib/webrat/merb_session.rb
 - lib/webrat/rack.rb
-- lib/webrat/rails
-- lib/webrat/rails/redirect_actions.rb
 - lib/webrat/rails.rb
 - lib/webrat/rspec-rails.rb
 - lib/webrat/selenium

data/lib/webrat/rails/redirect_actions.rb

@@ -1,18 +0,0 @@
-# For Rails before http://dev.rubyonrails.org/ticket/10497 was committed
-module Webrat
-  module RedirectActions #:nodoc:
-    
-    def put_via_redirect(path, parameters = {}, headers = {})
-      put path, parameters, headers
-      follow_redirect! while redirect?
-      status
-    end
-
-    def delete_via_redirect(path, parameters = {}, headers = {})
-      delete path, parameters, headers
-      follow_redirect! while redirect?
-      status
-    end
-    
-  end
-end