jwilger-webrat 0.4.4.2 → 0.4.4.3

data/History.txt

@@ -11,7 +11,11 @@
   * Filled in tests on click link lh 195 (diabolo)
   * Added current_url to selenium session lh 215 (Luke Amdor)
   * Added silence spec to selenium lh 238 (Martin Gamsjaeger aka snusnu)
-  * Added ability to configure the browser startup timeout for selenium lh 242 (Mike Gaffney)
+  * Added ability to configure the browser startup timeout for selenium lh 242 (Mike Gaffney, Mark Dodwell)
+  * Added delegation for field_named lh194 (pivotal labs)
+  * Added fix to keep from escaping field values in mechanize mode lh256 (jish)
+  * Adding fixes for click button/link and made the integration specs pass for the same in selenium lh254 (Ldiehl, Matthias Marschall)
+  * Adding clicking link by id in selenium mode lh221 (larrytheliquid)
 
 == 0.4.4 / 2009-04-06
 

data/lib/webrat.rb

@@ -7,7 +7,7 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.4.4.2'
+  VERSION = '0.4.4.3'
 
   def self.require_xml
     if on_java?

data/lib/webrat/core/configuration.rb

@@ -29,7 +29,7 @@ module Webrat
     # Save and open pages with error status codes (500-599) in a browser? Defualts to true.
     attr_writer :open_error_files
 
-    # Which rails environment should the selenium tests be run in? Defaults to selenium.
+    # Which rails environment should the selenium tests be run in? Defaults to test.
     attr_accessor :application_environment
     webrat_deprecate :selenium_environment, :application_environment
     webrat_deprecate :selenium_environment=, :application_environment=
@@ -57,6 +57,9 @@ module Webrat
     # Set the timeout for waiting for the browser process to start
     attr_accessor :selenium_browser_startup_timeout
 
+    # Set the timeout for waiting for actions within the browser
+    attr_accessor :browser_action_timeout
+
     # How many redirects to the same URL should be halted as an infinite redirect
     # loop? Defaults to 10
     attr_accessor :infinite_redirect_limit
@@ -72,6 +75,7 @@ module Webrat
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
       self.selenium_browser_startup_timeout = 5
+      self.browser_action_timeout = 5
     end
 
     def parse_with_nokogiri? #:nodoc:

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

@@ -87,6 +87,8 @@ module Webrat
         parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
+      when :mechanize
+        { name => value }
       else
         { name => escaped_value }
       end

data/lib/webrat/core/methods.rb

@@ -57,9 +57,7 @@ module Webrat
       :field_by_xpath,
       :field_with_id,
       :selenium,
-      :simulate, :automate
-
-
-
+      :simulate, :automate,
+      :field_named
   end
 end

data/lib/webrat/core/session.rb

@@ -255,6 +255,7 @@ For example:
     def_delegators :current_scope, :field_by_xpath
     def_delegators :current_scope, :field_with_id
     def_delegators :current_scope, :select_option
+    def_delegators :current_scope, :field_named
 
   private
 
@@ -271,7 +272,7 @@ For example:
     end
 
     def current_host
-      URI.parse(current_url).host || "www.example.com"
+      URI.parse(current_url).host || @custom_headers["Host"] || "www.example.com"
     end
 
     def response_location_host

data/lib/webrat/selenium.rb

@@ -1,7 +1,6 @@
 require "webrat"
 gem "selenium-client", ">=1.2.14"
 require "selenium/client"
-
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"

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

@@ -1,12 +1,19 @@
 if (locator == '*') {
   return selenium.browserbot.locationStrategies['xpath'].call(this, "//input[@type='submit']", inDocument, inWindow)
 }
+var buttons = inDocument.getElementsByTagName('button');
 var inputs = inDocument.getElementsByTagName('input');
-return $A(inputs).find(function(candidate){
-  inputType = candidate.getAttribute('type');
-  if (inputType == 'submit' || inputType == 'image') {
-    var buttonText = $F(candidate);
-    return (PatternMatcher.matches(locator, buttonText));
-  }
-  return false;
+var result = $A(inputs).concat($A(buttons)).find(function(candidate){
+	var type = candidate.getAttribute('type');
+	if (type == 'submit' || type == 'image'  || type == 'button') {
+		var matches_id = PatternMatcher.matches(locator, candidate.id);
+		var matches_value = PatternMatcher.matches(locator, candidate.value);
+		var matches_html = PatternMatcher.matches(locator, candidate.innerHTML);
+		var matches_alt = PatternMatcher.matches(locator, candidate.alt);
+		if (matches_id || matches_value || matches_html || matches_alt) {
+			return true;
+		}
+	}
+	return false;
 });
+return result;

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

@@ -1,6 +1,8 @@
 var links = inDocument.getElementsByTagName('a');
 var candidateLinks = $A(links).select(function(candidateLink) {
-  return PatternMatcher.matches(locator, getText(candidateLink));
+  var textMatched = PatternMatcher.matches(locator, getText(candidateLink));
+  var idMatched = PatternMatcher.matches(locator, candidateLink.id);
+  return textMatched || idMatched;
 });
 if (candidateLinks.length == 0) {
   return null;

data/lib/webrat/selenium/selenium_session.rb

@@ -34,15 +34,16 @@ module Webrat
       yield
     end
 
-    def visit(url)
+    def visit(url, timeout = nil)
       selenium.open(url)
+      selenium.wait_for_page_to_load(timeout)
     end
 
     webrat_deprecate :visits, :visit
 
     def fill_in(field_identifier, options)
       locator = "webrat=#{Regexp.escape(field_identifier)}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.type(locator, "#{options[:with]}")
     end
 
@@ -69,7 +70,7 @@ module Webrat
       pattern ||= '*'
       locator = "button=#{pattern}"
 
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.click locator
     end
 
@@ -78,7 +79,7 @@ module Webrat
     def click_link(link_text_or_regexp, options = {})
       pattern = adjust_if_regexp(link_text_or_regexp)
       locator = "webratlink=#{pattern}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.click locator
     end
 
@@ -86,7 +87,7 @@ module Webrat
 
     def click_link_within(selector, link_text, options = {})
       locator = "webratlinkwithin=#{selector}|#{link_text}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.click locator
     end
 
@@ -101,7 +102,7 @@ module Webrat
         select_locator = "webratselectwithoption=#{option_text}"
       end
 
-      selenium.wait_for_element select_locator, :timeout_in_seconds => 5
+      selenium.wait_for_element select_locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.select(select_locator, option_text)
     end
 
@@ -109,7 +110,7 @@ module Webrat
 
     def choose(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.click locator
     end
 
@@ -117,7 +118,7 @@ module Webrat
 
     def check(label_text)
       locator = "webrat=#{label_text}"
-      selenium.wait_for_element locator, :timeout_in_seconds => 5
+      selenium.wait_for_element locator, :timeout_in_seconds => Webrat.configuration.browser_action_timeout
       selenium.click locator
     end
     alias_method :uncheck, :check

data/lib/webrat/selenium/silence_stream.rb

@@ -1,14 +1,18 @@
 module Webrat
   module Selenium
     module SilenceStream
-      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
+      # active_support already defines silence_stream, no need to do that again if it's already present.
+      # http://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/kernel/reporting.rb
+      unless Kernel.respond_to?(:silence_stream)
+        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
+      end      
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jwilger-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.4.2
+  version: 0.4.4.3
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 -07:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency