RubyGems - honkster-webrat - Versions diffs - 0.6.0.10 → 0.7.1.1 - Mend

honkster-webrat 0.6.0.10 → 0.7.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

data/Gemfile +0 -6
data/History.txt +34 -0
data/Rakefile +7 -8
data/Thorfile +1 -0
data/honkster-webrat.gemspec +9 -5
data/lib/webrat.rb +1 -1
data/lib/webrat/adapters/mechanize.rb +22 -6
data/lib/webrat/adapters/rack.rb +4 -0
data/lib/webrat/adapters/rails.rb +4 -8
data/lib/webrat/core/configuration.rb +23 -4
data/lib/webrat/core/elements/field.rb +40 -89
data/lib/webrat/core/elements/form.rb +55 -31
data/lib/webrat/core/locators/form_locator.rb +1 -1
data/lib/webrat/core/locators/select_option_locator.rb +1 -1
data/lib/webrat/core/matchers/have_content.rb +1 -1
data/lib/webrat/core/matchers/have_xpath.rb +4 -2
data/lib/webrat/core/methods.rb +1 -1
data/lib/webrat/core/mime.rb +2 -2
data/lib/webrat/core/save_and_open_page.rb +3 -23
data/lib/webrat/core/scope.rb +1 -0
data/lib/webrat/core/session.rb +4 -7
data/lib/webrat/core_extensions/{nil_to_param.rb → nil_to_query_string.rb} +1 -1
data/lib/webrat/selenium/location_strategy_javascript/label.js +8 -2
data/lib/webrat/selenium/matchers/have_content.rb +22 -10
data/lib/webrat/selenium/matchers/have_selector.rb +8 -0
data/lib/webrat/selenium/matchers/have_xpath.rb +8 -0
data/lib/webrat/selenium/selenium_rc_server.rb +5 -2
data/lib/webrat/selenium/selenium_session.rb +12 -12
data/spec/fakes/test_adapter.rb +1 -5
data/spec/integration/mechanize/sample_app.rb +16 -1
data/spec/integration/mechanize/spec/mechanize_spec.rb +9 -1
data/spec/integration/rack/app.rb +2 -2
data/spec/integration/rack/test/helper.rb +0 -1
data/spec/integration/rack/test/webrat_rack_test.rb +3 -2
data/spec/integration/sinatra/classic_app.rb +0 -1
data/spec/integration/sinatra/modular_app.rb +0 -1
data/spec/integration/sinatra/test/classic_app_test.rb +1 -0
data/spec/integration/sinatra/test/test_helper.rb +0 -1
data/spec/private/core/field_spec.rb +1 -1
data/spec/private/core/form_spec.rb +51 -0
data/spec/private/core/session_spec.rb +5 -23
data/spec/private/mechanize/mechanize_adapter_spec.rb +24 -1
data/spec/private/rails/attaches_file_spec.rb +33 -0
data/spec/private/rails/rails_adapter_spec.rb +0 -7
data/spec/public/matchers/contain_spec.rb +8 -15
data/spec/public/matchers/have_xpath_spec.rb +6 -0
data/spec/public/save_and_open_spec.rb +4 -25
data/spec/public/select_spec.rb +19 -0
data/spec/public/submit_form_spec.rb +52 -1
data/spec/spec_helper.rb +0 -1
data/vendor/selenium-server.jar +0 -0
metadata +56 -15
data/pkg/honkster-webrat-0.6.0.9.gem +0 -0

data/spec/fakes/test_adapter.rb CHANGED Viewed

@@ -10,16 +10,12 @@ module Webrat #:nodoc:
     def initialize(*args)
     end
-    def doc_root
-      File.expand_path(File.join(".", "public"))
-    end
     def response
       @response ||= Object.new
     end
     def response_code
-      @response_code || 200
+      @response_code ||= 200
     end
     def get(url, data, headers = nil)

data/spec/integration/mechanize/sample_app.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra/base"
 class SampleApp < Sinatra::Default
@@ -17,4 +16,20 @@ class SampleApp < Sinatra::Default
   get "/redirected" do
     "Redirected"
   end
