webrat 0.5.3 → 0.6.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webrat
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-27 00:00:00 -04:00
+date: 2009-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,19 +45,25 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- MIT-LICENSE.txt
 - README.rdoc
+- MIT-LICENSE.txt
+- History.txt
 files: 
 - .document
 - .gitignore
+- Gemfile
 - History.txt
 - MIT-LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
+- Thorfile
 - install.rb
 - lib/webrat.rb
+- lib/webrat/adapters/mechanize.rb
+- lib/webrat/adapters/merb.rb
+- lib/webrat/adapters/rack.rb
+- lib/webrat/adapters/rails.rb
+- lib/webrat/adapters/sinatra.rb
 - lib/webrat/core.rb
 - lib/webrat/core/configuration.rb
 - lib/webrat/core/elements/area.rb
@@ -91,21 +97,17 @@ files:
 - lib/webrat/core/scope.rb
 - lib/webrat/core/session.rb
 - lib/webrat/core/xml.rb
-- lib/webrat/core/xml/hpricot.rb
-- lib/webrat/core/xml/nokogiri.rb
-- lib/webrat/core/xml/rexml.rb
 - lib/webrat/core_extensions/blank.rb
 - lib/webrat/core_extensions/deprecate.rb
 - lib/webrat/core_extensions/detect_mapped.rb
 - lib/webrat/core_extensions/meta_class.rb
 - lib/webrat/core_extensions/nil_to_param.rb
 - lib/webrat/core_extensions/tcp_socket.rb
-- lib/webrat/mechanize.rb
+- lib/webrat/integrations/merb.rb
+- lib/webrat/integrations/rails.rb
+- lib/webrat/integrations/rspec-rails.rb
+- lib/webrat/integrations/selenium.rb
 - lib/webrat/merb.rb
-- lib/webrat/merb_adapter.rb
-- lib/webrat/merb_multipart_support.rb
-- lib/webrat/rack.rb
-- lib/webrat/rails.rb
 - lib/webrat/rspec-rails.rb
 - lib/webrat/selenium.rb
 - lib/webrat/selenium/application_server_factory.rb
@@ -130,7 +132,6 @@ files:
 - lib/webrat/selenium/selenium_rc_server.rb
 - lib/webrat/selenium/selenium_session.rb
 - lib/webrat/selenium/silence_stream.rb
-- lib/webrat/sinatra.rb
 - spec/fakes/test_adapter.rb
 - spec/integration/mechanize/Rakefile
 - spec/integration/mechanize/config.ru
@@ -168,7 +169,7 @@ files:
 - spec/integration/rack/test/webrat_rack_test.rb
 - spec/integration/rails/.gitignore
 - spec/integration/rails/Rakefile
-- spec/integration/rails/app/controllers/application.rb
+- spec/integration/rails/app/controllers/application_controller.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
@@ -182,6 +183,7 @@ files:
 - spec/integration/rails/app/views/webrat/before_redirect_form.html.erb
 - spec/integration/rails/app/views/webrat/buttons.html.erb
 - spec/integration/rails/app/views/webrat/form.html.erb
+- spec/integration/rails/app/views/webrat/within.html.erb
 - spec/integration/rails/config/boot.rb
 - spec/integration/rails/config/environment.rb
 - spec/integration/rails/config/environments/development.rb
@@ -223,11 +225,8 @@ files:
 - spec/private/core/configuration_spec.rb
 - spec/private/core/field_spec.rb
 - spec/private/core/link_spec.rb
-- spec/private/core/logging_spec.rb
 - spec/private/core/session_spec.rb
 - spec/private/mechanize/mechanize_adapter_spec.rb
-- spec/private/merb/attaches_file_spec.rb
-- spec/private/merb/merb_adapter_spec.rb
 - spec/private/nokogiri_spec.rb
 - spec/private/rails/attaches_file_spec.rb
 - spec/private/rails/rails_adapter_spec.rb
@@ -269,8 +268,8 @@ homepage: http://github.com/brynary/webrat
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -288,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webrat
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby Acceptance Testing for Web applications
@@ -316,7 +315,7 @@ test_files:
 - spec/integration/rack/app.rb
 - spec/integration/rack/test/helper.rb
 - spec/integration/rack/test/webrat_rack_test.rb
-- spec/integration/rails/app/controllers/application.rb
+- spec/integration/rails/app/controllers/application_controller.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
@@ -346,11 +345,8 @@ test_files:
 - spec/private/core/configuration_spec.rb
 - spec/private/core/field_spec.rb
 - spec/private/core/link_spec.rb
-- spec/private/core/logging_spec.rb
 - spec/private/core/session_spec.rb
 - spec/private/mechanize/mechanize_adapter_spec.rb
