webrat 0.7.1 → 0.7.2.beta.1

data/lib/webrat.rb

@@ -2,7 +2,7 @@ require "rack"
 require "nokogiri"
 
 module Webrat
-  VERSION = "0.7.1"
+  VERSION = "0.7.2.beta.1"
 
   autoload :MechanizeAdapter, "webrat/adapters/mechanize"
   autoload :MerbAdapter, "webrat/adapters/merb"

data/lib/webrat/core/locators/link_locator.rb

@@ -10,7 +10,11 @@ module Webrat
       end
 
       def link_element
-        matching_links.min { |a, b| a.inner_text.length <=> b.inner_text.length }
+        matching_links.min { |a, b|
+          a_score = a.inner_text =~ matcher ? a.inner_text.length : 100
+          b_score = b.inner_text =~ matcher ? b.inner_text.length : 100
+          a_score <=> b_score
+        }
       end
 
       def matching_links
@@ -21,16 +25,20 @@ module Webrat
       end
 
       def matches_text?(link)
-        if @value.is_a?(Regexp)
-          matcher = @value
-        else
-          matcher = /#{Regexp.escape(@value.to_s)}/i
-        end
-
         replace_nbsp(link.inner_text) =~ matcher ||
         replace_nbsp_ref(link.inner_html) =~ matcher ||
         link["title"] =~ matcher
       end
+      
+      def matcher
+        @matcher ||= begin
+          if @value.is_a?(Regexp)
+            @value
+          else
+            /#{Regexp.escape(@value.to_s)}/i
+          end
+        end
+      end
 
       def matches_id?(link)
         if @value.is_a?(Regexp)

data/lib/webrat/core/locators/select_option_locator.rb

@@ -15,7 +15,7 @@ module Webrat
 
       def locate
         if @id_or_name_or_label
-          field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField).locate!
+          field = FieldLocator.new(@session, @dom, @id_or_name_or_label, SelectField, MultipleSelectField).locate!
 
           field.options.detect do |o|
             if @option_text.is_a?(Regexp)

data/lib/webrat/core/methods.rb

@@ -23,6 +23,15 @@ module Webrat
       end
     end
 
+    # Temporary hack to work with Rails 3
+    def response
+      if Webrat.configuration.mode == :rack
+        webrat_session.response
+      else
+        super
+      end
+    end
+
     # all of these methods delegate to the @session, which should
     # be created transparently.
     #

data/lib/webrat/core/save_and_open_page.rb

@@ -1,6 +1,6 @@
 module Webrat
   module SaveAndOpenPage
-    # Saves the page out to RAILS_ROOT/tmp/ and opens it in the default
+    # Saves the page out to Rails.root/tmp/ and opens it in the default
     # web browser if on OS X. Useful for debugging.
     #
     # Example:

data/lib/webrat/integrations/rack.rb

@@ -0,0 +1,9 @@
+if defined?(ActionController::IntegrationTest)
+  module ActionController #:nodoc:
+    IntegrationTest.class_eval do
+      include Rack::Test::Methods
+      include Webrat::Methods
+      include Webrat::Matchers
+    end
+  end
+end

data/lib/webrat/selenium/application_server_factory.rb

@@ -14,6 +14,9 @@ module Webrat
         when :rails
           require "webrat/selenium/application_servers/rails"
           return Webrat::Selenium::ApplicationServers::Rails.new
+        when :rack
+          require "webrat/selenium/application_servers/rack"
+          return Webrat::Selenium::ApplicationServers::Rack.new
         when :external
           require "webrat/selenium/application_servers/external"
           return Webrat::Selenium::ApplicationServers::External.new

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

@@ -0,0 +1,36 @@
+require "webrat/selenium/application_servers/base"
+
+module Webrat
+  module Selenium
+    module ApplicationServers
+      class Rack < Webrat::Selenium::ApplicationServers::Base
+
+        def start
+          @pid = fork do
+            exec start_command
+          end
+        end
+
+        def stop
+          Process.kill("TERM", @pid)
+        end
+
+        def fail
+          $stderr.puts
+          $stderr.puts
+          $stderr.puts "==> Failed to boot the application server... exiting!"
+          $stderr.puts
+          $stderr.puts "Verify you can start a server on port #{Webrat.configuration.application_port} with the following command:"
+          $stderr.puts
+          $stderr.puts "    #{start_command}"
+          exit
+        end
+
+        def start_command
+          "rackup --port #{Webrat.configuration.application_port} --env #{Webrat.configuration.application_environment}"
+        end
+
+      end
+    end
+  end
+end

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

@@ -27,15 +27,15 @@ module Webrat
         end
 
         def pid_file
-          prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
+          prepare_pid_file("#{::Rails.root}/tmp/pids", "mongrel_selenium.pid")
         end
 
         def start_command
