jwilger-webrat 0.4.2.5 → 0.4.3.2

data/History.txt

@@ -1,3 +1,20 @@
+== 0.4.3 / 2009-03-17
+
+* Minor enhancements
+
+  * Support Rails 2.3. Use Rack::Utils to parse params (Matthew Ford)
+  * Support for "modular" Sinatra app style (Simon Rozet)
+  * Initial Merb and Sinatra compatibility for Selenium mode (Corey Donohoe)
+  * When faced with a label with no for attribute, that contains a hidden field
+    and another field, as can be the case in Rails 2.3's checkbox view,
+    webrat now locates the non-hidden field. (Luke Melia) 
+  * Add application_framework config for Selenium mode to determine how to
+    start and stop the app server (Corey Donohoe)
+
+* Bug fixes
+
+  * Fix following of absolute redirect URL in Sinatra (Simon Rozet)
+
 == 0.4.2 / 2009-02-24
 
 * Major enhancements

data/lib/webrat.rb

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

data/lib/webrat/core/configuration.rb

@@ -39,6 +39,9 @@ module Webrat
     webrat_deprecate :selenium_port, :application_port
     webrat_deprecate :selenium_port=, :application_port=
 
+    # Which underlying app framework we're testing with selenium
+    attr_accessor :application_framework
+
     # Which server the application is running on for selenium testing? Defaults to localhost
     attr_accessor :application_address
 
@@ -54,6 +57,9 @@ module Webrat
     # Set the timeout argument for the Selenium jar
     attr_accessor :selenium_server_timeout
 
+    # Set the timeout argument for the Selenium server startup
+    attr_accessor :selenium_server_startup_timeout
+
     # Set any additional arguments (as a string) to pass to the Selenium RC jar
     attr_accessor :selenium_server_args
 
@@ -67,10 +73,12 @@ module Webrat
       self.application_environment = :selenium
       self.application_port = 3001
       self.application_address = 'localhost'
+      self.application_framework = 'rails'
       self.selenium_server_port = 4444
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_server_timeout = 5
+      self.selenium_server_startup_timeout = 120
     end
 
     def parse_with_nokogiri? #:nodoc:
@@ -97,4 +105,5 @@ module Webrat
     end
 
   end
+
 end

data/lib/webrat/core/elements/field.rb

@@ -15,6 +15,10 @@ module Webrat
     def self.xpath_search
       [".//button", ".//input", ".//textarea", ".//select"]
     end
+
+    def self.xpath_search_excluding_hidden
+      [".//button", ".//input[ @type != 'hidden']", ".//textarea", ".//select"]
+    end
     
     def self.field_classes
       @field_classes || []
@@ -80,7 +84,7 @@ module Webrat
       
       case Webrat.configuration.mode
       when :rails
-        rails_request_parser.parse_query_parameters("#{name}=#{escaped_value}")
+        parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
       else
@@ -98,12 +102,15 @@ module Webrat
     
   protected
   
-    def rails_request_parser
+    def parse_rails_request_params(params)
       if defined?(ActionController::AbstractRequest)
-        ActionController::AbstractRequest
-      else
+        ActionController::AbstractRequest.parse_query_parameters(params)
+      elsif defined?(ActionController::UrlEncodedPairParser)
         # For Rails > 2.2
-        ActionController::UrlEncodedPairParser
+        ActionController::UrlEncodedPairParser.parse_query_parameters(params)
+      else
+        # For Rails > 2.3
+        Rack::Utils.parse_nested_query(params)
       end
     end
   

data/lib/webrat/core/elements/label.rb

@@ -21,7 +21,7 @@ module Webrat
   
     def field_element
       if for_id.blank?
-        Webrat::XML.xpath_at(@element, *Field.xpath_search)
+        Webrat::XML.xpath_at(@element, *Field.xpath_search_excluding_hidden)
       else
         Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
       end

data/lib/webrat/selenium.rb

@@ -16,7 +16,7 @@ module Webrat
     unless Webrat.configuration.selenium_server_address
       remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
         Webrat.configuration.selenium_server_port,
-        Webrat.configuration.selenium_server_timeout)
+        Webrat.configuration.selenium_server_startup_timeout)
       remote_control.jar_file = File.expand_path(__FILE__ + "../../../../vendor/selenium-server.jar")
       remote_control.additional_args = Webrat.configuration.selenium_server_args
       remote_control.start :background => true
@@ -29,15 +29,55 @@ module Webrat
     ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop unless Webrat.configuration.selenium_server_address
   end
 
-  def self.start_app_server #:nodoc:
-    pid_file = prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
-    system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
+  def self.pid_file
+    if File.exists?('config.ru')
+      prepare_pid_file(Dir.pwd, 'rack.pid')
+    else
+      prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
+    end
+  end
+  # Start the appserver for the underlying framework to test
+  #
+  # Sinatra: requires a config.ru in the root of your sinatra app to use this
+  # Merb: Attempts to use bin/merb and falls back to the system merb
+  # Rails: Calls mongrel_rails to startup the appserver
+  def self.start_app_server
+    case Webrat.configuration.application_framework
+    when :sinatra
+      fork do
+        File.open('rack.pid', 'w') { |fp| fp.write Process.pid }
+        exec 'rackup', File.expand_path(Dir.pwd + '/config.ru'), '-p', Webrat.configuration.application_port.to_s
+      end
+    when :merb
+      cmd = 'merb'
+      if File.exist?('bin/merb')
+        cmd = 'bin/merb'
+      end
+      system("#{cmd} -d -p #{Webrat.configuration.application_port} -e #{Webrat.configuration.application_environment}")
+    else # rails
+      system("mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
+    end
     TCPSocket.wait_for_service :host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i
   end
 
-  def self.stop_app_server #:nodoc:
-    pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid")
-    system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
+  # Stop the appserver for the underlying framework under test
+  #
+  # Sinatra: Reads and kills the pid from the pid file created on startup
+  # Merb: Reads and kills the pid from the pid file created on startup
+  # Rails: Calls mongrel_rails stop to kill the appserver
+  def self.stop_app_server 
+    case Webrat.configuration.application_framework
+    when :sinatra
+      pid = File.read('rack.pid')
+      system("kill -9 #{pid}")
+      FileUtils.rm_f 'rack.pid'
+    when :merb
+      pid = File.read("log/merb.#{Webrat.configuration.application_port}.pid")
+      system("kill -9 #{pid}")
+      FileUtils.rm_f "log/merb.#{Webrat.configuration.application_port}.pid"
+    else # rails
+      system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
+    end
   end
 
   def self.prepare_pid_file(file_path, pid_file_name)
@@ -64,11 +104,25 @@ module Webrat
   #     selenium.dragdrop("id=photo_123", "+350, 0")
   #   end
   #
-  # == Auto-starting of the mongrel and java server
+  # == Choosing the underlying framework to test
+  #
+  # Webrat assumes you're using rails by default but it can also work with sinatra
+  # and merb.  To take advantage of this you can use the configuration block to
+  # set the application_framework variable.
+  #   require "webrat"
+  #
+  #   Webrat.configure do |config|
+  #     config.mode = :selenium
+  #     config.application_port = 4567
+  #     config.application_framework = :sinatra  # could also be :merb
+  #   end
+  #
+  # == Auto-starting of the appserver and java server
   #
   # Webrat will automatically start the Selenium Java server process and an instance
   # of Mongrel when a test is run. The Mongrel will run in the "selenium" environment
-  # instead of "test", so ensure you've got that defined, and will run on port 3001.
+  # instead of "test", so ensure you've got that defined, and will run on port
+  # Webrat.configuration.application_port.
   #
   # == Waiting
   #
@@ -93,11 +147,12 @@ module Webrat
     end
   end
 end
-
-module ActionController #:nodoc:
-  IntegrationTest.class_eval do
-    include Webrat::Methods
-    include Webrat::Selenium::Methods
-    include Webrat::Selenium::Matchers
+if defined?(ActionController::IntegrationTest)
+  module ActionController #:nodoc:
+    IntegrationTest.class_eval do
+      include Webrat::Methods
+      include Webrat::Selenium::Methods
+      include Webrat::Selenium::Matchers
+    end
   end
 end

data/lib/webrat/selenium/selenium_session.rb

@@ -180,11 +180,21 @@ module Webrat
     end
 
   protected
+    def silence_stream(stream)
+      old_stream = stream.dup
+      stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+      stream.sync = true
+      yield
+    ensure
+      stream.reopen(old_stream)
+    end
 
     def setup #:nodoc:
       silence_stream(STDOUT) do
-        Webrat.start_selenium_server
-        Webrat.start_app_server
+        silence_stream(STDERR) do
+          Webrat.start_selenium_server
+          Webrat.start_app_server
+        end
       end
 
       create_browser

data/lib/webrat/sinatra.rb

@@ -1,30 +1,44 @@
-require 'webrat/rack'
-require 'sinatra'
-require 'sinatra/test'
-
-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
+require "webrat/rack"
+require "sinatra/test"
 
 module Webrat
-  class SinatraSession < RackSession #:nodoc:
+  class SinatraSession < RackSession
     include Sinatra::Test
 
     attr_reader :request, :response
 
+    def initialize(context = nil)
+      super(context)
+
+      app = context.respond_to?(:app) ? context.app : Sinatra::Application
+      @browser = Sinatra::TestHarness.new(app)
+    end
+
     %w(get head post put delete).each do |verb|
-      alias_method "orig_#{verb}", verb
-      define_method(verb) do |*args| # (path, data, headers = nil)
-        path, data, headers = *args
-        data = data.inject({}) {|data, (key,value)| data[key] = Rack::Utils.unescape(value); data }
-        params = data.merge(:env => headers || {})
-        self.__send__("orig_#{verb}", path, params)
-      end
+      class_eval <<-RUBY
+        def #{verb}(path, data, headers = {})
+          params = data.inject({}) do |data, (key,value)|
+            data[key] = Rack::Utils.unescape(value)
+            data
+          end
+          headers["HTTP_HOST"] = "www.example.com"
+          @browser.#{verb}(path, params, headers)
+        end
+      RUBY
     end
+
+    def response_body
+      @browser.body
+    end
+
+    def response_code
+      @browser.status
+    end
+
+    private
+
+      def response
+        @browser.response
+      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jwilger-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.2.5
+  version: 0.4.3.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency