aslakhellesoy-webrat 0.3.2.1 → 0.3.2.2

data/History.txt

@@ -6,9 +6,13 @@
   * Removed auto-require of webrat/rails when requiring webrat when RAILS_ENV is
     defined
   
-  In your env.rb file, ensure you have:
+  In your env.rb or test_helper.rb file, ensure you have something like:
   
-    require "webrat/rails"
+    require "webrat"
+    
+    Webrat.configure do |config|
+      config.mode = :rails
+    end
   
 * Major enhancements
 
@@ -16,8 +20,11 @@
   * Use Hpricot and REXML when not parsing with Nokogiri (on JRuby, for example)
 
 * Minor enhancements
-
+  * Added assert_contain, assert_not_contain [#86] (Mike Gaffney, Amos King)
+  * Add configuration options for the Selenium environment and port (Kieran Pilkington)
+  * Maximize the browser window after initializing Selenium (Luke Melia)
   * Better inspect output for Webrat elements
+  * Sets the Webrat mode with Configuration#mode= in the config block [#85] (Mike Gaffney)
   * Detect if the document is XML or HTML using the Content-Type when in Rails mode
   * Expose #selenium method for direct access to Selenium client
   * Check nokogiri gem version before requiring nokogiri
@@ -51,6 +58,8 @@
   * Raise Webrat::PageLoadError when a failure occurs so that application exceptions
     can be more accurately tested (Ryan Briones)
   * Helpful error message for missing option in select box. [#40] (Ben Mabey)
+  * Extracted save_and_open page to make it usable in Selenium mode (Luke Melia)
+  * Added save_and_open_screengrab for Selenium mode (Luke Melia)
 
 * Bug fixes
   
@@ -67,6 +76,13 @@
   * Extend Rails' ActionController::IntegrationTest instead of
     ActionController::Integration::Session (Fixes using Webrat's #select method and 
     avoids usage of method_missing)
+  * Ensure that Webrat::MechanizeSession.request_page always uses an absolute 
+    URL. (Graham Ashton)
+  * Strip anchor tags from URIs before passing to Rails integration session
+    (Noah Davis)
+  * Treat text and regexp when matching Selenium buttons (Ross Kaffenberger)
+  * Allow SeleniumSession's click_button to be called without an argument without
+    blowing up (Luke Melia)
     
 == 0.3.2 / 2008-11-08
 

data/README.rdoc

@@ -59,9 +59,13 @@ To install the latest code as a plugin: (_Note:_ This may be less stable than us
 
   script/plugin install git://github.com/brynary/webrat.git
 
-In your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber) add:
+In your test_helper.rb or env.rb (for Cucumber) add:
 
-  require "webrat/rails"
+  require "webrat"
+  
+  Webrat.configure do |config|
+    config.mode = :rails
+  end
   
 == Install with Merb
 

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rubygems'
+# require 'rubygems'
 require "rake/gempackagetask"
 require 'rake/rdoctask'
 require "rake/clean"
@@ -28,8 +28,8 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
 
   # Dependencies
-  s.add_dependency "nokogiri", ">= 1.0.6"
-  
+  s.add_dependency "nokogiri", ">= 1.1.0"
+
   s.rubyforge_project = "webrat"
 end
 
@@ -52,13 +52,13 @@ end
 desc "Run API and Core specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
 end
 
 desc "Run all specs in spec directory with RCov"
 Spec::Rake::SpecTask.new(:rcov) do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList['spec/public/**/*_spec.rb'] + FileList['spec/private/**/*_spec.rb']
   t.rcov = true
   t.rcov_opts = lambda do
     IO.readlines(File.dirname(__FILE__) + "/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
@@ -71,8 +71,8 @@ end
 
 desc 'Install the package as a gem.'
 task :install_gem => [:clean, :package] do
-  gem = Dir['pkg/*.gem'].first
-  sh "sudo gem install --local #{gem}"
+  gem_filename = Dir['pkg/*.gem'].first
+  sh "sudo gem install --local #{gem_filename}"
 end
 
 desc "Delete generated RDoc"
@@ -99,6 +99,41 @@ task :spec_deps do
   end
 end
 
+task :prepare do
+  system "ln -s ../../../../.. ./spec/integration/rails/vendor/plugins/webrat"
+end
+
+namespace :spec do
+  desc "Run the integration specs"
+  task :integration => ["integration:rails", "integration:merb", "integration:sinatra"]
+
+  namespace :integration do
+    desc "Run the Rails integration specs"
+    task :rails do
+      Dir.chdir "spec/integration/rails" do
+        result = system "rake test:integration"
+        raise "Rails integration tests failed" unless result
+      end
+    end
+
+    desc "Run the Merb integration specs"
+    task :merb do
+      Dir.chdir "spec/integration/merb" do
+        result = system "rake spec"
+        raise "Merb integration tests failed" unless result
+      end
+    end
+
+    desc "Run the Sinatra integration specs"
+    task :sinatra do
+      Dir.chdir "spec/integration/sinatra" do
+        result = system "rake test"
+        raise "Sinatra tntegration tests failed" unless result
+      end
+    end
+  end
+end
+
 task :default => :spec
 
-task :precommit => ["spec", "spec:jruby"]
+task :precommit => ["spec", "spec:jruby", "spec:integration"]

data/lib/webrat/core/configuration.rb

@@ -17,6 +17,7 @@ module Webrat
   #     config.parse_with_nokogiri = false
   #   end
   class Configuration
+    
     # Should XHTML be parsed with Nokogiri? Defaults to true, except on JRuby. When false, Hpricot and REXML are used
     attr_writer :parse_with_nokogiri
     
@@ -26,9 +27,17 @@ module Webrat
     # Save and open pages with error status codes (500-599) in a browser? Defualts to true.
     attr_writer :open_error_files
     
+    # Which environment should the selenium tests be run in? Defaults to selenium.
+    attr_accessor :selenium_environment
+
+    # Which port should the selenium tests be run on? Defaults to 3001.
+    attr_accessor :selenium_port
+
     def initialize # :nodoc:
       self.open_error_files = true
       self.parse_with_nokogiri = !Webrat.on_java?
+      self.selenium_environment = :selenium
+      self.selenium_port = 3001
     end
     
     def parse_with_nokogiri? #:nodoc:
@@ -39,6 +48,13 @@ module Webrat
       @open_error_files ? true : false
     end
     
+    # Allows setting of webrat's mode, valid modes are:
+    # :rails, :selenium, :rack, :sinatra, :mechanize, :merb
+    def mode=(mode)
+      @mode = mode
+      require("webrat/#{mode}")
+    end
+    
   end
   
 end

data/lib/webrat/core/matchers/have_content.rb

@@ -51,5 +51,19 @@ module Webrat
       HasContent.new(content)
     end
     
+    # Asserts that the body of the response contain
+    # the supplied string or regexp
+    def assert_contain(content)
+      hc = HasContent.new(content)
+      raise Test::Unit::AssertionFailedError.new(hc.failure_message) unless hc.matches?(response_body)
+    end
+    
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_not_contain(content)
+      hc = HasContent.new(content)
+      raise Test::Unit::AssertionFailedError.new(hc.negative_failure_message) if hc.matches?(response_body)
+    end
+    
   end
 end

data/lib/webrat/core/matchers/have_selector.rb

@@ -33,5 +33,20 @@ module Webrat
     end
     alias_method :match_selector, :have_selector
     
+    
+    # Asserts that the body of the response contains
+    # the supplied selector
+    def assert_have_selector(expected)
+      hs = HaveSelector.new(expected)
+      raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response_body)
+    end
+    
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_have_no_selector(expected)
+      hs = HaveSelector.new(expected)
+      raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response_body)
+    end
+    
   end
 end

data/lib/webrat/core/matchers/have_tag.rb

@@ -52,6 +52,20 @@ module Webrat
     end
     
     alias_method :match_tag, :have_tag
+    
+    # Asserts that the body of the response contains
+    # the supplied tag with the associated selectors
+    def assert_have_tag(name, attributes = {})
+      ht = HaveTag.new([name, attributes])
+      raise Test::Unit::AssertionFailedError.new(ht.failure_message) unless ht.matches?(response_body)
+    end
+    
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_have_no_tag(name, attributes = {})
+      ht = HaveTag.new([name, attributes])
+      raise Test::Unit::AssertionFailedError.new(ht.negative_failure_message) if ht.matches?(response_body)
+    end
 
   end
 end

data/lib/webrat/core/matchers/have_xpath.rb

@@ -79,5 +79,15 @@ module Webrat
     end
     alias_method :match_xpath, :have_xpath
     
+    def assert_have_xpath(expected, &block)
+      hs = HaveXpath.new(expected, &block)
+      raise Test::Unit::AssertionFailedError.new(hs.failure_message) unless hs.matches?(response_body)
+    end
+    
+    def assert_have_no_xpath(expected, &block)
+      hs = HaveXpath.new(expected, &block)
+      raise Test::Unit::AssertionFailedError.new(hs.negative_failure_message) if hs.matches?(response_body)
+    end
+    
   end
 end

data/lib/webrat/core/methods.rb

@@ -47,6 +47,7 @@ module Webrat
       :select_option,
       :set_hidden_field, :submit_form,
       :request_page, :current_dom,
+      :response_body, 
       :selects_date, :selects_time, :selects_datetime,
       :select_date, :select_time, :select_datetime,
       :field_by_xpath,

data/lib/webrat/core/session.rb

@@ -8,7 +8,7 @@ module Webrat
   # A page load or form submission returned an unsuccessful response code (500-599)
   class PageLoadError < WebratError
   end
-  
+
   def self.session_class
     case Webrat.configuration.mode
     when :rails
@@ -24,32 +24,41 @@ module Webrat
     when :mechanize
       MechanizeSession
     else
-      raise WebratError.new("Unknown Webrat mode: #{Webrat.configuration.mode.inspect}")
+      raise WebratError.new(<<-STR)
+Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
+
+Please ensure you have a Webrat configuration block that specifies a mode
+in your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber).
+For example:
+
+  Webrat.configure do |config|
+    config.mode = :rails
+  end
+      STR
     end
   end
