webrat 0.3.4 → 0.4.0

data/lib/webrat/sinatra.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -05:00
+date: 2009-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,24 +29,37 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - MIT-LICENSE.txt
 files: 
 - History.txt
-- init.rb
 - install.rb
 - MIT-LICENSE.txt
-- README.txt
+- README.rdoc
 - Rakefile
-- TODO.txt
 - lib/webrat
 - lib/webrat/core
-- lib/webrat/core/area.rb
-- lib/webrat/core/field.rb
-- lib/webrat/core/flunk.rb
-- lib/webrat/core/form.rb
-- lib/webrat/core/label.rb
-- lib/webrat/core/link.rb
+- lib/webrat/core/configuration.rb
+- lib/webrat/core/elements
+- lib/webrat/core/elements/area.rb
+- lib/webrat/core/elements/element.rb
+- lib/webrat/core/elements/field.rb
+- lib/webrat/core/elements/form.rb
+- lib/webrat/core/elements/label.rb
+- lib/webrat/core/elements/link.rb
+- lib/webrat/core/elements/select_option.rb
+- lib/webrat/core/locators
+- lib/webrat/core/locators/area_locator.rb
+- lib/webrat/core/locators/button_locator.rb
+- lib/webrat/core/locators/field_by_id_locator.rb
+- lib/webrat/core/locators/field_labeled_locator.rb
+- lib/webrat/core/locators/field_locator.rb
+- lib/webrat/core/locators/field_named_locator.rb
+- lib/webrat/core/locators/form_locator.rb
+- lib/webrat/core/locators/label_locator.rb
+- lib/webrat/core/locators/link_locator.rb
+- lib/webrat/core/locators/locator.rb
+- lib/webrat/core/locators/select_option_locator.rb
 - lib/webrat/core/locators.rb
 - lib/webrat/core/logging.rb
 - lib/webrat/core/matchers
@@ -57,10 +70,14 @@ files:
 - lib/webrat/core/matchers.rb
 - lib/webrat/core/methods.rb
 - lib/webrat/core/mime.rb
-- lib/webrat/core/nokogiri.rb
+- lib/webrat/core/save_and_open_page.rb
 - lib/webrat/core/scope.rb
-- lib/webrat/core/select_option.rb
 - lib/webrat/core/session.rb
+- lib/webrat/core/xml
+- lib/webrat/core/xml/hpricot.rb
+- lib/webrat/core/xml/nokogiri.rb
+- lib/webrat/core/xml/rexml.rb
+- lib/webrat/core/xml.rb
 - lib/webrat/core.rb
 - lib/webrat/core_extensions
 - lib/webrat/core_extensions/blank.rb
@@ -71,10 +88,10 @@ files:
 - lib/webrat/core_extensions/nil_to_param.rb
 - lib/webrat/mechanize.rb
 - lib/webrat/merb.rb
+- lib/webrat/merb_session.rb
 - lib/webrat/rack.rb
-- lib/webrat/rails
-- lib/webrat/rails/redirect_actions.rb
 - lib/webrat/rails.rb
+- lib/webrat/rspec-rails.rb
 - lib/webrat/selenium
 - lib/webrat/selenium/location_strategy_javascript
 - lib/webrat/selenium/location_strategy_javascript/button.js
@@ -83,11 +100,13 @@ 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.rb
 - lib/webrat/selenium/selenium_extensions.js
 - lib/webrat/selenium/selenium_session.rb
 - lib/webrat/selenium.rb
 - lib/webrat/sinatra.rb
 - lib/webrat.rb
+- vendor/selenium-server.jar
 has_rdoc: true
 homepage: http://github.com/brynary/webrat
 post_install_message: 
@@ -109,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: webrat
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2

data/README.txt

