webrat 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,30 @@
+== 0.4.1 / 2009-01-31
+
+* Minor enhancements
+
+  * Support Sinatra 0.9 (Harry Vangberg)
+  * Update query param parsing to work with latest Edge Rails
+  * Added #redirected_to method to easily check where an external redirect was
+    redirected to (Adam Greene)
+  * Recognize input tags with type button (Lena Herrmann)
+  * Add uncheck method to Selenium mode (Lee Bankewitz)
+    
+* Bug fixes
+
+  * Make requests to a Rails app using a full URL instead of a relative path. This change
+    is helpful for Rails apps that use subdomains. (John Hwang and Zach Dennis)
+  * Follow redirects that are on the same domain but a different subdomain
+    (Adam Greene)
+  * rescue from Webrat::TimeoutError in selenium matchers which allows NegativeMatchers
+    to behave correctly (Noah Davis)
+  * Switch to using selenium.click instead of .check when checking a checkbox
+    (Noah Davis)
+  * Create tmp/pids directory if directory does not exist. (Amos King and Mike Gaffney)  
+  * Setup deprecated writers for the selenium_environment= and selenium_port= config
+  * Ensure the previous pages params aren't passed through redirect (Daniel Lucraft and
+    Bryan Helmkamp)
+  * Labels should only search for fields within the current scope (Kyle Hargraves)
+
 == 0.4.0 / 2009-01-18
 
 * _IMPORTANT_ Breaking change:

data/Rakefile

@@ -72,7 +72,7 @@ end
 desc 'Install the package as a gem.'
 task :install_gem => [:clean, :package] do
   gem_filename = Dir['pkg/*.gem'].first
-  sh "sudo gem install --local #{gem_filename}"
+  sh "sudo gem install --no-rdoc --no-ri --local #{gem_filename}"
 end
 
 desc "Delete generated RDoc"
@@ -87,7 +87,8 @@ end
 
 desc "Run specs using jruby"
 task "spec:jruby" do
-  system "jruby -S rake spec"
+  result = system "jruby -S rake spec"
+  raise "JRuby tests failed" unless result
 end
 
 desc "Run each spec in isolation to test for dependency issues"
@@ -109,10 +110,21 @@ namespace :spec do
 
   namespace :integration do
     desc "Run the Rails integration specs"
-    task :rails do
-      Dir.chdir "spec/integration/rails" do
-        result = system "rake test:integration"
-        raise "Rails integration tests failed" unless result
+    task :rails => ['rails:webrat'] #,'rails:selenium'] currently not running selenium as it doesn't pass.
+
+    namespace :rails do
+      task :selenium do
+        Dir.chdir "spec/integration/rails" do
+          result = system "rake test_unit:selenium"
+          raise "Rails integration tests failed" unless result
+        end
+      end
+
+      task :webrat do
+        Dir.chdir "spec/integration/rails" do
+          result = system "rake test_unit:rails"
+          raise "Rails integration tests failed" unless result
+        end
       end
     end
 

data/lib/webrat.rb

@@ -7,7 +7,7 @@ module Webrat
   class WebratError < StandardError
   end
 
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
   def self.require_xml
     gem "nokogiri", ">= 1.0.6"

data/lib/webrat/core/configuration.rb

@@ -32,10 +32,12 @@ module Webrat
     # Which rails environment should the selenium tests be run in? Defaults to selenium.
     attr_accessor :application_environment
     webrat_deprecate :selenium_environment, :application_environment
+    webrat_deprecate :selenium_environment=, :application_environment=
 
     # Which port is the application running on for selenium testing? Defaults to 3001.
     attr_accessor :application_port
     webrat_deprecate :selenium_port, :application_port
+    webrat_deprecate :selenium_port=, :application_port=
 
     # Which server the application is running on for selenium testing? Defaults to localhost
     attr_accessor :application_address

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

@@ -45,6 +45,7 @@ module Webrat
         when "file"     then FileField
         when "reset"    then ResetField
         when "submit"   then ButtonField
+        when "button"   then ButtonField
         when "image"    then ButtonField
         else  TextField
         end
@@ -98,10 +99,11 @@ module Webrat
   protected
   
     def rails_request_parser
-      if defined?(ActionController::RequestParser) # For Rails > 2.2
-        ActionController::RequestParser
-      else
+      if defined?(ActionController::AbstractRequest)
         ActionController::AbstractRequest
+      else
+        # For Rails > 2.2
+        ActionController::UrlEncodedPairParser
       end
     end
   
@@ -176,7 +178,7 @@ module Webrat
   class ButtonField < Field #:nodoc:
 
     def self.xpath_search
-      [".//button", ".//input[@type = 'submit']", ".//input[@type = 'image']"]
+      [".//button", ".//input[@type = 'submit']", ".//input[@type = 'button']", ".//input[@type = 'image']"]
     end
     
     def to_param

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

