honkster-webrat 0.6.0 → 0.6.0.9

data/lib/webrat/selenium/selenium_session.rb

@@ -132,6 +132,7 @@ module Webrat
       selenium.wait_for_element locator, :timeout_in_seconds => 5
       selenium.click locator
     end
+
     alias_method :uncheck, :check
 
     webrat_deprecate :checks, :check
@@ -182,7 +183,7 @@ module Webrat
 HTML of the page was:
 
 #{selenium.get_html_source}"
-EOS
+        EOS
       end
 
       raise Webrat::TimeoutError.new(error_message)
@@ -235,8 +236,12 @@ EOS
 
 
     def create_browser
-      $browser = ::Selenium::Client::Driver.new(Webrat.configuration.selenium_server_address || "localhost",
-      Webrat.configuration.selenium_server_port, Webrat.configuration.selenium_browser_key, "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port}")
+      $browser = ::Selenium::Client::Driver.new(
+        Webrat.configuration.selenium_server_address || "localhost",
+        Webrat.configuration.selenium_server_port,
+        Webrat.configuration.selenium_browser_key,
+        "http://#{Webrat.configuration.application_address}:#{Webrat.configuration.application_port}"),
+        Webrat.configuration.default_timeout_in_seconds || 10
       $browser.set_speed(0) unless Webrat.configuration.selenium_server_address
 
       at_exit do

data/lib/webrat.rb

@@ -2,11 +2,7 @@ require "rack"
 require "nokogiri"
 
 module Webrat
-  # The common base class for all exceptions raised by Webrat.
-  class WebratError < StandardError
-  end
-
-  VERSION = "0.6.rc1"
+  VERSION = "0.6.0.9"
 
   autoload :MechanizeAdapter, "webrat/adapters/mechanize"
   autoload :MerbAdapter, "webrat/adapters/merb"

data/spec/integration/mechanize/spec/spec_helper.rb

@@ -21,7 +21,9 @@ Spec::Runner.configure do |config|
   end
 
   config.after :suite do
-    Process.kill("TERM", File.read("rack.pid").to_i)
+    if File.exists?("rack.pid")
+      Process.kill("TERM", File.read("rack.pid").to_i)
+    end
   end
 end
 

data/spec/integration/rails/app/views/buttons/show.html.erb

@@ -1,11 +1,9 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag "/buttons" do %>
-  <input type="button" id="input_button_id" value="input_button_value" />
   <input type="submit" id="input_submit_id" value="input_submit_value" />
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="" />
 
-  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

data/spec/integration/rails/app/views/webrat/buttons.html.erb

@@ -1,11 +1,9 @@
 <h1 id='form_title' class='form title'>Webrat Buttons Form</h1>
 
 <% form_tag submit_path do %>
-  <input type="button" id="input_button_id" value="input_button_value">
   <input type="submit" id="input_submit_id" value="input_submit_value">
   <input type="image" id="input_image_id" value="input_image_value" alt="input_image_alt" src="">
 
-  <button type="button" id="button_button_id" value="button_button_value">button_button_text</button>
   <button type="submit" id="button_submit_id" value="button_submit_value">button_submit_text</button>
   <button type="image" id="button_image_id" value="button_image_value">button_image_text</button>
 <% end %>

data/spec/integration/rails/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+# RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 

data/spec/integration/rails/test/integration/button_click_test.rb

@@ -1,80 +1,66 @@
 require 'test_helper'
 
 class ButtonClickTest < ActionController::IntegrationTest
-  # <button type="button" ...>
-  test "should click button with type button by id" do
-    visit buttons_path
-    click_button "button_button_id"
-  end
-  test "should click button with type button by value" do
-    visit buttons_path
-    click_button "button_button_value"
-  end
-  test "should click button with type button by html" do
-    visit buttons_path
-    click_button "button_button_text"
-  end
-
   # <button type="submit" ...>
   test "should click button with type submit by id" do
     visit buttons_path
     click_button "button_submit_id"
+    assert_contain "success"
   end
   test "should click button with type submit by value" do
     visit buttons_path
     click_button "button_submit_value"
+    assert_contain "success"
   end
   test "should click button with type submit by html" do
     visit buttons_path
     click_button "button_submit_text"
+    assert_contain "success"
   end
 
   # <button type="image" ...>
   test "should click button with type image by id" do
     visit buttons_path
     click_button "button_image_id"
+    assert_contain "success"
   end
   test "should click button with type image by value" do
     visit buttons_path
     click_button "button_image_value"
+    assert_contain "success"
   end
   test "should click button with type image by html" do
     visit buttons_path
     click_button "button_image_text"