+  get "/form" do
+    <<-EOS
+    <html>
+      <form action="/form" method="post">
+        <input type="hidden" name="_method" value="put" />
+        <label for="email">Email:</label> <input type="text" id="email" name="email" /></label>
+        <input type="submit" value="Add" />
+      </form>
+    </html>
+    EOS
+  end
+  put "/form" do
+    "Welcome #{params[:email]}"
+  end
 end

data/spec/integration/mechanize/spec/mechanize_spec.rb CHANGED Viewed

@@ -12,7 +12,15 @@ describe "Webrat's Mechanize mode" do
   end
   it "should follow links"
-  it "should submit forms"
+  it "should submit forms" do
+    visit "http://localhost:9292/form"
+    fill_in "Email", :with => "albert@example.com"
+    response = click_button "Add"
+    response.should contain("Welcome albert@example.com")
+  end
   it "should not follow external redirects" do
     pending do
       response = visit("http://localhost:9292/external_redirect")

data/spec/integration/rack/app.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra/base"
 class RackApp < Sinatra::Base
@@ -39,7 +38,8 @@ class RackApp < Sinatra::Base
   end
   post "/upload" do
-    params[:uploaded_file].to_yaml
+    uploaded_file = params[:uploaded_file]
+    Marshal.dump(:tempfile => uploaded_file[:tempfile].read, :type => uploaded_file[:type], :filename => uploaded_file[:filename])
   end
 end

data/spec/integration/rack/test/helper.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-require "rubygems"
 require "test/unit"
 require "rack/test"
 # require "redgreen"

data/spec/integration/rack/test/webrat_rack_test.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+require "rubygems"
 require File.dirname(__FILE__) + "/helper"
 class WebratRackTest < Test::Unit::TestCase
@@ -52,10 +53,10 @@ class WebratRackTest < Test::Unit::TestCase
     attach_file "File", __FILE__, "text/ruby"
     click_button "Upload"
-    upload = YAML.load(response_body)
+    upload = Marshal.load(response_body)
     assert_equal "text/ruby", upload[:type]
     assert_equal "webrat_rack_test.rb", upload[:filename]
-    assert upload[:tempfile].respond_to?(:read)
+    assert_equal File.read(__FILE__), upload[:tempfile]
   end
 end

data/spec/integration/sinatra/classic_app.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra"
 use_in_file_templates!

data/spec/integration/sinatra/modular_app.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra/base"
 class MyModularApp < Sinatra::Default

data/spec/integration/sinatra/test/classic_app_test.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+require "rubygems"
 require File.dirname(__FILE__) + "/test_helper"
 require File.dirname(__FILE__) + "/../classic_app"

data/spec/integration/sinatra/test/test_helper.rb CHANGED Viewed

@@ -1,4 +1,3 @@
-require "rubygems"
 require "test/unit"
 # require "redgreen"

data/spec/private/core/field_spec.rb CHANGED Viewed

@@ -77,7 +77,7 @@ module Webrat
       element    = Webrat::XML.document(html).css('input').first
       text_field = TextField.new(nil, element)
-      text_field.to_param.should == { 'email' => 'user@example.com' }
+      text_field.to_query_string.should == 'email=user@example.com'
     end
   end
 end

data/spec/private/core/form_spec.rb ADDED Viewed

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+describe "Multiple nested params" do
+  it "should be corretly posted" do
+    Webrat.configuration.mode = :rails
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/family">
+        <div class="couple">
+          <div class="parent">
+            <select name="user[family][parents][0][][gender]">
+              <option selected="selected" value="Mother">Mother</option>
+              <option value="Father">Father</option>
+            </select>
+            <input type="text" value="Alice" name="user[family][parents][0][][name]" />
+          </div>
+          <div class="parent">
+            <select name="user[family][parents][0][][gender]">
+              <option value="Mother">Mother</option>
+              <option selected="selected" value="Father">Father</option>
+            </select>
+            <input type="text" value="Michael" name="user[family][parents][0][][name]" />
+          </div>
+        </div>
+        <div class="couple">
+          <div class="parent">
+            <select name="user[family][parents][1][][gender]">
+              <option selected="selected" value="Mother">Mother</option>
+              <option value="Father">Father</option>
+            </select>
+            <input type="text" value="Jenny" name="user[family][parents][1][][name]" />
+          </div>
+        </div>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    params = { "user" => { "family" => { "parents" => {
+            "0" => [ {"name" => "Alice", "gender"=>"Mother"}, {"name" => "Michael", "gender"=>"Father"} ],
+            "1" => [ {"name" => "Jenny", "gender"=>"Mother"} ]
+          }
+        }
+      }
+    }
+    webrat_session.should_receive(:post).with("/family", params)
+    click_button
+  end
+end

