webrat 0.5.3 → 0.6.0

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,11 @@
+# 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/integrations/rspec-rails'
+#
+require "nokogiri"
+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.rb

@@ -68,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

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/application_servers/external.rb

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

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

@@ -1,16 +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');
+
 if ((labelFor == null) && (locatedLabel.hasChildNodes())) {
-  return locatedLabel.firstChild; //TODO: should find the first form field, not just any node
+  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

@@ -74,8 +74,8 @@ module Webrat
 
       def stop
         silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 
-                                                       Webrat.configuration.selenium_server_port, 
+          ::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
@@ -162,7 +169,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/spec/integration/mechanize/spec/spec_helper.rb

@@ -21,7 +21,9 @@ Spec::Runner.configure do |config|
   end
 
   config.after :suite do
-    Process.kill("TERM", File.read("rack.pid").to_i)
+    if File.exists?("rack.pid")
+      Process.kill("TERM", File.read("rack.pid").to_i)
+    end
   end
 end
 

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

@@ -40,4 +40,7 @@ class WebratController < ApplicationController
     render :text => params.to_json
   end
 
+  def within
+  end
+
 end

data/spec/integration/rails/app/views/buttons/show.html.erb

@@ -1,11 +1,9 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag "/buttons" do %>
-  <input type="button" id="input_button_id" value="input_button_value" />
   <input type="submit" id="input_submit_id" value="input_submit_value" />
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="" />
 
-  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

data/spec/integration/rails/app/views/webrat/buttons.html.erb

@@ -1,11 +1,9 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag submit_path do %>
-  <input type="button" id="input_button_id" value="input_button_value">
   <input type="submit" id="input_submit_id" value="input_submit_value">
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="">
 
-  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

data/spec/integration/rails/app/views/webrat/within.html.erb

@@ -0,0 +1,3 @@
+<div id="new_object">
+  <a href="/">Edit Object</a>
+</div>

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

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+# RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 

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

@@ -12,6 +12,7 @@ ActionController::Routing::Routes.draw do |map|
     webrat.before_redirect_form     "/before_redirect_form",    :action => "before_redirect_form"
     webrat.redirect_to_show_params  "/redirect_to_show_params", :action => "redirect_to_show_params"
     webrat.show_params              "/show_params",             :action => "show_params"
+    webrat.within                   "/within",                  :action => "within"
 
     webrat.root :action => "form"
   end

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

@@ -1,80 +1,66 @@
 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"
+    assert_contain "success"
   end
   test "should click button with type submit by value" do
     visit buttons_path
     click_button "button_submit_value"
+    assert_contain "success"
   end
   test "should click button with type submit by html" do
     visit buttons_path
     click_button "button_submit_text"
+    assert_contain "success"
   end
 
   # <button type="image" ...>
   test "should click button with type image by id" do
     visit buttons_path
     click_button "button_image_id"
+    assert_contain "success"
   end
   test "should click button with type image by value" do
     visit buttons_path
     click_button "button_image_value"
+    assert_contain "success"
   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"
+    assert_contain "success"
   end
 
   # <input type="submit" ...>
   test "should click input with type submit by id" do
     visit buttons_path
     click_button "input_submit_id"
+    assert_contain "success"
   end
   test "should click input with type submit by value" do
     visit buttons_path
     click_button "input_submit_value"
+    assert_contain "success"
   end
 
   # <input type="image" ...>
   test "should click input with type image by id" do
     visit buttons_path
     click_button "input_image_id"
+    assert_contain "success"
   end
   test "should click input with type image by value" do
     visit buttons_path
     click_button "input_image_value"
+    assert_contain "success"
   end
   test "should click input with type image by alt" do
     visit buttons_path
     click_button "input_image_alt"
+    assert_contain "success"
   end
-
-end
+end

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

@@ -21,4 +21,4 @@ class FillInTest < ActionController::IntegrationTest
     visit fields_path
     fill_in "[Field]:", :with => "value"
   end
-end
+end

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

@@ -24,4 +24,4 @@ class LinkClickTest < ActionController::IntegrationTest
     click_link "Link With (parens)"
     assert_contain("Link:link_with_parens")
   end
-end
+end

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

@@ -22,11 +22,14 @@ class WebratTest < ActionController::IntegrationTest
     check "TOS"
     select "January"
     click_button "Test"
+    assert_contain "OK"
   end
 
   test "should check the value of a field" do
-    visit "/"
-    assert field_labeled("Prefilled").value, "text"
+    webrat.simulate do
+      visit "/"
+      assert field_labeled("Prefilled").value, "text"
+    end
   end
 
   test "should not carry params through redirects" do
@@ -43,20 +46,26 @@ class WebratTest < ActionController::IntegrationTest
 
   test "should follow internal redirects" do
     visit internal_redirect_path
-    assert !response.redirect?
+    webrat.simulate do
+      assert !response.redirect?
+    end
     assert response.body.include?("OK")
   end
 
   test "should not follow external redirects" do
-    visit external_redirect_path
-    assert response.redirect?
+    webrat.simulate do
+      visit external_redirect_path
+      assert response.redirect?
+    end
   end
 
   test "should recognize the host header to follow redirects properly" do
-    header "Host", "foo.bar"
-    visit host_redirect_path
-    assert !response.redirect?
-    assert response.body.include?("OK")
+    webrat.simulate do
+      header "Host", "foo.bar"
+      visit host_redirect_path
+      assert !response.redirect?
+      assert response.body.include?("OK")
+    end
   end
 
   test "should click link by text" do
@@ -81,6 +90,23 @@ class WebratTest < ActionController::IntegrationTest
     assert_have_selector "h1"
   end
 
+  test "should accept an Object argument to #within and translate using dom_id" do
+    webrat.simulate do
+      visit within_path
+
+      object = Object.new
+      def object.id
+        nil
+      end
+
+      within(object) do
+        click_link "Edit Object"
+      end
+
+      assert_contain "Webrat Form"
+    end
+  end
+
   # Firefox detects and prevents infinite redirects under Selenium
   unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'
      test "should detect infinite redirects" do