RubyGems - webrat - Versions diffs - 0.5.3 → 0.6.0 - Mend

webrat 0.5.3 → 0.6.0

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 (87) hide show

data/.gitignore +4 -1
data/Gemfile +19 -0
data/History.txt +29 -0
data/Rakefile +27 -63
data/Thorfile +117 -0
data/lib/webrat.rb +11 -3
data/lib/webrat/{mechanize.rb → adapters/mechanize.rb} +0 -0
data/lib/webrat/adapters/merb.rb +11 -0
data/lib/webrat/{rack.rb → adapters/rack.rb} +0 -0
data/lib/webrat/{rails.rb → adapters/rails.rb} +2 -23
data/lib/webrat/{sinatra.rb → adapters/sinatra.rb} +0 -2
data/lib/webrat/core.rb +0 -1
data/lib/webrat/core/configuration.rb +6 -16
data/lib/webrat/core/elements/area.rb +2 -2
data/lib/webrat/core/elements/element.rb +3 -3
data/lib/webrat/core/elements/field.rb +106 -30
data/lib/webrat/core/elements/form.rb +4 -4
data/lib/webrat/core/elements/label.rb +4 -4
data/lib/webrat/core/elements/link.rb +6 -6
data/lib/webrat/core/elements/select_option.rb +15 -2
data/lib/webrat/core/locators.rb +1 -1
data/lib/webrat/core/locators/area_locator.rb +3 -3
data/lib/webrat/core/locators/button_locator.rb +6 -6
data/lib/webrat/core/locators/field_by_id_locator.rb +3 -3
data/lib/webrat/core/locators/field_labeled_locator.rb +2 -2
data/lib/webrat/core/locators/field_named_locator.rb +3 -3
data/lib/webrat/core/locators/form_locator.rb +1 -1
data/lib/webrat/core/locators/label_locator.rb +2 -2
data/lib/webrat/core/locators/link_locator.rb +7 -7
data/lib/webrat/core/locators/select_option_locator.rb +5 -5
data/lib/webrat/core/logging.rb +4 -5
data/lib/webrat/core/matchers/have_content.rb +2 -7
data/lib/webrat/core/matchers/have_xpath.rb +3 -28
data/lib/webrat/core/methods.rb +1 -0
data/lib/webrat/core/scope.rb +17 -2
data/lib/webrat/core/session.rb +2 -1
data/lib/webrat/core/xml.rb +41 -84
data/lib/webrat/integrations/merb.rb +10 -0
data/lib/webrat/integrations/rails.rb +25 -0
data/lib/webrat/integrations/rspec-rails.rb +11 -0
data/lib/webrat/integrations/selenium.rb +11 -0
data/lib/webrat/rspec-rails.rb +2 -10
data/lib/webrat/selenium.rb +0 -10
data/lib/webrat/selenium/application_servers.rb +1 -1
data/lib/webrat/selenium/application_servers/external.rb +1 -1
data/lib/webrat/selenium/location_strategy_javascript/label.js +29 -3
data/lib/webrat/selenium/location_strategy_javascript/webrat.js +1 -0
data/lib/webrat/selenium/location_strategy_javascript/webratlink.js +24 -4
data/lib/webrat/selenium/selenium_rc_server.rb +2 -2
data/lib/webrat/selenium/selenium_session.rb +21 -2
data/lib/webrat/selenium/silence_stream.rb +1 -1
data/spec/integration/mechanize/spec/spec_helper.rb +3 -1
data/spec/integration/rails/app/controllers/{application.rb → application_controller.rb} +0 -0
data/spec/integration/rails/app/controllers/webrat_controller.rb +3 -0
data/spec/integration/rails/app/views/buttons/show.html.erb +0 -2
data/spec/integration/rails/app/views/webrat/buttons.html.erb +0 -2
data/spec/integration/rails/app/views/webrat/within.html.erb +3 -0
data/spec/integration/rails/config/environment.rb +1 -1
data/spec/integration/rails/config/routes.rb +1 -0
data/spec/integration/rails/test/integration/button_click_test.rb +12 -26
data/spec/integration/rails/test/integration/fill_in_test.rb +1 -1
data/spec/integration/rails/test/integration/link_click_test.rb +1 -1
data/spec/integration/rails/test/integration/webrat_test.rb +35 -9
data/spec/integration/rails/test/test_helper.rb +1 -0
data/spec/private/core/configuration_spec.rb +2 -31
data/spec/private/core/field_spec.rb +14 -16
data/spec/private/mechanize/mechanize_adapter_spec.rb +0 -2
data/spec/private/nokogiri_spec.rb +2 -2
data/spec/private/rails/rails_adapter_spec.rb +0 -27
data/spec/public/basic_auth_spec.rb +13 -2
data/spec/public/click_button_spec.rb +10 -12
data/spec/public/click_link_spec.rb +21 -0
data/spec/public/fill_in_spec.rb +15 -0
data/spec/public/matchers/have_selector_spec.rb +4 -0
data/spec/public/select_spec.rb +232 -26
data/spec/spec_helper.rb +2 -0
data/webrat.gemspec +305 -313
metadata +21 -25
data/VERSION +0 -1
data/lib/webrat/core/xml/hpricot.rb +0 -19
data/lib/webrat/core/xml/nokogiri.rb +0 -76
data/lib/webrat/core/xml/rexml.rb +0 -24
data/lib/webrat/merb_adapter.rb +0 -82
data/lib/webrat/merb_multipart_support.rb +0 -27
data/spec/private/core/logging_spec.rb +0 -10
data/spec/private/merb/attaches_file_spec.rb +0 -93
data/spec/private/merb/merb_adapter_spec.rb +0 -61