-  
+
   class Session
     extend Forwardable
     include Logging
     include SaveAndOpenPage
-    
     attr_reader :current_url
     attr_reader :elements
-    
+
     def initialize(context = nil) #:nodoc:
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
       @context         = context
-      
+
       reset
     end
-    
+
     def current_dom #:nodoc:
       current_scope.dom
     end
-    
+
     # For backwards compatibility -- removing in 1.0
     def current_page #:nodoc:
       page = OpenStruct.new
@@ -58,7 +67,7 @@ module Webrat
       page.data = @data
       page
     end
-    
+
     def doc_root #:nodoc:
       nil
     end
@@ -70,7 +79,7 @@ module Webrat
     def http_accept(mime_type)
       header('Accept', Webrat::MIME.mime_type(mime_type))
     end
-    
+
     def basic_auth(user, pass)
       encoded_login = ["#{user}:#{pass}"].pack("m*")
       header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
@@ -93,28 +102,38 @@ module Webrat
 
       save_and_open_page if exception_caught? && Webrat.configuration.open_error_files?
       raise PageLoadError.new("Page load was not successful (Code: #{response_code.inspect}):\n#{formatted_error}") unless success_code?
-      
+
       reset
-      
+
       @current_url  = url
       @http_method  = http_method
       @data         = data