@@ -23,7 +23,7 @@ module Webrat
       if for_id.blank?
         Webrat::XML.xpath_at(@element, *Field.xpath_search)
       else
-        Webrat::XML.css_search(@session.dom, "#" + for_id).first
+        Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
       end
     end
     

data/lib/webrat/core/session.rb

@@ -112,7 +112,7 @@ For example:
       @http_method  = http_method
       @data         = data
 
-      request_page(response_location, :get, data) if internal_redirect?
+      request_page(response_location, :get, {}) if internal_redirect?
 
       return response
     end
@@ -125,8 +125,17 @@ For example:
       response_code / 100 == 3
     end
 
-    def internal_redirect? #:nodoc:
-      redirect? && current_host == response_location_host
+    def internal_redirect?
+      return false unless redirect?
+      #should keep internal_redirects if the subdomain changes
+      current_host_domain = current_host.split('.')[-2..-1].join('.') rescue current_host
+      response_location_host_domain = response_location_host.split('.')[-2..-1].join('.') rescue response_location_host
+      current_host_domain == response_location_host_domain
+    end
+    
+    #easy helper to pull out where we were redirected to
+    def redirected_to
+      redirect? ? response_location : nil
     end
 
     def exception_caught? #:nodoc:

data/lib/webrat/rails.rb

@@ -73,11 +73,13 @@ module Webrat
     # remove protocol, host and anchor
     def normalize_url(href) #:nodoc:
       uri = URI.parse(href)
-      normalized_url = uri.path
-      if uri.query
-        normalized_url += "?" + uri.query
-      end
-      normalized_url
+      normalized_url = []
+      normalized_url << "#{uri.scheme}://" if uri.scheme
+      normalized_url << uri.host if uri.host
+      normalized_url << ":#{uri.port}" if uri.port && ![80,443].include?(uri.port)
+      normalized_url << uri.path if uri.path
+      normalized_url << "?#{uri.query}" if uri.query
+      normalized_url.join
     end
 
     def update_protocol(href) #:nodoc:

data/lib/webrat/selenium.rb

@@ -26,7 +26,7 @@ module Webrat
   end
 
   def self.start_app_server #:nodoc:
-    pid_file = File.expand_path(RAILS_ROOT + "/tmp/pids/mongrel_selenium.pid")
+    pid_file = prepare_pid_file("#{RAILS_ROOT}/tmp/pids", "mongrel_selenium.pid")
     system("mongrel_rails start -d --chdir=#{RAILS_ROOT} --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &")
     TCPSocket.wait_for_service :host => Webrat.configuration.application_address, :port => Webrat.configuration.application_port.to_i
   end
@@ -36,6 +36,11 @@ module Webrat
     system "mongrel_rails stop -c #{RAILS_ROOT} --pid #{pid_file}"
   end
 
+  def self.prepare_pid_file(file_path, pid_file_name)
+    FileUtils.mkdir_p File.expand_path(file_path)
+    File.expand_path("#{file_path}/#{pid_file_name}")
+  end
+
   # To use Webrat's Selenium support, you'll need the selenium-client gem installed.
   # Activate it with (for example, in your <tt>env.rb</tt>):
   #

data/lib/webrat/selenium/matchers.rb

@@ -1,146 +1,4 @@
-module Webrat
-  module Selenium
-    module Matchers
-
-      class HaveXpath
-        def initialize(expected)
-          @expected = expected
-        end
-        
-        def matches?(response)
-          response.session.wait_for do
-            response.selenium.is_element_present("xpath=#{@expected}")
-          end
-        end
-
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected following text to match xpath #{@expected}:\n#{@document}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "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
-      end
-
-      def assert_have_no_xpath(expected)
-        hs = HaveXpath.new(expected)
-        assert !hs.matches?(response), hs.negative_failure_message
-      end
-      
-      class HaveSelector
-        def initialize(expected)
-          @expected = expected
-        end
-        
-        def matches?(response)
-          response.session.wait_for do
-            response.selenium.is_element_present("css=#{@expected}")
-          end
-        end
-
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected following text to match selector #{@expected}:\n#{@document}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "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)
-        hs = HaveSelector.new(expected)
-        assert hs.matches?(response), hs.failure_message
-      end
-
-      # Asserts that the body of the response
-      # does not contain the supplied string or regepx
-      def assert_have_no_selector(expected)
-        hs = HaveSelector.new(expected)
-        assert !hs.matches?(response), hs.negative_failure_message
-      end
-      
-      class HasContent #:nodoc:
-        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
-        end
-
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected the following element's content to #{content_message}:\n#{@element}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "expected the following element's content to not #{content_message}:\n#{@element}"
-        end
-
-        def content_message
-          case @content
-          when String
-            "include \"#{@content}\""
-          when Regexp
-            "match #{@content.inspect}"
-          end
-        end
-      end
-
-      # Matches the contents of an HTML document with
-      # whatever string is supplied
-      def contain(content)
-        HasContent.new(content)
-      end
-      
-      # Asserts that the body of the response contain
-      # the supplied string or regexp
-      def assert_contain(content)
-        hc = HasContent.new(content)
-       assert hc.matches?(response), hc.failure_message
-      end
-
-      # Asserts that the body of the response
-      # does not contain the supplied string or regepx
-      def assert_not_contain(content)
-        hc = HasContent.new(content)
-        assert !hc.matches?(response), hc.negative_failure_message
-      end
-      
-    end
-  end
-end
+require "webrat/selenium/matchers/have_xpath"
+require "webrat/selenium/matchers/have_selector"
+# require "webrat/selenium/matchers/have_tag"
+require "webrat/selenium/matchers/have_content"

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