data/spec/integration/rails/test/test_helper.rb CHANGED

@@ -12,6 +12,7 @@ require "webrat"
 Webrat.configure do |config|
   config.mode = ENV['WEBRAT_INTEGRATION_MODE'].to_sym
+  config.selenium_browser_key = '*safari'
 end
 ActionController::Base.class_eval do

data/spec/private/core/configuration_spec.rb CHANGED

@@ -1,28 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 describe Webrat::Configuration do
-  Spec::Matchers.define :parse_with_nokogiri do
-    match do |config|
-      config.parse_with_nokogiri?
-    end
-  end
   Spec::Matchers.define :open_error_files do
     match do |config|
       config.open_error_files?
     end
   end
   it "should have a mode" do
     Webrat.configuration.should respond_to(:mode)
   end
-  it "should use Nokogiri as the parser by default" do
-    config = Webrat::Configuration.new
-    config.should parse_with_nokogiri
-  end
   it "should open error files by default" do
     config = Webrat::Configuration.new
     config.should open_error_files
@@ -56,24 +45,6 @@ describe Webrat::Configuration do
     config.selenium_server_port.should == 1234
   end
-  [:rails,
-  :selenium,
-  :rack,
-  :sinatra,
-  :mechanize].each do |mode|
-    it "should require correct lib when in #{mode} mode" do
-      config = Webrat::Configuration.new
-      config.should_receive(:require).with("webrat/#{mode}")
-      config.mode = mode
-    end
-  end
-  it "should require merb_adapter when in merb mode" do
-    config = Webrat::Configuration.new
-    config.should_receive(:require).with("webrat/merb_adapter")
-    config.mode = :merb
-  end
   describe "Selenium" do
     before :each do
       @config = Webrat::Configuration.new

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

@@ -2,18 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 module Webrat
   describe Field do
-    unless RUBY_PLATFORM =~ /java/
-      it "should have nice inspect output" do
-        html = <<-HTML
-          <html>
-          <input type='checkbox' checked='checked' />
-          </html>
-        HTML
+    it "should have nice inspect output" do
+      html = <<-HTML
+        <html>
+        <input type='checkbox' checked='checked' />
+        </html>
+      HTML
-        element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
-        checkbox = CheckboxField.new(nil, element)
-        checkbox.inspect.should =~ /#<Webrat::CheckboxField @element=<input type=['"]checkbox['"] checked(=['"]checked['"])?\/?>>/
-      end
+      element = Webrat::XML.document(html).css("input").first
+      checkbox = CheckboxField.new(nil, element)
+      checkbox.inspect.should =~ /^#<Webrat::CheckboxField @element=/
     end
   end
@@ -25,7 +23,7 @@ module Webrat
         </html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       checkbox = CheckboxField.new(nil, element)
       checkbox.should be_checked
     end
@@ -37,7 +35,7 @@ module Webrat
         </html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       checkbox = CheckboxField.new(nil, element)
       checkbox.should_not be_checked
     end
@@ -51,7 +49,7 @@ module Webrat
         </html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       radio_button = RadioField.new(nil, element)
       radio_button.should be_checked
     end
@@ -61,7 +59,7 @@ module Webrat
         <html><input type='radio' /></html>
       HTML
-      element = Webrat::XML.css_search(Webrat::XML.document(html), "input").first
+      element = Webrat::XML.document(html).css("input").first
       radio_button = RadioField.new(nil, element)
       radio_button.should_not be_checked
     end
@@ -77,7 +75,7 @@ module Webrat
         </html>
       HTML
-      element    = Webrat::XML.css_search(Webrat::XML.document(html), 'input').first
+      element    = Webrat::XML.document(html).css('input').first
       text_field = TextField.new(nil, element)
       text_field.to_param.should == { 'email' => 'user@example.com' }
     end

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

@@ -1,7 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "webrat/mechanize"
 describe Webrat::MechanizeAdapter do
   before :each do
     Webrat.configuration.mode = :mechanize

