davidtrogers-webrat 0.4.4.2 → 0.7.0

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/links/show.html.erb

@@ -1,4 +1,5 @@
 <h1>Webrat Links Page</h1>
 <a href="/links?value=LinkByText">LinkByText</a><br />
 <a href="/links?value=link_by_id" id="link_by_id">id</a><br />
-<a href="/links?value=LinkByTitle" title="LinkByTitle">title</a>
+<a href="/links?value=LinkByTitle" title="LinkByTitle">title</a><br />
+<a href="/links?value=link_with_parens">Link With (parens)</a><br />

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/app/views/webrat/within.html.erb

@@ -0,0 +1,3 @@
+<div id="new_object">
+  <a href="/">Edit Object</a>
+</div>

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/config/routes.rb

@@ -7,10 +7,12 @@ ActionController::Routing::Routes.draw do |map|
     webrat.internal_redirect  "/internal_redirect", :action => "internal_redirect"
     webrat.external_redirect  "/external_redirect", :action => "external_redirect"
     webrat.infinite_redirect  "/infinite_redirect", :action => "infinite_redirect"
+    webrat.host_redirect      "/host_redirect",     :action => "host_redirect"
 
     webrat.before_redirect_form     "/before_redirect_form",    :action => "before_redirect_form"
     webrat.redirect_to_show_params  "/redirect_to_show_params", :action => "redirect_to_show_params"
     webrat.show_params              "/show_params",             :action => "show_params"
+    webrat.within                   "/within",                  :action => "within"
 
     webrat.root :action => "form"
   end

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
+end

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

@@ -21,4 +21,4 @@ class FillInTest < ActionController::IntegrationTest
     visit fields_path
     fill_in "[Field]:", :with => "value"
   end
-end
+end

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

@@ -12,10 +12,16 @@ class LinkClickTest < ActionController::IntegrationTest
     click_link "link_by_id"
     assert_contain("Link:link_by_id")
   end
-  
+
   test "should click link by title" do
     visit links_path
     click_link "LinkByTitle"
     assert_contain("Link:LinkByTitle")
   end
-end
+
+  test "should be able to click links with non letter characters" do
+    visit links_path
+    click_link "Link With (parens)"
+    assert_contain("Link:link_with_parens")
+  end
+end

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

@@ -22,11 +22,14 @@ class WebratTest < ActionController::IntegrationTest
     check "TOS"
     select "January"
     click_button "Test"
+    assert_contain "OK"
   end
 
   test "should check the value of a field" do
-    visit "/"
-    assert field_labeled("Prefilled").value, "text"
+    webrat.simulate do
+      visit "/"
+      assert field_labeled("Prefilled").value, "text"
+    end
   end
 
   test "should not carry params through redirects" do
@@ -34,19 +37,47 @@ class WebratTest < ActionController::IntegrationTest
     fill_in "Text field", :with => "value"
     click_button
 
+    automate do
+      selenium.wait_for_page_to_load
+    end
     assert response.body !~ /value/
     assert response.body =~ /custom_param/
   end
 
   test "should follow internal redirects" do
     visit internal_redirect_path
-    assert !response.redirect?
+    webrat.simulate do
+      assert !response.redirect?
+    end
     assert response.body.include?("OK")
   end
 
   test "should not follow external redirects" do
-    visit external_redirect_path
-    assert response.redirect?
+    webrat.simulate do
+      visit external_redirect_path
+      assert response.redirect?
+    end
+  end
+
+  test "should recognize the host header to follow redirects properly" do
+    webrat.simulate do
+      header "Host", "foo.bar"
+      visit host_redirect_path
+      assert !response.redirect?
+      assert response.body.include?("OK")
+    end
+  end
+
+  test "should click link by text" do
+    visit internal_redirect_path
+    click_link "Test Link Text"
+    assert_contain("Webrat Form")
+  end
+
+  test "should click link by id" do
+    visit internal_redirect_path
+    click_link "link_id"
+    assert_contain("Webrat Form")
   end
 
   test "should be able to assert xpath" do
@@ -59,6 +90,23 @@ class WebratTest < ActionController::IntegrationTest
     assert_have_selector "h1"
   end
 
+  test "should accept an Object argument to #within and translate using dom_id" do
+    webrat.simulate do
+      visit within_path
+
+      object = Object.new
+      def object.id
+        nil
+      end
+
+      within(object) do
+        click_link "Edit Object"
+      end
+
+      assert_contain "Webrat Form"
+    end
+  end
+
   # Firefox detects and prevents infinite redirects under Selenium
   unless ENV['WEBRAT_INTEGRATION_MODE'] == 'selenium'
      test "should detect infinite redirects" do

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

@@ -2,15 +2,17 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
-begin
-  require "redgreen"
-rescue MissingSourceFile
-end
+# begin
+#   require "redgreen"
+# rescue MissingSourceFile
+# end
 
-require File.dirname(__FILE__) + "/../../../../lib/webrat"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+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/integration/sinatra/test/test_helper.rb

@@ -1,8 +1,9 @@
 require "rubygems"
 require "test/unit"
-require "redgreen"
+# require "redgreen"
 
-require File.dirname(__FILE__) + "/../../../../lib/webrat"
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+require "webrat"
 
 Webrat.configure do |config|
   config.mode = :sinatra

data/spec/private/core/configuration_spec.rb

@@ -1,16 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Webrat::Configuration do
-  predicate_matchers[:parse_with_nokogiri]  = :parse_with_nokogiri?
-  predicate_matchers[:open_error_files]     = :open_error_files?
 
-  it "should have a mode" do
-    Webrat.configuration.should respond_to(:mode)
+  Spec::Matchers.define :open_error_files do
+    match do |config|
+      config.open_error_files?
+    end
   end
 
-  it "should use Nokogiri as the parser by default" do
-    config = Webrat::Configuration.new
-    config.should parse_with_nokogiri
+  it "should have a mode" do
+    Webrat.configuration.should respond_to(:mode)
   end
 
   it "should open error files by default" do
@@ -46,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_session when in merb mode" do
-    config = Webrat::Configuration.new
-    config.should_receive(:require).with("webrat/merb_session")
-    config.mode = :merb
-  end
-
   describe "Selenium" do
     before :each do
       @config = Webrat::Configuration.new
@@ -92,11 +73,11 @@ describe Webrat::Configuration do
     it 'should default selenium browser key to *firefox' do
       @config.selenium_browser_key.should == '*firefox'
     end
-    
+
     it 'should default selenium browser startup timeout to 5 seconds' do
       @config.selenium_browser_startup_timeout.should == 5
     end
-    
+
     it 'should allow overriding of the browser startup timeout' do
       @config.selenium_browser_startup_timeout = 10
       @config.selenium_browser_startup_timeout.should == 10

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 Webrat.on_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/core/link_spec.rb

@@ -4,7 +4,7 @@ describe Webrat::Link do
 #  include Webrat::Link
 
   before do
-    webrat_session = mock(Webrat::TestSession)
+    webrat_session = mock(Webrat::TestAdapter)
     @link_text_with_nbsp = 'Link' + [0xA0].pack("U") + 'Text'
   end