honkster-webrat 0.4.4.2 → 0.6.0

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

@@ -1,5 +1,4 @@
-require "webrat/core/xml/nokogiri"
-require "webrat/core/xml/rexml"
+require "webrat/core/xml"
 
 module Webrat
   module Matchers
@@ -16,38 +15,14 @@ module Webrat
         matched = matches(stringlike)
 
         if @options[:count]
-          matched.size == @options[:count] && (!@block || @block.call(matched))
+          matched.size == @options[:count].to_i && (!@block || @block.call(matched))
         else
           matched.any? && (!@block || @block.call(matched))
         end
       end
 
       def matches(stringlike)
-        if Webrat.configuration.parse_with_nokogiri?
-          nokogiri_matches(stringlike)
-        else
-          rexml_matches(stringlike)
-        end
-      end
-
-      def rexml_matches(stringlike)
-        if REXML::Node === stringlike || Array === stringlike
-          @query = query.map { |q| q.gsub(%r'^//', './/') }
-        else
-          @query = query
-        end
-
-        add_options_conditions_to(@query)
-
-        @document = Webrat.rexml_document(stringlike)
-
-        @query.map do |q|
-          if @document.is_a?(Array)
-            @document.map { |d| REXML::XPath.match(d, q) }
-          else
-            REXML::XPath.match(@document, q)
-          end
-        end.flatten.compact
+        nokogiri_matches(stringlike)
       end
 
       def nokogiri_matches(stringlike)

data/lib/webrat/core/methods.rb

@@ -16,10 +16,10 @@ module Webrat
     end
 
     def webrat_session
-      if Webrat.configuration.mode == :rack_test
-        @_webrat_session ||= ::Webrat::RackTestSession.new(rack_test_session)
-      else
-        @_webrat_session ||= ::Webrat.session_class.new(self)
+      @_webrat_session ||= begin
+        session = Webrat.session_class.new
+        session.adapter = Webrat.adapter_class.new(self) if session.respond_to?(:adapter=)
+        session
       end
     end
 
@@ -39,6 +39,7 @@ module Webrat
       :unchecks, :uncheck,
       :chooses, :choose,
       :selects, :select,
+      :unselects, :unselect,
       :attaches_file, :attach_file,
       :current_page,
       :current_url,

data/lib/webrat/core/mime.rb

@@ -1,29 +1,18 @@
 module Webrat #:nodoc:
   module MIME #:nodoc:
+    MIME_TYPES = Rack::Mime::MIME_TYPES.dup.merge(
+      ".multipart_form"   => "multipart/form-data",
+      ".url_encoded_form" => "application/x-www-form-urlencoded"
+    ).freeze
 
-    def self.mime_type(string_or_symbol) #:nodoc:
-      if string_or_symbol.is_a?(String)
-        string_or_symbol
-      else
-        case string_or_symbol
-        when :text              then "text/plain"
-        when :html              then "text/html"
-        when :js                then "text/javascript"
-        when :css               then "text/css"
-        when :ics               then "text/calendar"
-        when :csv               then "text/csv"
-        when :xml               then "application/xml"
-        when :rss               then "application/rss+xml"
-        when :atom              then "application/atom+xml"
-        when :yaml              then "application/x-yaml"
-        when :multipart_form    then "multipart/form-data"
-        when :url_encoded_form  then "application/x-www-form-urlencoded"
-        when :json              then "application/json"
-        else
-          raise ArgumentError.new("Invalid Mime type: #{string_or_symbol.inspect}")
-        end
-      end
+    def mime_type(type)
+      return type if type.nil? || type.to_s.include?("/")
+      type = ".#{type}" unless type.to_s[0] == ?.
+      MIME_TYPES.fetch(type) { |type|
+        raise ArgumentError.new("Invalid Mime type: #{type}")
+      }
     end
 
+    module_function :mime_type
   end
 end

data/lib/webrat/core/scope.rb

@@ -112,6 +112,21 @@ module Webrat
 
     webrat_deprecate :selects, :select
 
