RubyGems - davidtrogers-webrat - Versions diffs - 0.4.4.2 → 0.7.0 - Mend

davidtrogers-webrat 0.4.4.2 → 0.7.0

Files changed (145) hide show

data/.gitignore +3 -1
data/Gemfile +19 -0
data/History.txt +99 -9
data/Rakefile +141 -207
data/Thorfile +118 -0
data/lib/webrat.rb +10 -23
data/lib/webrat/{mechanize.rb → adapters/mechanize.rb} +6 -2
data/lib/webrat/adapters/merb.rb +11 -0
data/lib/webrat/adapters/rack.rb +25 -0
data/lib/webrat/{rails.rb → adapters/rails.rb} +5 -37
data/lib/webrat/adapters/sinatra.rb +9 -0
data/lib/webrat/core.rb +0 -1
data/lib/webrat/core/configuration.rb +22 -18
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 +113 -31
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 +8 -7
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 +16 -8
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 +3 -8
data/lib/webrat/core/matchers/have_xpath.rb +3 -28
data/lib/webrat/core/methods.rb +5 -4
data/lib/webrat/core/mime.rb +11 -22
data/lib/webrat/core/save_and_open_page.rb +7 -29
data/lib/webrat/core/scope.rb +17 -2
data/lib/webrat/core/session.rb +31 -19
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 -13
data/lib/webrat/selenium.rb +0 -11
data/lib/webrat/selenium/application_server_factory.rb +40 -0
data/lib/webrat/selenium/application_servers.rb +5 -0
data/lib/webrat/selenium/application_servers/base.rb +46 -0
data/lib/webrat/selenium/application_servers/external.rb +26 -0
data/lib/webrat/selenium/application_servers/merb.rb +50 -0
data/lib/webrat/selenium/application_servers/rails.rb +44 -0
data/lib/webrat/selenium/application_servers/sinatra.rb +37 -0
data/lib/webrat/selenium/location_strategy_javascript/label.js +30 -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/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 +8 -6
data/lib/webrat/selenium/selenium_session.rb +43 -14
data/lib/webrat/selenium/silence_stream.rb +2 -2
data/spec/fakes/{test_session.rb → test_adapter.rb} +4 -5
data/spec/integration/mechanize/Rakefile +7 -0
data/spec/integration/mechanize/config.ru +2 -0
data/spec/integration/mechanize/sample_app.rb +20 -0
data/spec/integration/mechanize/spec/mechanize_spec.rb +22 -0
data/spec/integration/mechanize/spec/spec_helper.rb +29 -0
data/spec/integration/merb/app/controllers/testing.rb +9 -0
data/spec/integration/merb/app/views/testing/upload.html.erb +9 -0
data/spec/integration/merb/config/router.rb +1 -0
data/spec/integration/merb/spec/spec_helper.rb +2 -0
data/spec/integration/merb/spec/webrat_spec.rb +7 -0
data/spec/integration/rack/app.rb +89 -0
data/spec/integration/rack/test/helper.rb +21 -0
data/spec/integration/rack/test/webrat_rack_test.rb +57 -51
data/spec/integration/rails/app/controllers/{application.rb → application_controller.rb} +0 -0
data/spec/integration/rails/app/controllers/webrat_controller.rb +16 -9
data/spec/integration/rails/app/views/buttons/show.html.erb +0 -2
data/spec/integration/rails/app/views/links/show.html.erb +2 -1
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 +2 -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 +8 -2
data/spec/integration/rails/test/integration/webrat_test.rb +53 -5
data/spec/integration/rails/test/test_helper.rb +7 -5
data/spec/integration/sinatra/test/test_helper.rb +3 -2
data/spec/private/core/configuration_spec.rb +8 -27
data/spec/private/core/field_spec.rb +14 -16
data/spec/private/core/link_spec.rb +1 -1
data/spec/private/core/session_spec.rb +23 -26
data/spec/private/mechanize/{mechanize_session_spec.rb → mechanize_adapter_spec.rb} +4 -12
data/spec/private/nokogiri_spec.rb +2 -2
data/spec/private/rails/{rails_session_spec.rb → rails_adapter_spec.rb} +11 -42
data/spec/private/selenium/application_servers/rails_spec.rb +26 -0
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/contain_spec.rb +12 -19
data/spec/public/matchers/have_selector_spec.rb +6 -2
data/spec/public/matchers/have_xpath_spec.rb +3 -3
data/spec/public/save_and_open_spec.rb +15 -17
data/spec/public/select_spec.rb +232 -26
data/spec/public/selenium/application_server_factory_spec.rb +49 -0
data/spec/public/selenium/application_servers/external_spec.rb +12 -0
data/spec/public/selenium/selenium_session_spec.rb +37 -0
data/spec/spec_helper.rb +5 -1
data/vendor/selenium-server.jar +0 -0
metadata +119 -69
data/.dotest/0001 +0 -34
data/.dotest/0002 +0 -34
data/.dotest/binary +0 -1
data/.dotest/final-commit +0 -1
data/.dotest/head-name +0 -1
data/.dotest/info +0 -5
data/.dotest/keep +0 -1
data/.dotest/last +0 -1
data/.dotest/msg +0 -0
data/.dotest/msg-clean +0 -0
data/.dotest/next +0 -1
data/.dotest/onto +0 -1
data/.dotest/orig-head +0 -1
data/.dotest/patch +0 -29
data/.dotest/sign +0 -1
data/.dotest/utf8 +0 -1
data/.dotest/whitespace +0 -1
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_session.rb +0 -65
data/lib/webrat/rack.rb +0 -24
data/lib/webrat/rack_test.rb +0 -32
data/lib/webrat/selenium/application_server.rb +0 -73
data/lib/webrat/selenium/merb_application_server.rb +0 -48
data/lib/webrat/selenium/rails_application_server.rb +0 -42
data/lib/webrat/selenium/sinatra_application_server.rb +0 -35
data/lib/webrat/sinatra.rb +0 -44
data/spec/integration/rack/rack_app.rb +0 -16
data/spec/integration/rack/test/test_helper.rb +0 -20
data/spec/private/core/logging_spec.rb +0 -10
data/spec/private/merb/merb_session_spec.rb +0 -42

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