-  end
-
-  # <input type="button" ...>
-  test "should click image with type button by id" do
-    visit buttons_path
-    click_button "input_button_id"
-  end
-  test "should click input with type button by value" do
-    visit buttons_path
-    click_button "input_button_value"
+    assert_contain "success"
   end
 
   # <input type="submit" ...>
   test "should click input with type submit by id" do
     visit buttons_path
     click_button "input_submit_id"
+    assert_contain "success"
   end
   test "should click input with type submit by value" do
     visit buttons_path
     click_button "input_submit_value"
+    assert_contain "success"
   end
 
   # <input type="image" ...>
   test "should click input with type image by id" do
     visit buttons_path
     click_button "input_image_id"
+    assert_contain "success"
   end
   test "should click input with type image by value" do
     visit buttons_path
     click_button "input_image_value"
+    assert_contain "success"
   end
   test "should click input with type image by alt" do
     visit buttons_path
     click_button "input_image_alt"
+    assert_contain "success"
   end
-
 end

data/spec/integration/rails/test/integration/webrat_test.rb

@@ -22,6 +22,7 @@ class WebratTest < ActionController::IntegrationTest
     check "TOS"
     select "January"
     click_button "Test"
+    assert_contain "OK"
   end
 
   test "should check the value of a field" do

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

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

@@ -22,6 +22,11 @@ describe Webrat::Configuration do
     config.infinite_redirect_limit.should == 10
   end
 
+  it "should timeout after 10 seconds by default" do
+    config = Webrat::Configuration.new
+    config.default_timeout_in_seconds.should == 10
+  end
+
   it "should be configurable with a block" do
     Webrat.configure do |config|
       config.open_error_files = false

data/spec/private/core/field_spec.rb

@@ -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.document(html).css("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
 

data/spec/private/core/session_spec.rb

@@ -23,6 +23,7 @@ describe Webrat::Session do
 
   it "should provide a current_page for backwards compatibility" do
     session = Webrat::Session.new
+    session.stub!(:warn)
     current_page = session.current_page
     current_page.should_not be_nil
     current_page.should respond_to(:url)

data/spec/public/basic_auth_spec.rb

@@ -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_link_spec.rb

@@ -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>
@@ -284,7 +305,7 @@ describe "click_link" do
     end
   end
 
-  it "should fail is the link doesn't exist" do
+  it "should fail if the link doesn't exist" do
     with_html <<-HTML
       <html>
       <a href="/page">Link text</a>
@@ -361,17 +382,15 @@ describe "click_link" do
   end
 
   it "should not match on non-text contents" do
-    pending "needs fix" do
-      with_html <<-HTML
-        <html>
-        <a href="/page1"><span class="location">My house</span></a>
-        <a href="/page2">Location</a>
-        </html>
-      HTML
+    with_html <<-HTML
+      <html>
+      <a href="/page1"><span class="location">My house</span></a>
+      <a href="/page2">Location</a>
+      </html>
+    HTML
 
-      webrat_session.should_receive(:get).with("/page2", {})
-      click_link "Location"
-    end
+    webrat_session.should_receive(:get).with("/page2", {})
+    click_link "Location"
   end
 
   it "should click link within a selector" do
@@ -442,70 +461,100 @@ describe "click_link" do
     click_link "Jump to foo bar"
   end
 
-  it "should matches_text? on regexp" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return(@link_text_with_nbsp)
-    link.matches_text?(/link/i).should == 0
+  it "should match on regexp" do
+    with_html <<-HTML
+      <html>
+      <a href="/page">Link Text</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/page", {})
+    click_link /link/i
   end
 
-  it "should matches_text? on link_text" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return(@link_text_with_nbsp)
-    link.matches_text?("Link Text").should == 0
+  it "should match on link_text" do
+    with_html <<-HTML
+      <html>
+      <a href="/page">Link Text</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/page", {})
+    click_link "Link Text"
   end
 
-  it "should matches_text? on substring" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return(@link_text_with_nbsp)
-    link.matches_text?("nk Te").should_not be_nil
+  it "should match on substring" do
+    with_html <<-HTML
+      <html>
+      <a href="/page">Link Text</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/page", {})
+    click_link "nk Te"
   end
 
-  it "should not matches_text? on link_text case insensitive" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return(@link_text_with_nbsp)
-    link.should_receive(:inner_html).and_return('Link&nbsp;Text')
-    link.should_receive(:title).and_return(nil)
-    link.matches_text?("link_text").should == false
+  it "should not match on link_text case insensitive" do
+    with_html <<-HTML
+      <html>
+      <a href="/page">Link&nbsp;Text</a>
+      </html>
+    HTML
+    lambda do
+      click_link "link_text"
+    end.should raise_error(Webrat::NotFoundError)
   end
 
   it "should match text not include &nbsp;" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return('LinkText')
-    link.matches_text?("LinkText").should == 0
+    with_html <<-HTML
+      <html>
+      <a href="/page">LinkText</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/page", {})
+    click_link "LinkText"
   end
 
-  it "should not matches_text? on wrong text" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    nbsp = [0xA0].pack("U")
-    link.should_receive(:text).and_return("Some"+nbsp+"Other"+nbsp+"Link")
-    link.should_receive(:inner_html).and_return("Some&nbsp;Other&nbsp;Link")
-    link.should_receive(:title).and_return(nil)
-    link.matches_text?("Link Text").should == false
+  it "should not match on wrong text" do
+    with_html <<-HTML
+      <html>
+      <a href="/page">Some&nbsp;Other&nbsp;Link</a>
+      </html>
+    HTML
+    lambda do
+      click_link "Link Text"
+    end.should raise_error(Webrat::NotFoundError)
   end
 
   it "should match text including character reference" do
-    pending "need to update these"
-    no_ko_gi_ri = [0x30CE,0x30B3,0x30AE,0x30EA]
+    no_ko_gi_ri = [0x30CE, 0x30B3, 0x30AE, 0x30EA]
     nokogiri_ja_kana = no_ko_gi_ri.pack("U*")
     nokogiri_char_ref = no_ko_gi_ri.map{|c| "&#x%X;" % c }.join("")
 
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return(nokogiri_ja_kana)
-    link.matches_text?(nokogiri_ja_kana).should == 0
+    with_html <<-HTML
+      <html>
+      <a href="/page">#{nokogiri_char_ref}</a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/page", {})
+    click_link nokogiri_ja_kana
+  end
+
+  it "should match img link by src" do
+    with_html <<-HTML
+      <html>
+      <a href="/page"><img src="logo.png" /></a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/page", {})
+    click_link "logo.png"
   end
 
-  it "should match img link" do
-    pending "need to update these"
-    link = Webrat::Link.new(webrat_session, nil)
-    link.should_receive(:text).and_return('')
-    link.should_receive(:inner_html).and_return('<img src="logo.png" />')
-    link.matches_text?('logo.png').should == 10
+  it "should match img link by title" do
+    with_html <<-HTML
+      <html>
+      <a href="/foo"><img src="foo.jpg" title="My image" /></a>
+      </html>
+    HTML
+    webrat_session.should_receive(:get).with("/foo", {})
+    click_link "My image"
   end
 
 end

data/spec/public/save_and_open_spec.rb

@@ -59,6 +59,7 @@ describe "save_and_open_page" do
     Launchy::Browser.should_receive(:run).and_raise(LoadError)
 
     lambda do
+      webrat_session.stub!(:warn)
       save_and_open_page
     end.should_not raise_error
   end

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

@@ -6,7 +6,9 @@ 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
+    server = Webrat::Selenium::ApplicationServers::External.new
+    server.stub!(:warn)
+    server.boot
   end
 
 end

data/spec/public/selenium/selenium_session_spec.rb

@@ -10,7 +10,7 @@ describe Webrat::SeleniumSession do
     @selenium = Webrat::SeleniumSession.new()
   end
 
-  it "should throw timeout instead of spec expectionnotmet error" do
+  it "should throw TimeoutError instead of Spec::Expectations::ExpectationNotMetError" do
     lambda {
       @selenium.wait_for(:timeout => 0.0001) do
         raise ::Spec::Expectations::ExpectationNotMetError
@@ -18,7 +18,7 @@ describe Webrat::SeleniumSession do
     }.should raise_error(Webrat::TimeoutError)
   end
 
-  it "should throw timeout instead of selenium command error" do
+  it "should throw TimeoutError instead of Selenium::CommandError" do
     lambda {
       @selenium.wait_for(:timeout => 0.0001) do
         raise ::Selenium::CommandError
@@ -26,7 +26,7 @@ describe Webrat::SeleniumSession do
     }.should raise_error(Webrat::TimeoutError)
   end
 
-  it "should throw timeout instead of webrat error" do
+  it "should throw TimeoutError instead of WebratError" do
     lambda {
       @selenium.wait_for(:timeout => 0.0001) do
         raise Webrat::WebratError.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-webrat
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.0.9
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -07:00
+date: 2009-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,36 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rails
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.3"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb-core
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: launchy
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: |-
   Webrat lets you quickly write expressive and robust acceptance tests
   for a Ruby web application. It supports simulating a browser inside
@@ -75,17 +45,19 @@ 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
+- honkster-webrat.gemspec
 - install.rb
 - lib/webrat.rb
 - lib/webrat/adapters/mechanize.rb
@@ -198,7 +170,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
@@ -291,14 +263,13 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - vendor/selenium-server.jar
-- webrat.gemspec
 has_rdoc: true
 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 
@@ -315,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: honkster-webrat
+rubyforge_project: webrat
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
@@ -344,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

data/VERSION

@@ -1 +0,0 @@
-0.6.0