-      
+
+      request_page(response_location, :get, data) if internal_redirect?
+
       return response
     end
-    
+
     def success_code? #:nodoc:
       (200..499).include?(response_code)
     end
-    
+
+    def redirect? #:nodoc:
+      response_code / 100 == 3
+    end
+
+    def internal_redirect? #:nodoc:
+      redirect? && current_host == response_location_host
+    end
+
     def exception_caught? #:nodoc:
       response_body =~ /Exception caught/
     end
-    
+
     def current_scope #:nodoc:
       scopes.last || page_scope
     end
-    
+
     # Reloads the last page requested. Note that this will resubmit forms
     # and their data.
     def reloads
@@ -122,10 +141,10 @@ module Webrat
     end
 
     webrat_deprecate :reload, :reloads
-      
-    
+
+
     # Works like click_link, but only looks for the link text within a given selector
-    # 
+    #
     # Example:
     #   click_link_within "#user_12", "Vote"
     def click_link_within(selector, link_text)
@@ -135,14 +154,14 @@ module Webrat
     end
 
     webrat_deprecate :clicks_link_within, :click_link_within
-    
+
     def within(selector)
       scopes.push(Scope.from_scope(self, current_scope, selector))
       ret = yield(current_scope)
       scopes.pop
       return ret
     end