@@ -1,90 +0,0 @@
-=== Webrat
-
-- [Code on GitHub](http://github.com/brynary/webrat)
-- [Tickets on Lighthouse](http://webrat.lighthouseapp.com/)
-
-=== Description
-
-Webrat (_Ruby Acceptance Testing for Web applications_)
-lets you quickly write robust and thorough acceptance tests for a Ruby
-web application. By leveraging the DOM, it can run tests similarly to an
-in-browser testing solution without the associated performance hit (and
-browser dependency). The result is tests that are less fragile and more
-effective at verifying that the app will respond properly to users.
-
-When comparing Webrat with an in-browser testing solution like Watir or
-Selenium, the primary consideration should be how much JavaScript the
-application uses. In-browser testing is currently the only way to test JS, and
-that may make it a requirement for your project. If JavaScript is not central
-to your application, Webrat is a simpler, effective solution that will let you
-run your tests much faster and more frequently.
-
-Initial development was sponsored by [EastMedia](http://www.eastmedia.com).
-
-=== Synopsis
-
-    def test_sign_up
-      visit "/"
-      click_link "Sign up"
-      fill_in "Email", :with => "good@example.com"
-      select "Free account"
-      click_button "Register"
-      ...
-    end
-  
-Behind the scenes, this will perform the following work:
-
-1. Verify that loading the home page is successful
-2. Verify that a "Sign up" link exists on the home page
-3. Verify that loading the URL pointed to by the "Sign up" link leads to a
-   successful page
-4. Verify that there is an "Email" input field on the Sign Up page
-5. Verify that there is an select field on the Sign Up page with an option for
-   "Free account"
-6. Verify that there is a "Register" submit button on the page
-7. Verify that submitting the Sign Up form with the values "good@example.com"
-   and "Free account" leads to a successful page
-
-Take special note of the things _not_ specified in that test, that might cause
-tests to break unnecessarily as your application evolves:
-
-- The input field IDs or names (e.g. "user_email" or "user[email]"), which
-  could change if you rename a model
-- The ID of the form element (Webrat can do a good job of guessing, even if
-  there are multiple forms on the page.)
-- The URLs of links followed
-- The URL the form submission should be sent to, which could change if you
-  adjust your routes or controllers
-- The HTTP method for the login request
-
-A test written with Webrat can handle these changes to these without any modifications.
-
-=== Merb
-To avoid losing sessions, you need this in environments/test.rb:
-
-Merb::Config.use do |c|
-  c[:session_store] = 'memory' 
-end  
-
-=== Install
-
-To install the latest release:
-
-    sudo gem install webrat
-
-In your stories/helper.rb:
-  
-    require "webrat"
-  
-You could also unpack the gem into vendor/plugins.
-
-=== Authors
-
-- Maintained by [Bryan Helmkamp](mailto:bryan@brynary.com)
-- Original code written by [Seth Fitzsimmons](mailto:seth@mojodna.net)
-- Many other contributors. See attributions in History.txt
-
-=== License
-
-Copyright (c) 2007 Bryan Helmkamp, Seth Fitzsimmons.
-See MIT-LICENSE.txt in this directory.

data/TODO.txt

@@ -1,10 +0,0 @@
-Run tests in separate processes to eliminate constant-level dependencies
-Add rake tasks for selenium runs
-Add tests for selenium
-Add tests for locator strategies
-Use Webrat::Methods for Rails integration
-Get file uploads workign with merb
-Fix #within scoping for forms that exist outside the scope
-Make current_url work with redirections
-Track the current form based on the location of the last manipulated input, use this as a default for click_button
-Verify SSL support in Rails and Merb

data/init.rb

@@ -1,3 +0,0 @@
-if RAILS_ENV == "test" || RAILS_ENV == "selenium"
-  require File.join(File.dirname(__FILE__), "lib", "webrat")
-end

data/lib/webrat/core/field.rb

@@ -1,332 +0,0 @@
-require "cgi"
-require "webrat/core_extensions/blank"
-require "webrat/core_extensions/nil_to_param"
-
-module Webrat
-  class Field #:nodoc:
-    
-    def self.class_for_element(element)
-      if element.name == "input"
-        if %w[submit image].include?(element["type"])
-          field_class = "button"
-        else
-          field_class = element["type"] || "text" #default type; 'type' attribute is not mandatory
-        end
-      else
-        field_class = element.name
-      end
-      Webrat.const_get("#{field_class.capitalize}Field")
-    rescue NameError
-     raise "Invalid field element: #{element.inspect}"
-    end
-    
-    def initialize(form, element)
-      @form     = form
-      @element  = element
-      
-      @value    = default_value
-    end
-
-    def label_text
-      return nil if labels.empty?
-      labels.first.text
-    end
-    
-    def matches_id?(id)
-      @element["id"] == id.to_s
-    end
-    
-    def matches_name?(name)
-      @element["name"] == name.to_s
-    end
-    
-    def matches_label?(label_text)
-      return false if labels.empty?
-      labels.any? { |label| label.matches_text?(label_text) }
-    end
-    
-    def matches_alt?(alt)
-      @element["alt"] =~ /^\W*#{Regexp.escape(alt.to_s)}/i
-    end
-
-    def disabled?
-      @element.attributes.has_key?("disabled") && @element["disabled"] != 'false'
-    end
-    
-    def raise_error_if_disabled
-      raise "Cannot interact with disabled form element (#{self})" if disabled?
-    end
-        
-    def to_param
-      return nil if disabled?
-      
-      key_and_value = "#{name}=#{escaped_value}"
-      
-      if defined?(CGIMethods)
-        CGIMethods.parse_query_parameters(key_and_value)
-      elsif defined?(ActionController::AbstractRequest)
-        ActionController::AbstractRequest.parse_query_parameters(key_and_value)
-      else
-        ::Merb::Parse.query(key_and_value)
-      end
-    end
-    
-    def set(value)
-      @value = value
-    end
-    
-    def unset
-      @value = default_value
-    end
-    
-  protected
-  
-    def id
-      @element["id"]
-    end
-    
-    def name
-      @element["name"]
-    end
-    
-    def escaped_value
-      CGI.escape(@value.to_s)
-    end
-    
-    def labels
-      @labels ||= label_elements.map { |element| Label.new(self, element) }
-    end
-    
-    def label_elements
-      return @label_elements unless @label_elements.nil?
-      @label_elements = []
-
-      parent = @element.parent
-      while parent.respond_to?(:parent)
-        if parent.name == 'label'
-          @label_elements.push parent
-          break
-        end
-        parent = parent.parent
-      end
-
-      unless id.blank?
-        @label_elements += @form.element.search("label[@for='#{id}']")
-      end
-
-      @label_elements
-    end
-    
-    def default_value
-      @element["value"]
-    end
-    
-    def replace_param_value(params, oval, nval)
-      output = Hash.new
-      params.each do |key, value|
-        case value
-        when Hash
-          value = replace_param_value(value, oval, nval)
-        when Array
-          value = value.map { |o| o == oval ? nval : oval }
-        when oval
-          value = nval
-        end
-        output[key] = value
-      end
-      output
-    end
-  end
-  
-  class ButtonField < Field #:nodoc:
-
-    def matches_text?(text)
-      @element.inner_html =~ /#{Regexp.escape(text.to_s)}/i
-    end
-    
-    def matches_value?(value)
-      @element["value"] =~ /^\W*#{Regexp.escape(value.to_s)}/i || matches_text?(value) || matches_alt?(value)
-    end
-
-    def to_param
-      return nil if @value.nil?
-      super
-    end
-
-    def default_value
-      nil
-    end
-
-    def click
-      raise_error_if_disabled
-      set(@element["value"]) unless @element["name"].blank?
-      @form.submit
-    end
-
-  end
-
-  class HiddenField < Field #:nodoc:
-
-    def to_param
-      if collection_name?
-        super
-      else
-        checkbox_with_same_name = @form.field(name, CheckboxField)
-
-        if checkbox_with_same_name.to_param.blank?
-          super
-        else
-          nil
-        end
-      end
-    end
-
-  protected
-
-    def collection_name?
-      name =~ /\[\]/
-    end
-
-  end
-
-  class CheckboxField < Field #:nodoc:
-
-    def to_param
-      return nil if @value.nil?
-      super
-    end
-
-    def check
-      raise_error_if_disabled
-      set(@element["value"] || "on")
-    end
-    
-    def checked?
-      @element["checked"] == "checked"
-    end
-
-    def uncheck
-      raise_error_if_disabled
-      set(nil)
-    end
-
-  protected
-
-    def default_value
-      if @element["checked"] == "checked"
-        @element["value"] || "on"
-      else
-        nil
-      end
-    end
-
-  end
-
-  class PasswordField < Field #:nodoc:
-  end
-
-  class RadioField < Field #:nodoc:
-
-    def to_param
-      return nil if @value.nil?
-      super
-    end
-    
-    def choose
-      raise_error_if_disabled
-      other_options.each do |option|
-        option.set(nil)
-      end
-      
-      set(@element["value"] || "on")
-    end
-    
-  protected
-
-    def other_options
-      @form.fields.select { |f| f.name == name }
-    end
-    
-    def default_value
-      if @element["checked"] == "checked"
-        @element["value"] || "on"
-      else
-        nil
-      end
-    end
-
-  end
-
-  class TextareaField < Field #:nodoc:
-
-  protected
-
-    def default_value
-      @element.inner_html
-    end
-
-  end
-  
-  class FileField < Field #:nodoc:
-
-    attr_accessor :content_type
-
-    def set(value, content_type = nil)
-      super(value)
-      @content_type = content_type
-    end
-
-    def to_param
-      if @value.nil?
-        super
-      else
-        replace_param_value(super, @value, test_uploaded_file)
-      end
-    end
-    
-  protected
-  
-    def test_uploaded_file
-      if content_type
-        ActionController::TestUploadedFile.new(@value, content_type)
-      else
-        ActionController::TestUploadedFile.new(@value)
-      end
-    end
-
-  end
-
-  class TextField < Field #:nodoc:
-  end
-
-  class ResetField < Field #:nodoc:
-  end
-
-  class SelectField < Field #:nodoc:
-
-    def find_option(text)
-      options.detect { |o| o.matches_text?(text) }
-    end
-
-  protected
-
-    def default_value
-      selected_options = @element.search(".//option[@selected='selected']")
-      selected_options = @element.search(".//option[position() = 1]") if selected_options.empty? 
-      
-      selected_options.map do |option|
-        return "" if option.nil?
-        option["value"] || option.inner_html
-      end
-    end
-
-    def options
-      option_elements.map { |oe| SelectOption.new(self, oe) }
-    end
-
-    def option_elements
-      @element.search(".//option")
-    end
-
-  end
-end