webrat 0.4.4 → 0.4.5

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,9 @@
 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);
+  var titleMatched = PatternMatcher.matches(locator, candidateLink.title);
+  return textMatched || idMatched || titleMatched;
 });
 if (candidateLinks.length == 0) {
   return null;

data/lib/webrat/selenium/matchers.rb

@@ -1,4 +1,4 @@
 require "webrat/selenium/matchers/have_xpath"
 require "webrat/selenium/matchers/have_selector"
 # require "webrat/selenium/matchers/have_tag"
-require "webrat/selenium/matchers/have_content"
+require "webrat/selenium/matchers/have_content"

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

@@ -5,14 +5,14 @@ module Webrat
         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
@@ -47,7 +47,7 @@ module Webrat
       def contain(content)
         HasContent.new(content)
       end
-      
+
       # Asserts that the body of the response contain
       # the supplied string or regexp
       def assert_contain(content)
@@ -63,4 +63,4 @@ module Webrat
       end
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Webrat
         def initialize(expected)
           @expected = expected
         end
-        
+
         def matches?(response)
           response.session.wait_for do
             response.selenium.is_element_present("css=#{@expected}")
@@ -26,11 +26,11 @@ module Webrat
           "expected following text to not match selector #{@expected}:\n#{@document}"
         end
       end
-      
+
       def have_selector(content)
         HaveSelector.new(content)
       end
-      
+
       # Asserts that the body of the response contains
       # the supplied selector
       def assert_have_selector(expected)
@@ -46,4 +46,4 @@ module Webrat
       end
     end
   end
-end
+end

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

@@ -1,72 +1,72 @@
 module Webrat
   module Selenium
     module Matchers
-  
+
       class HaveTag < HaveSelector #:nodoc:
         # ==== Returns
         # String:: The failure message.
         def failure_message
           "expected following output to contain a #{tag_inspect} tag:\n#{@document}"
         end
-  
+
         # ==== Returns
         # String:: The failure message to be displayed in negative matches.
         def negative_failure_message
           "expected following output to omit a #{tag_inspect}:\n#{@document}"
         end
-  
+
         def tag_inspect
           options = @expected.last.dup
           content = options.delete(:content)
-  
+
           html = "<#{@expected.first}"
           options.each do |k,v|
             html << " #{k}='#{v}'"
           end
-  
+
           if content
             html << ">#{content}</#{@expected.first}>"
           else
             html << "/>"
           end
-  
+
           html
         end
-  
+
         def query
           options  = @expected.last.dup
           selector = @expected.first.to_s
-  
+
           selector << ":contains('#{options.delete(:content)}')" if options[:content]
-  
+
           options.each do |key, value|
             selector << "[#{key}='#{value}']"
           end
-  
+
           Nokogiri::CSS.parse(selector).map { |ast| ast.to_xpath }
         end
       end
-  
+
       def have_tag(name, attributes = {}, &block)
         HaveTag.new([name, attributes], &block)
       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])
         assert ht.matches?(response), ht.failure_message
       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])
         assert !ht.matches?(response), ht.negative_failure_message
       end
-  
+
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ module Webrat
         def initialize(expected)
           @expected = expected
         end
-        
+
         def matches?(response)
           response.session.wait_for do
             response.selenium.is_element_present("xpath=#{@expected}")
@@ -26,11 +26,11 @@ module Webrat
           "expected following text to not match xpath #{@expected}:\n#{@document}"
         end
       end
-      
+
       def have_xpath(xpath)
         HaveXpath.new(xpath)
       end
-      
+
       def assert_have_xpath(expected)
         hs = HaveXpath.new(expected)
         assert hs.matches?(response), hs.failure_message
@@ -42,4 +42,4 @@ module Webrat
       end
     end
   end
-end
+end

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -1,49 +1,53 @@
 module Webrat
   module Selenium
-    
+
     class SeleniumRCServer
-      
+
+      include Webrat::Selenium::SilenceStream
+
       def self.boot
         new.boot
       end
-      
+
       def boot
         return if selenium_grid?
-        
+
         start
         wait
         stop_at_exit
       end
-      
+
       def start
         silence_stream(STDOUT) do
           remote_control.start :background => true
         end
       end
-      
+
       def stop_at_exit
         at_exit do
           stop
         end
       end
-      
+
       def remote_control
         return @remote_control if @remote_control
-        
-        @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5)
+
+        @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
+                                                                       Webrat.configuration.selenium_server_port,
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
         @remote_control.jar_file = jar_path
-        
+
         return @remote_control
       end
-      
+
       def jar_path
         File.expand_path(__FILE__ + "../../../../../vendor/selenium-server.jar")
       end