+    # Verifies that a an option element exists on the current page with the specified
+    # text. You can optionally restrict the search to a specific select list by
+    # assigning <tt>options[:from]</tt> the value of the select list's name or
+    # a label. Remove the option's value before the form is submitted.
+    #
+    # Examples:
+    #   unselect "January"
+    #   unselect "February", :from => "event_month"
+    #   unselect "February", :from => "Event Month"
+    def unselect(option_text, options={})
+      select_option(option_text, options[:from]).unchoose
+    end
+
+    webrat_deprecate :unselects, :unselect
+
     DATE_TIME_SUFFIXES = {
       :year   => '1i',
       :month  => '2i',
@@ -312,12 +327,12 @@ module Webrat
         dom = Webrat::XML.html_document(@response_body)
       end
 
-      Webrat.define_dom_method(@response, dom)
+      Webrat::XML.define_dom_method(@response, dom)
       return dom
     end
 
     def scoped_dom
-      Webrat::XML.css_at(@scope.dom, @selector)
+      @scope.dom.css(@selector).first
     end
 
     def locate_field(field_locator, *field_types) #:nodoc:

data/lib/webrat/core/session.rb

@@ -13,21 +13,30 @@ module Webrat
   end
 
   def self.session_class
+    if Webrat.configuration.mode == :selenium
+      SeleniumSession
+    else
+      Session
+    end
+  end
+
+  def self.adapter_class
     case Webrat.configuration.mode
     when :rails
-      RailsSession
+      RailsAdapter
     when :merb
-      MerbSession
-    when :selenium
-      SeleniumSession
+      MerbAdapter
     when :rack
-      RackSession
+      RackAdapter
+    when :rack_test
+      warn("The :rack_test mode is deprecated. Please use :rack instead")
+      require "webrat/rack"
+      RackAdapter
     when :sinatra
-      SinatraSession
+      warn("The :sinatra mode is deprecated. Please use :rack instead")
+      SinatraAdapter
     when :mechanize
-      MechanizeSession
-    when :rack_test
-      RackTestSession
+      MechanizeAdapter
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -50,16 +59,22 @@ For example:
     extend Forwardable
     include Logging
     include SaveAndOpenPage
+
+    attr_accessor :adapter
+
     attr_reader :current_url
     attr_reader :elements
 
-    def initialize(context = nil) #:nodoc:
+    def_delegators :@adapter, :response, :response_code, :response_body,
+      :response_body=, :response_code=,
+      :get, :post, :put, :delete
+
+    def initialize(adapter = nil)
+      @adapter         = adapter
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @context         = context
-
       reset
     end
 
@@ -245,6 +260,7 @@ For example:
     def_delegators :current_scope, :uncheck,            :unchecks
     def_delegators :current_scope, :choose,             :chooses
     def_delegators :current_scope, :select,             :selects
+    def_delegators :current_scope, :unselect,           :unselects
     def_delegators :current_scope, :select_datetime,    :selects_datetime
     def_delegators :current_scope, :select_date,        :selects_date
     def_delegators :current_scope, :select_time,        :selects_time

data/lib/webrat/core/xml.rb

@@ -1,115 +1,72 @@
-require "webrat/core/xml/nokogiri"
-require "webrat/core/xml/hpricot"
-require "webrat/core/xml/rexml"
+require "webrat/core_extensions/meta_class"
 
 module Webrat #:nodoc:
   module XML #:nodoc:
 
     def self.document(stringlike) #:nodoc:
-      if Webrat.configuration.parse_with_nokogiri?
-        Webrat.nokogiri_document(stringlike)
+      return stringlike.dom if stringlike.respond_to?(:dom)
+
+      if Nokogiri::HTML::Document === stringlike
+        stringlike
+      elsif Nokogiri::XML::NodeSet === stringlike
+        stringlike
+      elsif stringlike.respond_to?(:body)
+        Nokogiri::HTML(stringlike.body.to_s)
       else
-        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+        Nokogiri::HTML(stringlike.to_s)
       end
     end
 
     def self.html_document(stringlike) #:nodoc:
-      if Webrat.configuration.parse_with_nokogiri?
-        Webrat.html_nokogiri_document(stringlike)
+      return stringlike.dom if stringlike.respond_to?(:dom)
+
+      if Nokogiri::HTML::Document === stringlike
+        stringlike
+      elsif Nokogiri::XML::NodeSet === stringlike
+        stringlike
+      elsif stringlike.respond_to?(:body)
+        Nokogiri::HTML(stringlike.body.to_s)
       else
-        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+        Nokogiri::HTML(stringlike.to_s)
       end
     end
 
     def self.xml_document(stringlike) #:nodoc:
-      if Webrat.configuration.parse_with_nokogiri?
-        Webrat.xml_nokogiri_document(stringlike)
+      return stringlike.dom if stringlike.respond_to?(:dom)
+
+      if Nokogiri::HTML::Document === stringlike
+        stringlike
+      elsif Nokogiri::XML::NodeSet === stringlike
+        stringlike
+      elsif stringlike.respond_to?(:body)
+        Nokogiri::XML(stringlike.body.to_s)
       else
-        Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
+        Nokogiri::XML(stringlike.to_s)
       end
     end
 
-    def self.to_html(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.to_html
-      else
-        element.to_s
+    def self.define_dom_method(object, dom) #:nodoc:
+      object.meta_class.send(:define_method, :dom) do
+        dom
       end
     end
 
-    def self.inner_html(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.inner_html
-      else
-        element.text
-      end
-    end
-
-    def self.all_inner_text(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.inner_text
-      else
-        Hpricot(element.to_s).children.first.inner_text
-      end
-    end
+  end
+end
 
-    def self.inner_text(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.inner_text
-      else
-        if defined?(Hpricot::Doc) && element.is_a?(Hpricot::Doc)
-          element.inner_text
-        else
-          element.text
-        end
-      end
-    end
+module Nokogiri #:nodoc:
+  module CSS #:nodoc:
+    class XPathVisitor #:nodoc:
 
-    def self.xpath_to(element)
-      if Webrat.configuration.parse_with_nokogiri?
-        element.path
-      else
-        element.xpath
+      def visit_pseudo_class_text(node) #:nodoc:
+        "@type='text'"
       end
-    end
-
-    def self.attribute(element, attribute_name)
-      return element[attribute_name] if element.is_a?(Hash)
 
-      if Webrat.configuration.parse_with_nokogiri?
-        element[attribute_name]
-      else
-        element.attributes[attribute_name]
+      def visit_pseudo_class_password(node) #:nodoc:
+        "@type='password'"
       end
-    end
-
-    def self.xpath_at(*args)
-      xpath_search(*args).first
-    end
-
-    def self.css_at(*args)
-      css_search(*args).first
-    end
-
-    def self.xpath_search(element, *searches)
-      searches.flatten.map do |search|
-        if Webrat.configuration.parse_with_nokogiri?
-          element.xpath(search)
-        else
-          REXML::XPath.match(element, search)
-        end
-      end.flatten.compact
-    end
 
-    def self.css_search(element, *searches) #:nodoc:
-      xpath_search(element, css_to_xpath(*searches))
     end
-
-    def self.css_to_xpath(*selectors)
-      selectors.map do |rule|
-        Nokogiri::CSS.xpath_for(rule, :prefix => ".//")
-      end.flatten.uniq
-    end
-
   end
 end
+

data/lib/webrat/core.rb

@@ -1,6 +1,5 @@
 require "webrat/core/configuration"
 require "webrat/core/xml"
-require "webrat/core/xml/nokogiri"
 require "webrat/core/logging"
 require "webrat/core/elements/form"
 require "webrat/core/scope"

data/lib/webrat/integrations/merb.rb

@@ -0,0 +1,10 @@
+module Merb #:nodoc:
+  module Test #:nodoc:
+    module RequestHelper #:nodoc:
+      def request(uri, env = {})
+        @_webrat_session ||= Webrat::MerbAdapter.new
+        @_webrat_session.response = @_webrat_session.request(uri, env)
+      end
+    end
+  end
+end

data/lib/webrat/integrations/rails.rb

@@ -0,0 +1,25 @@
+require "action_controller"
+require "action_controller/integration"
+
+module ActionController #:nodoc:
+  IntegrationTest.class_eval do
+    include Webrat::Methods
+    include Webrat::Matchers
+
+    # The Rails version of within supports passing in a model and Webrat
+    # will apply a scope based on Rails' dom_id for that model.
+    #
+    # Example:
+    #   within User.last do
+    #     click_link "Delete"
+    #   end
+    def within(selector_or_object, &block)
+      if selector_or_object.is_a?(String)
+        super
+      else
+        super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
+      end
+    end
+
+  end
+end

data/lib/webrat/integrations/rspec-rails.rb

@@ -0,0 +1,10 @@
+# Supports using the matchers in controller, helper, and view specs if you're
+# using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
+#
+#   require 'webrat/rspec-rails'
+#
+require "webrat/core/matchers"
+
+Spec::Runner.configure do |config|
+  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
+end

data/lib/webrat/integrations/selenium.rb

@@ -0,0 +1,11 @@
+require "webrat/selenium"
+
+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/rspec-rails.rb

@@ -1,10 +1,2 @@
-# Supports using the matchers in controller, helper, and view specs if you're
-# using rspec-rails. Just add a require statement to spec/spec_helper.rb or env.rb:
-#
-#   require 'webrat/rspec-rails'
-#
-require "webrat/core/matchers"
-
-Spec::Runner.configure do |config|
-  config.include(Webrat::Matchers, :type => [:controller, :helper, :view])
-end
+warn("Requiring 'webrat/rspec-rails' is deprecated. Please require 'webrat/integrations/rspec-rails' instead")
+require "webrat/integrations/rspec-rails"

data/lib/webrat/selenium/application_servers/external.rb

@@ -23,4 +23,4 @@ module Webrat
       end
     end
   end
-end
+end

data/lib/webrat/selenium/application_servers.rb

@@ -2,4 +2,4 @@ require "webrat/selenium/application_servers/base"
 require "webrat/selenium/application_servers/sinatra"
 require "webrat/selenium/application_servers/merb"
 require "webrat/selenium/application_servers/rails"
-require "webrat/selenium/application_servers/external"
+require "webrat/selenium/application_servers/external"

data/lib/webrat/selenium/location_strategy_javascript/label.js

@@ -1,24 +1,42 @@
+// Credit to: http://simonwillison.net/2006/Jan/20/escape/
+RegExp.escape = function(text) {
+  if (!arguments.callee.sRE) {
+    var specials = [
+      '/', '.', '*', '+', '?', '|',
+      '(', ')', '[', ']', '{', '}', '\\'
+    ];
+    arguments.callee.sRE = new RegExp(
+      '(\\' + specials.join('|\\') + ')', 'g'
+    );
+  }
+  return text.replace(arguments.callee.sRE, '\\$1');
+}
+
 var allLabels = inDocument.getElementsByTagName("label");
+var regExp = new RegExp('^\\W*' + RegExp.escape(locator) + '(\\b|$)', 'i');
+
 var candidateLabels = $A(allLabels).select(function(candidateLabel){
-  var regExp = new RegExp('^' + locator + '\\b', 'i');
   var labelText = getText(candidateLabel).strip();
   return (labelText.search(regExp) >= 0);
 });
+
 if (candidateLabels.length == 0) {
   return null;
 }
-candidateLabels = candidateLabels.sortBy(function(s) { return s.length * -1; }); //reverse length sort
+
+//reverse length sort
+candidateLabels = candidateLabels.sortBy(function(s) {
+  return s.length * -1;
+});
+
 var locatedLabel = candidateLabels.first();
-var labelFor = locatedLabel.getAttribute('for') || locatedLabel.getAttribute('htmlFor');
-if((!labelFor || labelFor == "") && (locatedLabel.hasChildNodes())) {
-  var inputTags = locatedLabel.getElementsByTagName("input");
-  var textAreaTags = locatedLabel.getElementsByTagName("textarea");
-  if(inputTags.length > 0) {
-    return inputTags[0];
-  } else if(textAreaTags.length > 0) {
-    return textAreaTags[0];
-  } else {
-    return null;
-  }
+var labelFor = locatedLabel.getAttribute('for');
+
+if ((labelFor == null) && (locatedLabel.hasChildNodes())) {
+  return locatedLabel.getElementsByTagName('button')[0]
+    || locatedLabel.getElementsByTagName('input')[0]
+    || locatedLabel.getElementsByTagName('textarea')[0]
+    || locatedLabel.getElementsByTagName('select')[0];
 }
+
 return selenium.browserbot.locationStrategies['id'].call(this, labelFor, inDocument, inWindow);

data/lib/webrat/selenium/location_strategy_javascript/webrat.js

@@ -1,4 +1,5 @@
 var locationStrategies = selenium.browserbot.locationStrategies;
+
 return locationStrategies['id'].call(this, locator, inDocument, inWindow)
         || locationStrategies['name'].call(this, locator, inDocument, inWindow)
         || locationStrategies['label'].call(this, locator, inDocument, inWindow)

data/lib/webrat/selenium/location_strategy_javascript/webratlink.js

@@ -1,12 +1,32 @@
 var links = inDocument.getElementsByTagName('a');
+
 var candidateLinks = $A(links).select(function(candidateLink) {
-  var textMatched = PatternMatcher.matches(locator, getText(candidateLink));
-  var idMatched = PatternMatcher.matches(locator, candidateLink.id);
-  var titleMatched = PatternMatcher.matches(locator, candidateLink.title);
+  var textMatched = false;
+  var titleMatched = false;
+  var idMatched = false;
+
+  if (getText(candidateLink).toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    textMatched = true;
+  }
+
+  if (candidateLink.title.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    titleMatched = true;
+  }
+
+  if (candidateLink.id.toLowerCase().indexOf(locator.toLowerCase()) != -1) {
+    idMatched = true;
+  }
+
   return textMatched || idMatched || titleMatched;
 });
+
 if (candidateLinks.length == 0) {
   return null;
 }
-candidateLinks = candidateLinks.sortBy(function(s) { return s.length * -1; }); //reverse length sort
+
+//reverse length sort
+candidateLinks = candidateLinks.sortBy(function(s) {
+  return s.length * -1;
+});
+
 return candidateLinks.first();

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -34,7 +34,7 @@ module Webrat
 
         @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
                                                                        Webrat.configuration.selenium_server_port,
-                                                                       Webrat.configuration.selenium_browser_startup_timeout)
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
         @remote_control.jar_file = jar_path
 
         return @remote_control
@@ -74,7 +74,9 @@ module Webrat
 
       def stop
         silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop
+          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
+                                                       Webrat.configuration.selenium_server_port,
+                                                       :timeout => 5).stop
         end
       end
 

data/lib/webrat/selenium/selenium_session.rb

@@ -3,6 +3,8 @@ require "webrat/selenium/selenium_rc_server"
 require "webrat/selenium/application_server_factory"
 require "webrat/selenium/application_servers/base"
 
+require "selenium"
+
 module Webrat
   class TimeoutError < WebratError
   end
@@ -77,7 +79,12 @@ module Webrat
     webrat_deprecate :clicks_button, :click_button
 
     def click_link(link_text_or_regexp, options = {})
-      pattern = adjust_if_regexp(link_text_or_regexp)
+      if link_text_or_regexp.is_a?(Regexp)
+        pattern = "evalregex:#{link_text_or_regexp.inspect}"
+      else
+        pattern = link_text_or_regexp.to_s
+      end
+
       locator = "webratlink=#{pattern}"
       selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
@@ -166,7 +173,19 @@ module Webrat
         sleep 0.25
       end
 
-      raise Webrat::TimeoutError.new(message + " (after #{timeout} sec)")
+      error_message = "#{message} (after #{timeout} sec)"
+
+      if $browser
+        error_message += <<-EOS
+
+
+HTML of the page was:
+
+#{selenium.get_html_source}"
+EOS
+      end
+
+      raise Webrat::TimeoutError.new(error_message)
       true
     end
 

data/lib/webrat/selenium/silence_stream.rb

@@ -15,4 +15,4 @@ module Webrat
       end
     end
   end
-end
+end

data/lib/webrat/selenium.rb

@@ -1,5 +1,4 @@
 require "webrat"
-gem "selenium-client", ">=1.2.14"
 require "selenium/client"
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"
@@ -69,13 +68,3 @@ module Webrat
     end
   end
 end
-
-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