@@ -0,0 +1,66 @@
+module Webrat
+  module Selenium
+    module Matchers
+      class HasContent #:nodoc:
+        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
+          rescue Webrat::TimeoutError
+            false
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected the following element's content to #{content_message}:\n#{@element}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected the following element's content to not #{content_message}:\n#{@element}"
+        end
+
+        def content_message
+          case @content
+          when String
+            "include \"#{@content}\""
+          when Regexp
+            "match #{@content.inspect}"
+          end
+        end
+      end
+
+      # Matches the contents of an HTML document with
+      # whatever string is supplied
+      def contain(content)
+        HasContent.new(content)
+      end
+      
+      # Asserts that the body of the response contain
+      # the supplied string or regexp
+      def assert_contain(content)
+        hc = HasContent.new(content)
+       assert hc.matches?(response), hc.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_not_contain(content)
+        hc = HasContent.new(content)
+        assert !hc.matches?(response), hc.negative_failure_message
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module Webrat
+  module Selenium
+    module Matchers
+      class HaveSelector
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("css=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match selector #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "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)
+        hs = HaveSelector.new(expected)
+        assert hs.matches?(response), hs.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_have_no_selector(expected)
+        hs = HaveSelector.new(expected)
+        assert !hs.matches?(response), hs.negative_failure_message
+      end
+    end
+  end
+end

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

@@ -0,0 +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::Parser.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

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

@@ -0,0 +1,45 @@
+module Webrat
+  module Selenium
+    module Matchers
+      class HaveXpath
+        def initialize(expected)
+          @expected = expected
+        end
+        
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("xpath=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match xpath #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "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
+      end
+
+      def assert_have_no_xpath(expected)
+        hs = HaveXpath.new(expected)
+        assert !hs.matches?(response), hs.negative_failure_message
+      end
+    end
+  end
+end

data/lib/webrat/selenium/selenium_session.rb

@@ -111,8 +111,9 @@ module Webrat
     def check(label_text)
       locator = "webrat=#{label_text}"
       selenium.wait_for_element locator, 5
-      selenium.check locator
+      selenium.click locator
     end
+    alias_method :uncheck, :check
 
     webrat_deprecate :checks, :check
 

data/lib/webrat/sinatra.rb

@@ -1,6 +1,6 @@
 require 'webrat/rack'
 require 'sinatra'
-require 'sinatra/test/methods'
+require 'sinatra/test'
 
 class Sinatra::Application
   # Override this to prevent Sinatra from barfing on the options passed from RSpec
@@ -13,16 +13,17 @@ disable :reload
 
 module Webrat
   class SinatraSession < RackSession #:nodoc:
-    include Sinatra::Test::Methods
+    include Sinatra::Test
 
     attr_reader :request, :response
 
     %w(get head post put delete).each do |verb|
+      alias_method "orig_#{verb}", verb
       define_method(verb) do |*args| # (path, data, headers = nil)
         path, data, headers = *args
         data = data.inject({}) {|data, (key,value)| data[key] = Rack::Utils.unescape(value); data }
         params = data.merge(:env => headers || {})
-        self.__send__("#{verb}_it", path, params)
+        self.__send__("orig_#{verb}", path, params)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-18 00:00:00 -05:00
+date: 2009-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,11 @@ files:
 - lib/webrat/selenium/location_strategy_javascript/webratlink.js
 - lib/webrat/selenium/location_strategy_javascript/webratlinkwithin.js
 - lib/webrat/selenium/location_strategy_javascript/webratselectwithoption.js
+- lib/webrat/selenium/matchers
+- lib/webrat/selenium/matchers/have_content.rb
+- lib/webrat/selenium/matchers/have_selector.rb
+- lib/webrat/selenium/matchers/have_tag.rb
+- lib/webrat/selenium/matchers/have_xpath.rb
 - lib/webrat/selenium/matchers.rb
 - lib/webrat/selenium/selenium_extensions.js
 - lib/webrat/selenium/selenium_session.rb