data/spec/private/nokogiri_spec.rb CHANGED

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
+# if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
   describe "Nokogiri Extension" do
     include Webrat::Matchers
@@ -74,4 +74,4 @@ if defined?(Nokogiri::XML) && Webrat.configuration.parse_with_nokogiri?
       end
     end
   end
-end
+# end

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

@@ -1,8 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "action_controller"
-require "webrat/rails"
 describe Webrat::RailsAdapter do
   before :each do
     Webrat.configuration.mode = :rails
@@ -86,28 +83,4 @@ describe Webrat::RailsAdapter do
   it "should provide a doc_root" do
     Webrat::RailsAdapter.new(mock("integration session")).should respond_to(:doc_root)
   end
-  it "should accept an ActiveRecord argument to #within and translate to a selector using dom_id" do
-    pending "Move this to spec/public/within_spec.rb"
-    body = <<-HTML
-      <a href="/page1">Edit</a>
-      <div id="new_object">
-        <a href="/page2">Edit</a>
-      </div>
-    HTML
-    response = mock("response", :body => body, :headers => {}, :code => 200)
-    @integration_session.stub!(:response => response)
-    @integration_session.should_receive(:get).with("/page2", {}, nil)
-    rails_session = Webrat::RailsAdapter.new(@integration_session)
-    object = Object.new
-    object.stub!(:id => nil)
-    rails_session.within(object) do
-      rails_session.click_link 'Edit'
-    end
-  end
 end

data/spec/public/basic_auth_spec.rb CHANGED

@@ -6,7 +6,7 @@ describe "Basic Auth HTTP headers" do
   end
   it "should be present in visit" do
-    webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
+    webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ="})
     visit("/")
   end
@@ -18,7 +18,18 @@ describe "Basic Auth HTTP headers" do
       </form>
       </html>
     HTML
-    webrat_session.should_receive(:post).with("/form1", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ=\n"})
+    webrat_session.should_receive(:post).with("/form1", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQ="})
     click_button
   end
+  context "with long username and password combination" do
+    before do
+      basic_auth('user', 'secret1234567890123456789012345678901234567890123456789012345678901234567890')
+    end
+    it "should be present, without new lines, in visit" do
+      webrat_session.should_receive(:get).with("/", {}, {'HTTP_AUTHORIZATION' => "Basic dXNlcjpzZWNyZXQxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkw"})
+      visit("/")
+    end
+  end
 end

data/spec/public/click_button_spec.rb CHANGED

@@ -331,18 +331,16 @@ describe "click_button" do
   end
   it "should properly handle HTML entities in textarea default values" do
-    pending "needs bug fix" do
-      with_html <<-HTML
-        <html>
-        <form method="post" action="/posts">
-          <textarea name="post[body]">Peanut butter &amp; jelly</textarea>
-          <input type="submit" />
-        </form>
-        </html>
-      HTML
-      webrat_session.should_receive(:post).with("/posts", "post" => {"body" => "Peanut butter & jelly"})
-      click_button
-    end
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/posts">
+        <textarea name="post[body]">Peanut butter &amp; jelly</textarea>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/posts", "post" => {"body" => "Peanut butter & jelly"})
+    click_button
   end
   it "should send default selected option value from select" do

data/spec/public/click_link_spec.rb CHANGED

@@ -144,6 +144,27 @@ describe "click_link" do
     click_link "Posts"
   end
+  it "should click rails 2.3.4 javascript links with authenticity tokens" do
+    with_html <<-HTML
+      <html>
+      <a href="/posts" onclick="var f = document.createElement('form');
+        f.style.display = 'none';
+        this.parentNode.appendChild(f);
+        f.method = 'POST';
+        f.action = this.href;
+        var s = document.createElement('input');
+        s.setAttribute('type', 'hidden');
+        s.setAttribute('name', 'authenticity_token');
+        s.setAttribute('value', 'aa79cb354597a60a3786e7e291ed4f74d77d3a62=/$a');
+        f.appendChild(s);
+        f.submit();
+        return false;">Posts</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/posts", "authenticity_token" => "aa79cb354597a60a3786e7e291ed4f74d77d3a62=/$a")
+    click_link "Posts"
+  end
   it "should click rails javascript delete links" do
     with_html <<-HTML
       <html>

data/spec/public/fill_in_spec.rb CHANGED

@@ -16,6 +16,21 @@ describe "fill_in" do
     click_button
   end
+  it "should support multiline values" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <label for="user_text">User Text</label>
+        <textarea id="user_text" name="user[text]"></textarea>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "user" => {"text" => "One\nTwo"})
+    fill_in "User Text", :with => "One\nTwo"
+    click_button
+  end
   it "should work with password fields" do
     with_html <<-HTML
       <html>

data/spec/public/matchers/have_selector_spec.rb CHANGED