-- spec/private/merb/attaches_file_spec.rb
-- spec/private/merb/merb_adapter_spec.rb
 - spec/private/nokogiri_spec.rb
 - spec/private/rails/attaches_file_spec.rb
 - spec/private/rails/rails_adapter_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.5.3

data/lib/webrat/core/xml/hpricot.rb

@@ -1,19 +0,0 @@
-module Webrat
-
-  def self.hpricot_document(stringlike)
-    return stringlike.dom if stringlike.respond_to?(:dom)
-
-    if Hpricot::Doc === stringlike
-      stringlike
-    elsif Hpricot::Elements === stringlike
-      stringlike
-    elsif StringIO === stringlike
-      Hpricot(stringlike.string)
-    elsif stringlike.respond_to?(:body)
-      Hpricot(stringlike.body.to_s)
-    else
-      Hpricot(stringlike.to_s)
-    end
-  end
-
-end

data/lib/webrat/core/xml/nokogiri.rb

@@ -1,76 +0,0 @@
-require "webrat/core_extensions/meta_class"
-
-module Webrat
-
-  def self.nokogiri_document(stringlike) #:nodoc:
-    return stringlike.dom if stringlike.respond_to?(:dom)
-
-    if Nokogiri::HTML::Document === stringlike
-      stringlike
-    elsif Nokogiri::XML::NodeSet === stringlike
-      stringlike
-    elsif StringIO === stringlike
-      Nokogiri::HTML(stringlike.string)
-    elsif stringlike.respond_to?(:body)
-      Nokogiri::HTML(stringlike.body.to_s)
-    else
-      Nokogiri::HTML(stringlike.to_s)
-    end
-  end
-
-  def self.html_nokogiri_document(stringlike) #:nodoc:
-    return stringlike.dom if stringlike.respond_to?(:dom)
-
-    if Nokogiri::HTML::Document === stringlike
-      stringlike
-    elsif Nokogiri::XML::NodeSet === stringlike
-      stringlike
-    elsif StringIO === stringlike
-      Nokogiri::HTML(stringlike.string)
-    elsif stringlike.respond_to?(:body)
-      Nokogiri::HTML(stringlike.body.to_s)
-    else
-      Nokogiri::HTML(stringlike.to_s)
-    end
-  end
-
-  def self.xml_nokogiri_document(stringlike) #:nodoc:
-    return stringlike.dom if stringlike.respond_to?(:dom)
-
-    if Nokogiri::HTML::Document === stringlike
-      stringlike
-    elsif Nokogiri::XML::NodeSet === stringlike
-      stringlike
-    elsif StringIO === stringlike
-      Nokogiri::XML(stringlike.string)
-    elsif stringlike.respond_to?(:body)
-      Nokogiri::XML(stringlike.body.to_s)
-    else
-      Nokogiri::XML(stringlike.to_s)
-    end
-  end
-
-  def self.define_dom_method(object, dom) #:nodoc:
-    object.meta_class.send(:define_method, :dom) do
-      dom
-    end
-  end
-
-end
-
-
-module Nokogiri #:nodoc:
-  module CSS #:nodoc:
-    class XPathVisitor #:nodoc:
-
-      def visit_pseudo_class_text(node) #:nodoc:
-        "@type='text'"
-      end
-
-      def visit_pseudo_class_password(node) #:nodoc:
-        "@type='password'"
-      end
-
-    end
-  end
-end

data/lib/webrat/core/xml/rexml.rb

@@ -1,24 +0,0 @@
-module Webrat
-
-  def self.rexml_document(stringlike)
-    stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
-
-    case stringlike
-    when REXML::Document
-      stringlike.root
-    when REXML::Node, Array
-      stringlike
-    else
-      begin
-        REXML::Document.new(stringlike.to_s).root
-      rescue REXML::ParseException => e
-        if e.message.include?("second root element")
-          REXML::Document.new("<fake-root-element>#{stringlike}</fake-root-element>").root
-        else
-          raise e
-        end
-      end
-    end
-  end
-
-end

data/lib/webrat/merb_adapter.rb

