diabolo-webrat 0.4.4.1 → 0.4.4.2

data/History.txt

@@ -11,6 +11,13 @@
   * 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, 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)
+  * Adding fix for have_selector and have_xpath in descendent blocks lh234 (Thomas Jack)
+  * Adding fix for fields with labels with special characters (Thomas Jack, Mike Gaffney, Bryan Hemlkamp)
 
 == 0.4.4 / 2009-04-06
 

data/lib/webrat/core/configuration.rb

@@ -53,6 +53,9 @@ module Webrat
 
     # Set the key that Selenium uses to determine the browser running. Default *firefox
     attr_accessor :selenium_browser_key
+    
+    # Set the timeout for waiting for the browser process to start
+    attr_accessor :selenium_browser_startup_timeout
 
     # How many redirects to the same URL should be halted as an infinite redirect
     # loop? Defaults to 10
@@ -68,6 +71,7 @@ module Webrat
       self.selenium_server_port = 4444
       self.infinite_redirect_limit = 10
       self.selenium_browser_key = '*firefox'
+      self.selenium_browser_startup_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/matchers/have_xpath.rb

@@ -32,7 +32,7 @@ module Webrat
 
       def rexml_matches(stringlike)
         if REXML::Node === stringlike || Array === stringlike
-          @query = query.map { |q| q.gsub(%r'//', './') }
+          @query = query.map { |q| q.gsub(%r'^//', './/') }
         else
           @query = query
         end
@@ -52,7 +52,7 @@ module Webrat
 
       def nokogiri_matches(stringlike)
         if Nokogiri::XML::NodeSet === stringlike
-          @query = query.gsub(%r'//', './')
+          @query = query.gsub(%r'^//', './/')
         else
           @query = query
         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
 

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/label.js

@@ -1,8 +1,7 @@
 var allLabels = inDocument.getElementsByTagName("label");
 var candidateLabels = $A(allLabels).select(function(candidateLabel){
-  var regExp = new RegExp('^' + locator + '\\b', 'i');
   var labelText = getText(candidateLabel).strip();
-  return (labelText.search(regExp) >= 0);
+  return labelText.toLowerCase() == locator.toLowerCase();
 });
 if (candidateLabels.length == 0) {
   return null;      

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/selenium_rc_server.rb

@@ -32,7 +32,9 @@ module Webrat
       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, 
+                                                                       Webrat.configuration.selenium_browser_startup_timeout)
         @remote_control.jar_file = jar_path
 
         return @remote_control

data/lib/webrat/selenium/selenium_session.rb

@@ -41,7 +41,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

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

data/lib/webrat/selenium.rb

@@ -1,13 +1,7 @@
 require "webrat"
 gem "selenium-client", ">=1.2.14"
 require "selenium/client"
-
-# 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)
-  require "webrat/selenium/silence_stream"
-end
-
+require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"
 require "webrat/selenium/matchers"
 require "webrat/core_extensions/tcp_socket"

data/spec/integration/rails/app/controllers/buttons_controller.rb

@@ -0,0 +1,7 @@
+class ButtonsController < ApplicationController
+  def show
+  end
+  def create
+    render :text => "success"
+  end
+end

data/spec/integration/rails/app/controllers/fields_controller.rb

@@ -0,0 +1,4 @@
+class FieldsController < ApplicationController
+  def show
+  end
+end

data/spec/integration/rails/app/controllers/links_controller.rb

@@ -0,0 +1,7 @@
+class LinksController < ApplicationController
+  def show
+    if params[:value]
+      render :text => "Link:#{params[:value]}"
+    end
+  end
+end

data/spec/integration/rails/app/controllers/webrat_controller.rb

@@ -5,35 +5,35 @@ class FakeModel
 end
 
 class WebratController < ApplicationController
-
+  
   def form
   end
-
+  
   def submit
     render :text => "OK <a href='/' id='link_id'>Test Link Text</a>"
   end
-
+  
   def internal_redirect
     redirect_to submit_path
   end
-
+  
   def infinite_redirect
     redirect_to infinite_redirect_path
   end
-
+  
   def external_redirect
     redirect_to "http://google.com"
   end
-
+  
   def before_redirect_form
   end
-
+  
   def redirect_to_show_params
     redirect_to show_params_path(:custom_param => "123")
   end
-
+  
   def show_params
     render :text => params.to_json
   end
-
+  
 end

data/spec/integration/rails/app/helpers/buttons_helper.rb

@@ -0,0 +1,2 @@
+module ButtonsHelper
+end

data/spec/integration/rails/app/helpers/fields_helper.rb

@@ -0,0 +1,2 @@
+module FieldsHelper
+end

data/spec/integration/rails/app/helpers/links_helper.rb

@@ -0,0 +1,2 @@
+module LinksHelper
+end

data/spec/integration/rails/config/routes.rb

@@ -1,4 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
+  map.resource 'links', :only => [:show]
+  map.resource 'buttons', :only => [:show, :create]
+  map.resource 'fields', :only => [:show]
   map.with_options :controller => "webrat" do |webrat|
     webrat.submit             "/submit",            :action => "submit"
     webrat.internal_redirect  "/internal_redirect", :action => "internal_redirect"