@@ -61,6 +61,10 @@ describe "have_selector" do
         @body.should have_selector("li", :count => 4)
       }.should raise_error(Spec::Expectations::ExpectationNotMetError)
     end
+    it "should convert a string to an integer for count" do
+      @body.should have_selector("li", :count => "3")
+    end
   end
   describe "specifying nested elements" do

data/spec/public/select_spec.rb CHANGED

@@ -168,6 +168,36 @@ describe "select" do
     click_button
   end
+  it "should find options by regexp with HTML entities" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="month"><option>Peanut butter &amp; jelly</option></select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
+    select /Peanut butter & jelly/
+    click_button
+  end
+  it "should not find options by regexp with HTML entities in the regexp" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="month"><option>Peanut butter &amp; jelly</option></select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    lambda {
+      select /Peanut butter &amp; jelly/
+    }.should raise_error(Webrat::NotFoundError)
+  end
   it "should fail if no option matching the regexp exists" do
     with_html <<-HTML
       <html>
@@ -201,35 +231,47 @@ describe "select" do
   end
   it "should properly handle submitting HTML entities in select values" do
-    pending "needs bug fix" do
-      with_html <<-HTML
-        <html>
-        <form method="post" action="/login">
-          <select name="month"><option>Peanut butter &amp; jelly</option></select>
-          <input type="submit" />
-        </form>
-        </html>
-      HTML
-      webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
-      click_button
-    end
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="month"><option>Peanut butter &amp; jelly</option></select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
+    click_button
   end
   it "should properly handle locating with HTML entities in select values" do
-    pending "needs bug fix" do
-      with_html <<-HTML
-        <html>
-        <form method="post" action="/login">
-          <select name="month"><option>Peanut butter &amp; jelly</option></select>
-          <input type="submit" />
-        </form>
-        </html>
-      HTML
-      lambda {
-        select "Peanut butter & jelly"
-      }.should_not raise_error(Webrat::NotFoundError)
-    end
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="month"><option>Peanut butter &amp; jelly</option></select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "month" => "Peanut butter & jelly")
+    select "Peanut butter & jelly"
+    click_button
+  end
+  it "should not locate based on HTML entities" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="month"><option>Peanut butter &amp; jelly</option></select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    lambda {
+      select "Peanut butter &amp; jelly"
+    }.should raise_error(Webrat::NotFoundError)
   end
   it "should submit duplicates selected options as a single value" do
@@ -246,4 +288,168 @@ describe "select" do
     click_button
   end
+  it "should allow fields to be unselected" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes">
+          <option value="tshirt" selected="selected">tshirt</option>
+          <option value="pants">pants</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", {"clothes"=>""})
+    unselect "tshirt"
+    click_button
+  end
+  #
+  # Mutliple Selection Fields
+  #
+  it "should not submit any values for multiples without any selected" 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", {})
+    click_button
+  end
+  it "should submit with preselected values" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option value="tshirt" selected="selected">tshirt</option>
+          <option value="pants" selected="selected">pants</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "clothes" => ['tshirt', 'pants'])
+    click_button
+  end
+  it "should allow selection of multiple fields" 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'
+    click_button
+  end
+  it "should not overwrite preselected multiples" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option value="tshirt" selected="selected">tshirt</option>
+          <option value="pants">pants</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "clothes" => ['tshirt', 'pants'])
+    select 'pants'
+    click_button
+  end
+  it "should allow fields that exist to be selected or throw errors" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option value="top" selected="selected">shirt</option>
+          <option value="pants">trousers</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    lambda { select "shirt" }.should_not raise_error(Webrat::NotFoundError)
+    lambda { select "trousers" }.should_not raise_error(Webrat::NotFoundError)
+    lambda { select "shoes" }.should raise_error(Webrat::NotFoundError)
+  end
+  it "should allow selected fields to be unselected" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option value="tshirt" selected="selected">tshirt</option>
+          <option value="pants" selected="selected">pants</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "clothes" => ['pants'])
+    unselect 'tshirt'
+    click_button
+  end
+  it "should be able to select options with special characters" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option>tshirt &amp; sweater</option>
+          <option>pants &amp; socks</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "clothes" => ['pants & socks'])
+    select 'pants & socks'
+    click_button
+  end
+  it "should be able to unselect options with special characters" do
+    with_html <<-HTML
+      <html>
+      <form method="post" action="/login">
+        <select name="clothes[]" multiple="multiple">
+          <option selected="selected">tshirt &amp; sweater</option>
+          <option selected="selected">pants &amp; socks</option>
+        </select>
+        <input type="submit" />
+      </form>
+      </html>
+    HTML
+    webrat_session.should_receive(:post).with("/login", "clothes" => ['tshirt & sweater'])
+    unselect 'pants & socks'
+    click_button
+  end
 end