@@ -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
@@ -122,7 +126,7 @@ describe "have_selector" do
       it "should throw an exception when the body doesnt have matching selection" do
         lambda {
           assert_have_selector("p")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
@@ -134,7 +138,7 @@ describe "have_selector" do
       it "should throw an exception when the body does contain the selection" do
         lambda {
           assert_have_no_selector("div")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end

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

@@ -94,7 +94,7 @@ describe "have_xpath" do
       node.should have_xpath("//a[@href='http://example.org']")
     end
   end
   it "should allow descendant selectors in the block" do
     @body.should have_xpath("//div[@id='main']") do |node|
       node.should have_xpath("//ul//a")
@@ -117,7 +117,7 @@ describe "have_xpath" do
       it "should throw an exception when the body doesnt have matching xpath" do
         lambda {
           assert_have_xpath("//p")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
@@ -129,7 +129,7 @@ describe "have_xpath" do
       it "should throw an exception when the body does contain the xpath" do
         lambda {
           assert_have_no_xpath("//div")
-        }.should raise_error(Test::Unit::AssertionFailedError)
+        }.should raise_error(AssertionFailedError)
       end
     end
   end

data/spec/public/save_and_open_spec.rb CHANGED Viewed

@@ -10,42 +10,40 @@ describe "save_and_open_page" do
         <body>
           <h1>Hello world</h1>
           <img src="/images/bar.png" />
+          <img src='/images/foo.png' />
         </body>
       </html>
     HTML
     File.stub!(:exist? => true)
     Time.stub!(:now => 1234)
-    webrat_session.stub!(:open_in_browser)
+    require "launchy"
+    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
+  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
-  it "should rewrite image paths" do
-    @file_handle.should_receive(:write) do |html|
-      html.should =~ %r|#{webrat_session.doc_root}/images/bar.png|s
-    end
+  it "should open the temp file in a browser with Launchy" do
+    Launchy::Browser.should_receive(:run)
     save_and_open_page
   end
-  it "should open the temp file in a browser" do
-    webrat_session.should_receive(:open_in_browser).with(filename)
-    save_and_open_page
-  end
+  it "should fail gracefully if Launchy is not available" do
+    Launchy::Browser.should_receive(:run).and_raise(LoadError)
-  def filename
-    File.expand_path("./webrat-#{Time.now}.html")
+    lambda do
+      save_and_open_page
+    end.should_not raise_error
   end
 end

data/spec/public/select_spec.rb CHANGED Viewed

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

data/spec/public/selenium/application_server_factory_spec.rb ADDED Viewed

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require "webrat/selenium/silence_stream"
+require "webrat/selenium/application_server_factory"
+require "webrat/selenium/application_servers"
+describe Webrat::Selenium::ApplicationServerFactory do
+  it "should require and create a sinatra server in sinatra mode" do
+    server = mock(Webrat::Selenium::ApplicationServers::Sinatra)
+    Webrat.configuration.application_framework = :sinatra
+    Webrat::Selenium::ApplicationServerFactory.should_receive(:require).with("webrat/selenium/application_servers/sinatra")
+    Webrat::Selenium::ApplicationServers::Sinatra.should_receive(:new).and_return(server)
+    Webrat::Selenium::ApplicationServerFactory.app_server_instance.should == server
+  end
+  it "should require and create a merb server in merb mode" do
+    server = mock(Webrat::Selenium::ApplicationServers::Merb)
+    Webrat.configuration.application_framework = :merb
+    Webrat::Selenium::ApplicationServerFactory.should_receive(:require).with("webrat/selenium/application_servers/merb")
+    Webrat::Selenium::ApplicationServers::Merb.should_receive(:new).and_return(server)
+    Webrat::Selenium::ApplicationServerFactory.app_server_instance
+  end
+  it "should require and create a rails server in rails mode" do
+    server = mock(Webrat::Selenium::ApplicationServers::Rails)
+    Webrat.configuration.application_framework = :rails
+    Webrat::Selenium::ApplicationServerFactory.should_receive(:require).with("webrat/selenium/application_servers/rails")
+    Webrat::Selenium::ApplicationServers::Rails.should_receive(:new).and_return(server)
+    Webrat::Selenium::ApplicationServerFactory.app_server_instance
+  end
+  it "should require and create a rails server in external mode" do
+    server = mock(Webrat::Selenium::ApplicationServers::External)
+    Webrat.configuration.application_framework = :external
+    Webrat::Selenium::ApplicationServerFactory.should_receive(:require).with("webrat/selenium/application_servers/external")
+    Webrat::Selenium::ApplicationServers::External.should_receive(:new).and_return(server)
+    Webrat::Selenium::ApplicationServerFactory.app_server_instance
+  end
+  it "should handle unknown servers with an exception in unknown modes" do
+    Webrat.configuration.application_framework = :unknown
+    lambda {
+      Webrat::Selenium::ApplicationServerFactory.app_server_instance
+    }.should raise_error(Webrat::WebratError)
+  end
+end

data/spec/public/selenium/application_servers/external_spec.rb ADDED Viewed

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require "webrat/selenium/application_servers/base"
+require "webrat/selenium/application_servers/external"
+describe Webrat::Selenium::ApplicationServers::External do
+  it "should just boot up with no exceptions" do
+    Webrat::Selenium::ApplicationServers::External.new.boot
+  end
+end