-      
+
       def selenium_grid?
         Webrat.configuration.selenium_server_address
       end
-      
+
       def wait
         $stderr.print "==> Waiting for Selenium RC server on port #{Webrat.configuration.selenium_server_port}... "
         wait_for_socket
@@ -51,7 +55,7 @@ module Webrat
       rescue SocketError
         fail
       end
-      
+
       def wait_for_socket
         silence_stream(STDOUT) do
           TCPSocket.wait_for_service_with_timeout \
@@ -60,21 +64,23 @@ module Webrat
             :timeout  => 15 # seconds
         end
       end
-      
+
       def fail
         $stderr.puts
         $stderr.puts
         $stderr.puts "==> Failed to boot the Selenium RC server... exiting!"
         exit
       end
-      
+
       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
-      
+
     end
-    
+
   end
 end

data/lib/webrat/selenium/selenium_session.rb

@@ -1,6 +1,7 @@
 require "webrat/core/save_and_open_page"
 require "webrat/selenium/selenium_rc_server"
-require "webrat/selenium/application_server"
+require "webrat/selenium/application_server_factory"
+require "webrat/selenium/application_servers/base"
 
 module Webrat
   class TimeoutError < WebratError
@@ -22,6 +23,7 @@ module Webrat
 
   class SeleniumSession
     include Webrat::SaveAndOpenPage
+    include Webrat::Selenium::SilenceStream
 
     def initialize(*args) # :nodoc:
     end
@@ -40,7 +42,7 @@ module Webrat
     webrat_deprecate :visits, :visit
 
     def fill_in(field_identifier, options)
-      locator = "webrat=#{Regexp.escape(field_identifier)}"
+      locator = "webrat=#{field_identifier}"
       selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.type(locator, "#{options[:with]}")
     end
@@ -55,6 +57,10 @@ module Webrat
       selenium.get_html_source
     end
 
+    def current_url
+      selenium.location
+    end
+
     def click_button(button_text_or_regexp = nil, options = {})
       if button_text_or_regexp.is_a?(Hash) && options == {}
         pattern, options = nil, button_text_or_regexp
@@ -145,8 +151,10 @@ module Webrat
 
         begin
           value = yield
-        rescue ::Spec::Expectations::ExpectationNotMetError, ::Selenium::CommandError, Webrat::WebratError
-          value = nil
+        rescue Exception => e
+          unless is_ignorable_wait_for_exception?(e)
+            raise e
+          end
         end
 
         return value if value
@@ -177,23 +185,22 @@ module Webrat
       else
         $browser.capture_screenshot(filename)
       end
-        open_in_browser(filename)
+      open_in_browser(filename)
+
     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)
+    protected
+    def is_ignorable_wait_for_exception?(exception) #:nodoc:
+      if defined?(::Spec::Expectations::ExpectationNotMetError)
+        return true if exception.class == ::Spec::Expectations::ExpectationNotMetError
+      end
+      return true if [::Selenium::CommandError, Webrat::WebratError].include?(exception.class)
+      return false
     end
 
     def setup #:nodoc:
       Webrat::Selenium::SeleniumRCServer.boot
-      Webrat::Selenium::ApplicationServer.boot
+      Webrat::Selenium::ApplicationServerFactory.app_server_instance.boot
 
       create_browser
       $browser.start
@@ -206,9 +213,9 @@ module Webrat
 
     def create_browser
       $browser = ::Selenium::Client::Driver.new(Webrat.configuration.selenium_server_address || "localhost",
-          Webrat.configuration.selenium_server_port, Webrat.configuration.selenium_browser_key, "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port}")
+      Webrat.configuration.selenium_server_port, Webrat.configuration.selenium_browser_key, "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port}")
       $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
-      
+
       at_exit do
         silence_stream(STDOUT) do
           $browser.stop

data/lib/webrat/selenium/silence_stream.rb

@@ -0,0 +1,18 @@
+module Webrat
+  module Selenium
+    module SilenceStream
+      # 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

data/spec/fakes/test_session.rb

@@ -0,0 +1,34 @@
+module Webrat #:nodoc:
+  def self.session_class #:nodoc:
+    TestSession
+  end
+
+  class TestSession < Session #:nodoc:
+    attr_accessor :response_body
+    attr_writer :response_code
+
+    def doc_root
+      File.expand_path(File.join(".", "public"))
+    end
+
+    def response
+      @response ||= Object.new
+    end
+
+    def response_code
+      @response_code || 200
+    end
+
+    def get(url, data, headers = nil)
+    end
+
+    def post(url, data, headers = nil)
+    end
+
+    def put(url, data, headers = nil)
+    end
+
+    def delete(url, data, headers = nil)
+    end
+  end
+end