-    
+
     # Issues a GET request for a page, follows any redirects, and verifies the final page
     # load was successful.
     #
@@ -151,7 +170,7 @@ module Webrat
     def visit(url = nil, http_method = :get, data = {})
       request_page(url, http_method, data)
     end
-    
+
     webrat_deprecate :visits, :visit
 
     # Subclasses can override this to show error messages without html
@@ -166,25 +185,25 @@ module Webrat
     def page_scope #:nodoc:
       @_page_scope ||= Scope.from_page(self, response, response_body)
     end
-    
+
     def dom
       page_scope.dom
     end
-    
+
     def xml_content_type?
       false
     end
-    
+
     def simulate
       return if Webrat.configuration.mode == :selenium
       yield
     end
-    
+
     def automate
       return unless Webrat.configuration.mode == :selenium
       yield
     end
-    
+
     def_delegators :current_scope, :fill_in,            :fills_in
     def_delegators :current_scope, :set_hidden_field
     def_delegators :current_scope, :submit_form
@@ -199,15 +218,25 @@ module Webrat
     def_delegators :current_scope, :click_area,         :clicks_area
     def_delegators :current_scope, :click_link,         :clicks_link
     def_delegators :current_scope, :click_button,       :clicks_button
-    def_delegators :current_scope, :should_see
-    def_delegators :current_scope, :should_not_see
     def_delegators :current_scope, :field_labeled
     def_delegators :current_scope, :field_by_xpath
     def_delegators :current_scope, :field_with_id
     def_delegators :current_scope, :select_option
-    
+
   private
-    
+
+    def response_location
+      response.headers["Location"]
+    end
+
+    def current_host
+      URI.parse(current_url).host || "www.example.com"
+    end
+
+    def response_location_host
+      URI.parse(response_location).host || "www.example.com"
+    end
+
     def reset
       @elements     = {}
       @_scopes      = nil

data/lib/webrat/mechanize.rb

@@ -6,6 +6,10 @@ module Webrat #:nodoc:
     attr_accessor :response
     alias :page :response
     
+    def request_page(url, http_method, data) #:nodoc:
+      super(absolute_url(url), http_method, data)
+    end
+    
     def get(url, data, headers_argument_not_used = nil)
       @response = mechanize.get(url, data)
     end
@@ -36,8 +40,35 @@ module Webrat #:nodoc:
     end
 
     def_delegators :mechanize, :basic_auth
+    
+    def absolute_url(url) #:nodoc:
+      current_host, current_path = split_current_url
+      if url =~ Regexp.new('^https?://')
+        url
+      elsif url =~ Regexp.new('^/')
+        current_host + url
+      elsif url =~ Regexp.new('^\.')
+        current_host + absolute_path(current_path, url)
+      else
+        url
+      end
+    end
+    
+    private
+      def split_current_url
+        current_url =~ Regexp.new('^(https?://[^/]+)(/.*)?')
+        [Regexp.last_match(1), Regexp.last_match(2)]
+      end
       
+      def absolute_path(current_path, url)
+        levels_up = url.split('/').find_all { |x| x == '..' }.size
+        ancestor = if current_path.nil?
+          ""
+        else
+          current_path.split("/")[0..(-1 - levels_up)].join("/")
+        end
+        descendent = url.split("/")[levels_up..-1]
+        "#{ancestor}/#{descendent}"
+      end
   end
 end
-
-Webrat.configuration.mode = :mechanize

data/lib/webrat/merb.rb

@@ -42,11 +42,6 @@ module Webrat
         :params => (data && data.any?) ? data : nil, 
         :headers => headers,
         :method => method)
-      follow_redirect
-    end
-    
-    def follow_redirect
-      self.get(@response.headers['Location'], nil, @response.headers) if @response.status == 302
     end
 
   end
@@ -59,10 +54,6 @@ module Merb #:nodoc:
         @_webrat_session ||= Webrat::MerbSession.new
         @_webrat_session.response = @_webrat_session.request(uri, env)
       end
-  
-      def follow_redirect
-        @_webrat_session.follow_redirect
-      end
     end
   end
 end
@@ -72,6 +63,3 @@ class Merb::Test::RspecStory #:nodoc:
     @browser ||= Webrat::MerbSession.new
   end
 end
-
-Webrat.configuration.mode = :merb
-

data/lib/webrat/rack.rb

@@ -22,5 +22,3 @@ module Webrat
     end
   end
 end
-
-Webrat.configuration.mode = :rack

data/lib/webrat/rails.rb

@@ -1,4 +1,6 @@
 require "webrat"
+
+require "action_controller"
 require "action_controller/integration"
 
 module Webrat
@@ -7,51 +9,50 @@ module Webrat
     def doc_root
       File.expand_path(File.join(RAILS_ROOT, 'public'))
     end
-    
+
     def saved_page_dir
       File.expand_path(File.join(RAILS_ROOT, "tmp"))
     end
-    
+
     def get(url, data, headers = nil)
       do_request(:get, url, data, headers)
     end
-    
+
     def post(url, data, headers = nil)
       do_request(:post, url, data, headers)
     end
-    
+
     def put(url, data, headers = nil)
       do_request(:put, url, data, headers)
     end
-    
+
     def delete(url, data, headers = nil)
       do_request(:delete, url, data, headers)
     end
-    
+
     def response_body
       response.body
     end
-    
+
     def response_code
       response.code.to_i
     end
-    
+
     def xml_content_type?
       response.headers["Content-Type"].to_s =~ /xml/
     end
-    
+
   protected
-    
+
     def integration_session
       @context
     end
-    
+
     def do_request(http_method, url, data, headers) #:nodoc:
       update_protocol(url)
-      url = normalize_url(url)
-      integration_session.request_via_redirect(http_method, url, data, headers)
+      integration_session.send(http_method, normalize_url(url), data, headers)
     end
-  
+
     # remove protocol, host and anchor
     def normalize_url(href) #:nodoc:
       uri = URI.parse(href)
@@ -61,7 +62,7 @@ module Webrat
       end
       normalized_url
     end
-    
+
     def update_protocol(href) #:nodoc:
       if href =~ /^https:/
         integration_session.https!(true)
@@ -69,28 +70,17 @@ module Webrat
         integration_session.https!(false)
       end
     end
-    
+
     def response #:nodoc:
       integration_session.response
     end
-    
+
   end
 end
 
 module ActionController #:nodoc:
-  module Integration #:nodoc:
-    Session.class_eval do
-      unless instance_methods.include?("put_via_redirect")
-        require "webrat/rails/redirect_actions"
-        include Webrat::RedirectActions
-      end
-    end
-  end
-  
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Matchers
   end
 end
-
-Webrat.configuration.mode = :rails

data/lib/webrat/selenium/matchers.rb

@@ -0,0 +1,108 @@
+module Webrat
+  module Selenium
+    module Matchers
+
+      class HaveXpath
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("xpath=#{@expected}")
+          end
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match xpath #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match xpath #{@expected}:\n#{@document}"
+        end
+      end
+      
+      def have_xpath(xpath)
+        HaveXpath.new(xpath)
+      end
+      
+      class HaveSelector
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("css=#{@expected}")
+          end
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match selector #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match selector #{@expected}:\n#{@document}"
+        end
+      end
+      
+      def have_selector(content)
+        HaveSelector.new(content)
+      end
+      
+      class HasContent #:nodoc:
+        def initialize(content)
+          @content = content
+        end
+        
+        def matches?(response)
+          if @content.is_a?(Regexp)
+            text_finder = "regexp:#{@content.source}"
+          else
+            text_finder = @content
+          end
+          
+          response.session.wait_for do
+            response.selenium.is_text_present(text_finder)
+          end
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected the following element's content to #{content_message}:\n#{@element}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected the following element's content to not #{content_message}:\n#{@element}"
+        end
+
+        def content_message
+          case @content
+          when String
+            "include \"#{@content}\""
+          when Regexp
+            "match #{@content.inspect}"
+          end
+        end
+      end
+
+      # Matches the contents of an HTML document with
+      # whatever string is supplied
+      def contain(content)
+        HasContent.new(content)
+      end
+      
+    end
+  end
+end