-        "mongrel_rails start -d --chdir='#{RAILS_ROOT}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
+          "mongrel_rails start -d --chdir='#{::Rails.root}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
         end
 
         def stop_command
-        "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
+          "mongrel_rails stop -c #{::Rails.root} --pid #{pid_file}"
         end
 
       end

data/lib/webrat/selenium/selenium_session.rb

@@ -236,8 +236,12 @@ EOS
 
 
     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_for_selenium}")
+      $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_for_selenium}"
+      )
       $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
 
       at_exit do

data/spec/public/click_link_spec.rb

@@ -370,6 +370,18 @@ describe "click_link" do
     click_link "Link"
   end
 
+  it "should choose the shortest link text match, preferring text" do
+    with_html <<-HTML
+      <html>
+        <a href="/page1">Linkerama</a>
+        <a title="Link" href="/page2">Foo</a>
+      </html>
+    HTML
+
+    webrat_session.should_receive(:get).with("/page1", {})
+    click_link "Link"
+  end
+
   it "should treat non-breaking spaces as spaces" do
     with_html <<-HTML
       <html>

data/spec/public/select_spec.rb

@@ -362,6 +362,25 @@ describe "select" do
     click_button
   end
 
+  it "should allow selection of multiple fields when including from" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option value="tshirt">tshirt</option>
+          <option value="pants">pants</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+
+    webrat_session.should_receive(:post).with("/login", "clothes" => ['pants'])
+    select 'pants', :from => 'clothes[]'
+    click_button
+  end
+
+
   it "should not overwrite preselected multiples" do
     with_html <<-HTML
       <html>

data/webrat.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webrat}
-  s.version = "0.7.1"
+  s.version = "0.7.2.beta.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-07-25}
   s.description = %q{Webrat lets you quickly write expressive and robust acceptance tests
 for a Ruby web application. It supports simulating a browser inside
 a Ruby process to avoid the performance hit and browser dependency of
@@ -75,6 +75,7 @@ Most Ruby web frameworks and testing frameworks are supported.}
     "lib/webrat/core_extensions/nil_to_query_string.rb",
     "lib/webrat/core_extensions/tcp_socket.rb",
     "lib/webrat/integrations/merb.rb",
+    "lib/webrat/integrations/rack.rb",
     "lib/webrat/integrations/rails.rb",
     "lib/webrat/integrations/rspec-rails.rb",
     "lib/webrat/integrations/selenium.rb",
@@ -86,6 +87,7 @@ Most Ruby web frameworks and testing frameworks are supported.}
     "lib/webrat/selenium/application_servers/base.rb",
     "lib/webrat/selenium/application_servers/external.rb",
     "lib/webrat/selenium/application_servers/merb.rb",
+    "lib/webrat/selenium/application_servers/rack.rb",
     "lib/webrat/selenium/application_servers/rails.rb",
     "lib/webrat/selenium/application_servers/sinatra.rb",
     "lib/webrat/selenium/location_strategy_javascript/button.js",
@@ -239,7 +241,7 @@ Most Ruby web frameworks and testing frameworks are supported.}
   s.homepage = %q{http://github.com/brynary/webrat}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{webrat}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby Acceptance Testing for Web applications}
   s.test_files = [
     "spec/fakes/test_adapter.rb",
@@ -336,7 +338,7 @@ Most Ruby web frameworks and testing frameworks are supported.}
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0.5.3"])

metadata

@@ -1,12 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196417
+  prerelease: true
   segments: 
   - 0
   - 7
+  - 2
+  - beta
   - 1
-  version: 0.7.1
+  version: 0.7.2.beta.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -14,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-07-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -35,9 +40,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -48,9 +55,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
@@ -130,6 +139,7 @@ files:
 - lib/webrat/core_extensions/nil_to_query_string.rb
 - lib/webrat/core_extensions/tcp_socket.rb
 - lib/webrat/integrations/merb.rb
+- lib/webrat/integrations/rack.rb
 - lib/webrat/integrations/rails.rb
 - lib/webrat/integrations/rspec-rails.rb
 - lib/webrat/integrations/selenium.rb
@@ -141,6 +151,7 @@ files:
 - lib/webrat/selenium/application_servers/base.rb
 - lib/webrat/selenium/application_servers/external.rb
 - lib/webrat/selenium/application_servers/merb.rb
+- lib/webrat/selenium/application_servers/rack.rb
 - lib/webrat/selenium/application_servers/rails.rb
 - lib/webrat/selenium/application_servers/sinatra.rb
 - lib/webrat/selenium/location_strategy_javascript/button.js
@@ -300,23 +311,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: webrat
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Acceptance Testing for Web applications