data/spec/integration/rails/test/integration/button_click_test.rb

@@ -0,0 +1,80 @@
+require 'test_helper'
+
+class ButtonClickTest < ActionController::IntegrationTest
+  # <button type="button" ...>
+  test "should click button with type button by id" do
+    visit buttons_path
+    click_button "button_button_id"
+  end
+  test "should click button with type button by value" do
+    visit buttons_path
+    click_button "button_button_value"
+  end
+  test "should click button with type button by html" do
+    visit buttons_path
+    click_button "button_button_text"
+  end
+
+  # <button type="submit" ...>
+  test "should click button with type submit by id" do
+    visit buttons_path
+    click_button "button_submit_id"
+  end
+  test "should click button with type submit by value" do
+    visit buttons_path
+    click_button "button_submit_value"
+  end
+  test "should click button with type submit by html" do
+    visit buttons_path
+    click_button "button_submit_text"
+  end
+
+  # <button type="image" ...>
+  test "should click button with type image by id" do
+    visit buttons_path
+    click_button "button_image_id"
+  end
+  test "should click button with type image by value" do
+    visit buttons_path
+    click_button "button_image_value"
+  end
+  test "should click button with type image by html" do
+    visit buttons_path
+    click_button "button_image_text"
+  end
+  
+  # <input type="button" ...>
+  test "should click image with type button by id" do
+    visit buttons_path
+    click_button "input_button_id"
+  end
+  test "should click input with type button by value" do
+    visit buttons_path
+    click_button "input_button_value"
+  end
+
+  # <input type="submit" ...>
+  test "should click input with type submit by id" do
+    visit buttons_path
+    click_button "input_submit_id"
+  end
+  test "should click input with type submit by value" do
+    visit buttons_path
+    click_button "input_submit_value"
+  end
+
+  # <input type="image" ...>
+  test "should click input with type image by id" do
+    visit buttons_path
+    click_button "input_image_id"
+  end
+  test "should click input with type image by value" do
+    visit buttons_path
+    click_button "input_image_value"
+  end
+  test "should click input with type image by alt" do
+    visit buttons_path
+    click_button "input_image_alt"
+  end
+  
+end

data/spec/integration/rails/test/integration/fill_in_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class FillInTest < ActionController::IntegrationTest
+  test "should fill in text field by name" do
+    visit fields_path
+    fill_in "field_by_name", :with => "value"
+  end
+  test "should fill in text field by name, rails naming lh257" do
+    visit fields_path
+    fill_in "rails[naming]", :with => "value"
+  end
+  test "should fill in text field by id" do
+    visit fields_path
+    fill_in "field_by_id", :with => "value"
+  end
+  test "should fill in text field by label via id" do
+    visit fields_path
+    fill_in "FieldByLabelId", :with => "value"
+  end
+  test "should fill in text field by label with special characters" do
+    visit fields_path
+    fill_in "[Field]:", :with => "value"
+  end
+end

data/spec/integration/rails/test/integration/link_click_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class LinkClickTest < ActionController::IntegrationTest
+  test "should click link by text" do
+    visit links_path
+    click_link "LinkByText"
+    assert_contain("Link:LinkByText")
+  end
+
+  test "should click link by id" do
+    visit links_path
+    click_link "link_by_id"
+    assert_contain("Link:link_by_id")
+  end
+  
+  test "should click link by title" do
+    visit links_path
+    click_link "LinkByTitle"
+    assert_contain("Link:LinkByTitle")
+  end
+end

data/spec/integration/rails/test/integration/webrat_test.rb

@@ -2,9 +2,12 @@ require 'test_helper'
 
 class WebratTest < ActionController::IntegrationTest
 
-  test "should visit fully qualified urls" do
-    visit root_url(:host => "chunkybacon.example.com")
-    assert_equal "chunkybacon", request.subdomains.first
+  #Firefox raises a security concern under Selenium
+  unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'
+    test "should visit fully qualified urls" do
+      visit root_url(:host => "chunkybacon.example.com")
+      assert_equal "chunkybacon", request.subdomains.first
+    end
   end
 
   test "should visit pages" do
@@ -46,18 +49,6 @@ class WebratTest < ActionController::IntegrationTest
     assert response.redirect?
   end
 
-  test "should click link by text" do
-    visit internal_redirect_path
-    click_link "Test Link Text"
-    assert_contain("Webrat Form")
-  end
-
-  test "should click link by id" do
-    visit internal_redirect_path
-    click_link "link_id"
-    assert_contain("Webrat Form")
-  end
-
   test "should be able to assert xpath" do
     visit root_path
     assert_have_xpath "//h1"
@@ -68,9 +59,12 @@ class WebratTest < ActionController::IntegrationTest
     assert_have_selector "h1"
   end
 