data/spec/private/core/session_spec.rb CHANGED Viewed

@@ -2,11 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 describe Webrat::Session do
-  it "should not have a doc_root" do
-    session = Webrat::Session.new
-    session.doc_root.should be_nil
-  end
   it "should expose the current_dom" do
     session = Webrat::Session.new
@@ -112,24 +107,6 @@ describe Webrat::Session do
       webrat_session = Webrat::Session.new
     end
-    it "should return true if the last response was a redirect and Fixnum#/ returns a Rational" do
-      # This happens if the ruby-units gem has been required
-      Fixnum.class_eval do
-        alias_method :original_divide, "/".to_sym
-        def /(other)
-          Rational(self, other)
-        end
-      end
-      webrat_session.stub!(:response_code => 301)
-      webrat_session.redirect?.should be_true
-      Fixnum.class_eval do
-        alias_method "/".to_sym, :original_divide
-      end
-    end
     it "should return true if the last response was a redirect" do
       webrat_session.stub!(:response_code => 301)
       webrat_session.redirect?.should be_true
@@ -139,6 +116,11 @@ describe Webrat::Session do
       webrat_session.stub!(:response_code => 200)
       webrat_session.redirect?.should be_false
     end
+    it "should return false if the last response was a 304 Not Modified" do
+      webrat_session.stub!(:response_code => 304)
+      webrat_session.redirect?.should be_false
+    end
   end
   describe "#internal_redirect?" do

data/spec/private/mechanize/mechanize_adapter_spec.rb CHANGED Viewed

@@ -1,6 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe Webrat::MechanizeAdapter do
+  Mechanize = WWW::Mechanize if defined?(WWW::Mechanize)
   before :each do
     Webrat.configuration.mode = :mechanize
   end
@@ -9,6 +12,13 @@ describe Webrat::MechanizeAdapter do
     @mech = Webrat::MechanizeAdapter.new
   end
+  describe "mechanize" do
+    it "should disable the following of redirects on the mechanize instance" do
+      mech = @mech.mechanize
+      mech.redirect_ok.should be_false
+    end
+  end
   describe "post" do
     def url
       'http://test.host/users'
@@ -24,7 +34,8 @@ describe Webrat::MechanizeAdapter do
     it "should flatten model post data" do
       mechanize = mock(:mechanize)
-      WWW::Mechanize.stub!(:new => mechanize)
+      mechanize.stub!(:redirect_ok=)
+      Mechanize.stub!(:new => mechanize)
       mechanize.should_receive(:post).with(url, flattened_data)
       Webrat::MechanizeAdapter.new.post(url, data)
     end
@@ -70,4 +81,16 @@ describe Webrat::MechanizeAdapter do
       @session.absolute_url(relative_url).should == 'https://test.host/wilma'
     end
   end
+  describe "response_headers" do
+    it "should return the Headers object from the response" do
+      mech = @mech.mechanize
+      resp = mock('Mechanize::File')
+      hdr = Mechanize::Headers.new
+      resp.should_receive(:header).and_return(hdr)
+      mech.stub!(:get).and_return(resp)
+      @mech.get('/', nil)
+      @mech.response_headers.should == hdr
+    end
+  end
 end

data/spec/private/rails/attaches_file_spec.rb CHANGED Viewed

@@ -78,4 +78,37 @@ describe "attach_file" do
     attach_file "Picture", @filename, "image/png"
     click_button
   end