data/lib/webrat/selenium.rb

@@ -4,8 +4,6 @@ require "selenium/client"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
 
-Webrat.configuration.mode = :selenium
-
 module Webrat
   
   def self.with_selenium_server #:nodoc:
@@ -28,8 +26,8 @@ module Webrat
   
   def self.start_app_server #:nodoc:
     pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid")
-    system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=3001 --environment=selenium --pid #{pid_file} &")
-    TCPSocket.wait_for_service :host => "0.0.0.0", :port => 3001
+    system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=#{Webrat.configuration.selenium_port} --environment=#{Webrat.configuration.selenium_environment} --pid #{pid_file} &")
+    TCPSocket.wait_for_service :host => "0.0.0.0", :port => Webrat.configuration.selenium_port.to_i
   end
   
   def self.stop_app_server #:nodoc:
@@ -40,14 +38,10 @@ module Webrat
   # To use Webrat's Selenium support, you'll need the selenium-client gem installed.
   # Activate it with (for example, in your <tt>env.rb</tt>):
   #
-  #   require "webrat/selenium"
-  # 
-  # Then, if you're using Cucumber, configure it to use a 
-  # <tt>Webrat::Selenium::Rails::World</tt> as the scenario context by adding
-  # the following to <tt>env.rb</tt>:
-  #
-  #   World do
-  #     Webrat::Selenium::Rails::World.new
+  #   require "webrat"
+  #   
+  #   Webrat.configure do |config|
+  #     config.mode = :selenium
   #   end
   #
   # == Dropping down to the selenium-client API
@@ -74,34 +68,26 @@ module Webrat
   # your Webrat::Selenium tests ignoring the concurrency issues that can plague in-browser
   # testing, so long as you're using the Webrat API.
   module Selenium
-    
-    module Rails #:nodoc:
-      class World < ::ActionController::IntegrationTest
-        include Webrat::Selenium::Matchers
-        
-        def initialize #:nodoc:
-          @_result = Test::Unit::TestResult.new
-        end
-        
-        def response
-          webrat_session.response
-        end
-        
-        def wait_for(*args, &block)
-          webrat_session.wait_for(*args, &block)
-        end
+    module Methods
+      def response
+        webrat_session.response
+      end
+
+      def wait_for(*args, &block)
+        webrat_session.wait_for(*args, &block)
+      end
 
-        def save_and_open_screengrab
-          webrat_session.save_and_open_screengrab
-        end
+      def save_and_open_screengrab
+        webrat_session.save_and_open_screengrab
       end
     end
   end
-    
 end
 
 module ActionController #:nodoc:
   IntegrationTest.class_eval do
     include Webrat::Methods
+    include Webrat::Selenium::Methods
+    include Webrat::Selenium::Matchers
   end
 end

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

data/lib/webrat.rb

@@ -7,7 +7,7 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.3.2.1'
+  VERSION = '0.3.2.2'
 
   def self.require_xml
     gem "nokogiri", ">= 1.0.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.3.2.1
+  version: 0.3.2.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-20 00:00:00 -08:00
+date: 2008-12-29 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
@@ -88,8 +88,6 @@ files:
 - lib/webrat/mechanize.rb
 - lib/webrat/merb.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
@@ -100,6 +98,7 @@ files:
 - lib/webrat/selenium/location_strategy_javascript/webratlink.js
 - lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js
 - lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js
+- lib/webrat/selenium/matchers.rb
 - lib/webrat/selenium/selenium_extensions.js
 - lib/webrat/selenium/selenium_session.rb
 - lib/webrat/selenium.rb

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