-  test "should detect infinite redirects" do
-    assert_raises Webrat::InfiniteRedirectError do
-      visit infinite_redirect_path
+  # Firefox detects and prevents infinite redirects under Selenium
+  unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'
+     test "should detect infinite redirects" do
+       assert_raises Webrat::InfiniteRedirectError do
+         visit infinite_redirect_path
+       end
     end
   end
 

data/spec/private/core/configuration_spec.rb

@@ -92,6 +92,15 @@ describe Webrat::Configuration do
     it 'should default selenium browser key to *firefox' do
       @config.selenium_browser_key.should == '*firefox'
     end
+    
+    it 'should default selenium browser startup timeout to 5 seconds' do
+      @config.selenium_browser_startup_timeout.should == 5
+    end
+    
+    it 'should allow overriding of the browser startup timeout' do
+      @config.selenium_browser_startup_timeout = 10
+      @config.selenium_browser_startup_timeout.should == 10
+    end
   end
 
 end

data/spec/private/core/field_spec.rb

@@ -66,4 +66,20 @@ module Webrat
       radio_button.should_not be_checked
     end
   end
+
+  describe TextField do
+    it 'should not escape values in mechanize mode' do
+      Webrat.configuration.mode = :mechanize
+
+      html = <<-HTML
+        <html>
+          <input type="text" name="email" value="user@example.com" />
+        </html>
+      HTML
+
+      element    = Webrat::XML.css_search(Webrat::XML.document(html), 'input').first
+      text_field = TextField.new(nil, element)
+      text_field.to_param.should == { 'email' => 'user@example.com' }
+    end
+  end
 end

data/spec/public/matchers/have_selector_spec.rb

@@ -13,6 +13,7 @@ describe "have_selector" do
         <ul>
           <li>First</li>
           <li>Second</li>
+          <li><a href="http://example.org/">Third</a></li>
         </ul>
       </div>
     HTML
@@ -52,12 +53,12 @@ describe "have_selector" do
 
   describe "specifying counts" do
     it "should be able to specify the number of occurences of the tag" do
-      @body.should have_selector("li", :count => 2)
+      @body.should have_selector("li", :count => 3)
     end
 
     it "should not match if the count is wrong" do
       lambda {
-        @body.should have_selector("li", :count => 3)
+        @body.should have_selector("li", :count => 4)
       }.should raise_error(Spec::Expectations::ExpectationNotMetError)
     end
   end
@@ -97,6 +98,12 @@ describe "have_selector" do
         n.should have_selector("li", :content => "Second")
       end
     end
+
+    it "should work with descendants of the matched elements" do
+      @body.should have_selector("ul") do |n|
+        n.should have_selector("a", :content => "Third")
+      end
+    end
   end
 
   describe "Test::Unit assertions" do

data/spec/public/matchers/have_xpath_spec.rb

@@ -13,6 +13,7 @@ describe "have_xpath" do
         <ul>
           <li>First</li>
           <li>Second</li>
+          <li><a href="http://example.org">Third</a></li>
         </ul>
       </div>
     HTML
@@ -88,6 +89,18 @@ describe "have_xpath" do
     }.should raise_error(Spec::Expectations::ExpectationNotMetError)
   end
 
+  it "should match descendants of the matched elements in the block" do
+    @body.should have_xpath("//ul") do |node|
+      node.should have_xpath("//a[@href='http://example.org']")
+    end
+  end
+  
+  it "should allow descendant selectors in the block" do
+    @body.should have_xpath("//div[@id='main']") do |node|
+      node.should have_xpath("//ul//a")
+    end
+  end
+
   describe 'asserts for xpath' do
     include Test::Unit::Assertions
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: diabolo-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.4.1
+  version: 0.4.4.2
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,7 +157,13 @@ test_files:
 - spec/integration/rack/test/test_helper.rb
 - spec/integration/rack/test/webrat_rack_test.rb
 - spec/integration/rails/app/controllers/application.rb
+- spec/integration/rails/app/controllers/buttons_controller.rb
+- spec/integration/rails/app/controllers/fields_controller.rb
+- spec/integration/rails/app/controllers/links_controller.rb
 - spec/integration/rails/app/controllers/webrat_controller.rb
+- spec/integration/rails/app/helpers/buttons_helper.rb
+- spec/integration/rails/app/helpers/fields_helper.rb
+- spec/integration/rails/app/helpers/links_helper.rb
 - spec/integration/rails/config/boot.rb
 - spec/integration/rails/config/environment.rb
 - spec/integration/rails/config/environments/development.rb
@@ -167,6 +173,9 @@ test_files:
 - spec/integration/rails/config/initializers/mime_types.rb
 - spec/integration/rails/config/initializers/new_rails_defaults.rb
 - spec/integration/rails/config/routes.rb
+- spec/integration/rails/test/integration/button_click_test.rb
+- spec/integration/rails/test/integration/fill_in_test.rb
+- spec/integration/rails/test/integration/link_click_test.rb
 - spec/integration/rails/test/integration/webrat_test.rb
 - spec/integration/rails/test/test_helper.rb
 - spec/integration/sinatra/classic_app.rb