+  it "should support nested attributes" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/albums">
+        <label for="photo_file1">Photo</label>
+        <input type="file" id="photo_file1" name="album[photos_attributes][][image]" />
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/albums", { "album" => { "photos_attributes" => [{"image" => @uploaded_file}] } })
+    attach_file "Photo", @filename
+    click_button
+  end
+  it "should support nested attributes with multiple files" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/albums">
+        <label for="photo_file1">Photo 1</label>
+        <input type="file" id="photo_file1" name="album[photos_attributes][][image]" />
+        <label for="photo_file2">Photo 2</label>
+        <input type="file" id="photo_file2" name="album[photos_attributes][][image]" />
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/albums", { "album" => { "photos_attributes" => [{"image" => @uploaded_file}, {"image" => @uploaded_file}] } })
+    attach_file "Photo 1", @filename
+    attach_file "Photo 2", @filename
+    click_button
+  end
 end

data/spec/private/rails/rails_adapter_spec.rb CHANGED Viewed

@@ -76,11 +76,4 @@ describe Webrat::RailsAdapter do
     end
   end
-  it "should provide a saved_page_dir" do
-    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:saved_page_dir)
-  end
-  it "should provide a doc_root" do
-    Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
-  end
 end

data/spec/public/matchers/contain_spec.rb CHANGED Viewed

@@ -3,21 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 describe "contain" do
   include Webrat::Matchers
-  before(:each) do
-    @body = <<-HTML
-      <div id='main'>
-        <div class='inner'>hello, world!</div>
-        <h2>Welcome "Bryan"</h2>
-        <h3>Welcome 'Bryan'</h3>
-        <h4>Welcome 'Bryan"</h4>
-        <ul>
-          <li>First</li>
-          <li>Second</li>
-        </ul>
-      </div>
-    HTML
-  end
   before(:each) do
     @body = <<-EOF
       <div id='main'>
@@ -34,6 +19,14 @@ describe "contain" do
     it "should call element#matches? when the argument is a regular expression" do
       @body.should contain(/hello, world/)
     end
+    it "should treat newlines as spaces" do
+      "<div>it takes\ndifferent strokes</div>".should contain("it takes different strokes")
+    end
+    it "should multiple spaces as a single space" do
+      "<div>it takes  different strokes</div>".should contain("it takes different strokes")
+    end
   end
   describe "asserts for contains," do

data/spec/public/matchers/have_xpath_spec.rb CHANGED Viewed

@@ -88,6 +88,12 @@ describe "have_xpath" do
       end
     }.should raise_error(Spec::Expectations::ExpectationNotMetError)
   end
+  it "should match negative expectations in the block" do
+    @body.should have_xpath("//div") do |node|
+      node.should_not have_xpath("//div[@id='main']")
+    end
+  end
   it "should match descendants of the matched elements in the block" do
     @body.should have_xpath("//ul") do |node|

data/spec/public/save_and_open_spec.rb CHANGED Viewed

@@ -22,30 +22,13 @@ describe "save_and_open_page" do
     Launchy::Browser.stub!(:run)
     @file_handle = mock("file handle")
-    File.stub!(:open).with(filename, 'w').and_yield(@file_handle)
+    File.stub!(:open).and_yield(@file_handle)
     @file_handle.stub!(:write)
   end
-  it "should rewrite css rules" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|"#{webrat_session.doc_root}/stylesheets/foo.css"|s
-    end
-    save_and_open_page
-  end
-  it "should rewrite image paths with double quotes" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|"#{webrat_session.doc_root}/images/bar.png"|s
-    end
-    save_and_open_page
-  end
-  it "should rewrite image paths with single quotes" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|'#{webrat_session.doc_root}/images/foo.png'|s
-    end
+  it "should save pages to the directory configured" do
+    Webrat.configuration.stub!(:saved_pages_dir => "path/to/dir")
+    File.should_receive(:open).with("path/to/dir/webrat-1234.html", "w").and_yield(@file_handle)
     save_and_open_page
   end
@@ -64,8 +47,4 @@ describe "save_and_open_page" do
     end.should_not raise_error
   end
-  def filename
-    File.expand_path("./webrat-#{Time.now}.html")
-  end
 end

data/spec/public/select_spec.rb CHANGED Viewed

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