@@ -1,82 +0,0 @@
-require "webrat"
-require "merb-core"
-require "webrat/merb_multipart_support"
-
-module Webrat
-  class MerbAdapter #:nodoc:
-    include Merb::Test::MakeRequest
-
-    # Include Webrat's own version of multipart_post/put because the officially
-    # supported methods in Merb don't perform the request correctly.
-    include MerbMultipartSupport
-
-    attr_accessor :response
-
-    def initialize(context=nil); end
-
-    def get(url, data, headers = nil)
-      do_request(url, data, headers, "GET")
-    end
-
-    def post(url, data, headers = nil)
-      do_request(url, data, headers, "POST")
-    end
-
-    def put(url, data, headers = nil)
-      do_request(url, data, headers, "PUT")
-    end
-
-    def delete(url, data, headers = nil)
-      do_request(url, data, headers, "DELETE")
-    end
-
-    def response_body
-      @response.body.to_s
-    end
-
-    def response_code
-      @response.status
-    end
-
-    def do_request(url, data, headers, method)
-      if method == "POST" && has_file?(data)
-        @response = multipart_post(url, data, :headers => headers)
-
-      elsif method == "PUT" && has_file?(data)
-        @response = multipart_put(url, data, :headers => headers)
-
-      else
-        @response = request(url,
-          :params => (data && data.any?) ? data : nil,
-          :headers => headers,
-          :method => method)
-      end
-    end
-
-    protected
-
-      # Recursively search the data for a file attachment.
-      def has_file?(data)
-        data.each do |key, value|
-          if value.is_a?(Hash)
-            return has_file?(value)
-          else
-            return true if value.is_a?(File)
-          end
-        end
-        return false
-      end
-
-  end
-end
-
-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/merb_multipart_support.rb

@@ -1,27 +0,0 @@
-module Webrat
-
-  # These methods are copied from merb-core/two-oh.rb which defines new
-  # multipart_post and multipart_put methods for Merb::Test::MultipartRequestHelper.
-  # We can't require two-oh.rb because it alters Merb's own behavior, causing
-  # failing specs in Merb when Webrat is required.
-  module MerbMultipartSupport
-    def multipart_request(path, params = {}, env = {})
-      multipart = Merb::Test::MultipartRequestHelper::Post.new(params)
-      body, head = multipart.to_multipart
-      env["CONTENT_TYPE"] = head
-      env["CONTENT_LENGTH"] = body.size
-      env[:input] = StringIO.new(body)
-      request(path, env)
-    end
-
-    def multipart_post(path, params = {}, env = {})
-      env[:method] = "POST"
-      multipart_request(path, params, env)
-    end
-
-    def multipart_put(path, params = {}, env = {}, &block)
-      env[:method] = "PUT"
-      multipart_request(path, params, env)
-    end
-  end
-end

data/spec/private/core/logging_spec.rb

@@ -1,10 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-
-describe Webrat::Logging do
-
-  it "should not log if there is no logger" do
-    klass = Class.new
-    klass.send(:include, Webrat::Logging)
-    klass.new.debug_log "Testing"
-  end
-end

data/spec/private/merb/attaches_file_spec.rb

@@ -1,93 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-describe "attach_file with merb" do
-  before do
-    Webrat.configuration.mode = :merb
-    @filename = __FILE__
-  end
-
-  it "should fail if no file field found" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/widgets">
-      </form>
-      </html>
-    HTML
-    lambda { attach_file("Doc", "/some/path") }.should raise_error(Webrat::NotFoundError)
-  end
-
-  it "should submit empty strings for blank file fields" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/widgets">
-        <input type="file" id="widget_file" name="widget[file]" />
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with("/widgets", { "widget" => { "file" => "" } })
-    click_button
-  end
-
-  it "should submit the attached file" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/widgets">
-        <label for="widget_file">Document</label>
-        <input type="file" id="widget_file" name="widget[file]" />
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with { |path, params|
-      path.should == "/widgets"
-      params.should have_key("widget")
-      params["widget"].should have_key("file")
-      params["widget"]["file"].should be_an_instance_of(File)
-      params["widget"]["file"].path.should == @filename
-    }
-    attach_file "Document", @filename
-    click_button
-  end
-
-  it "should support collections" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/widgets">
-        <label for="widget_file1">Document</label>
-        <input type="file" id="widget_file1" name="widget[files][]" />
-        <label for="widget_file2">Spreadsheet</label>
-        <input type="file" id="widget_file2" name="widget[files][]" />
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    webrat_session.should_receive(:post).with { |path, params|
-      path.should == "/widgets"
-      params.should have_key("widget")
-      params["widget"].should have_key("files")
-      params["widget"]["files"][0].should be_an_instance_of(File)
-      params["widget"]["files"][0].path.should == @filename
-      params["widget"]["files"][1].should be_an_instance_of(File)
-      params["widget"]["files"][1].path.should == @filename
-    }
-    attach_file "Document", @filename
-    attach_file "Spreadsheet", @filename
-    click_button
-  end
-
-  xit "should allow the content type to be specified" do
-    with_html <<-HTML
-      <html>
-      <form method="post" action="/widgets">
-        <label for="person_picture">Picture</label>
-        <input type="file" id="person_picture" name="person[picture]" />
-        <input type="submit" />
-      </form>
-      </html>
-    HTML
-    ActionController::TestUploadedFile.should_receive(:new).with(@filename, "image/png").any_number_of_times
-    attach_file "Picture", @filename, "image/png"
-    click_button
-  end
-end