capybara 0.3.9 → 0.4.0.rc

data/lib/capybara/spec/session/unselect_spec.rb

@@ -12,6 +12,13 @@ shared_examples_for "unselect" do
         extract_results(@session)['underwear'].should_not include('Commando')
       end
 
+      it "should unselect an option without a select box" do
+        @session.unselect('Commando')
+        @session.click_button('awesome')
+        extract_results(@session)['underwear'].should include('Briefs', 'Boxer Briefs')
+        extract_results(@session)['underwear'].should_not include('Commando')
+      end
+
       it "should unselect an option from a select box by label" do
         @session.unselect('Commando', :from => 'Underwear')
         @session.click_button('awesome')
@@ -47,7 +54,7 @@ shared_examples_for "unselect" do
 
     context "with an option that doesn't exist" do
       it "should raise an error" do
-        running { @session.unselect('Does not Exist', :from => 'form_underwear') }.should raise_error(Capybara::OptionNotFound)
+        running { @session.unselect('Does not Exist', :from => 'form_underwear') }.should raise_error(Capybara::ElementNotFound)
       end
     end
   end

data/lib/capybara/spec/session/within_spec.rb

@@ -53,7 +53,7 @@ shared_examples_for "within" do
       context "with nested scopes" do
         it "should respect the inner scope" do
           @session.within("//div[@id='for_bar']") do
-            @session.within("//li[contains(.,'Bar')]") do
+            @session.within(".//li[contains(.,'Bar')]") do
               @session.click_link('Go')
             end
           end
@@ -62,7 +62,7 @@ shared_examples_for "within" do
 
         it "should respect the outer scope" do
           @session.within("//div[@id='another_foo']") do
-            @session.within("//li[contains(.,'With Simple HTML')]") do
+            @session.within(".//li[contains(.,'With Simple HTML')]") do
               @session.click_link('Go')
             end
           end
@@ -82,12 +82,12 @@ shared_examples_for "within" do
           @session.within("//div[@id='for_bar']") do
             running {
               running {
-                @session.within("//div[@id='doesnotexist']") do
+                @session.within(".//div[@id='doesnotexist']") do
                 end
               }.should raise_error(Capybara::ElementNotFound)
-            }.should_not change { @session.has_xpath?("//div[@id='another_foo']") }.from(false)
+            }.should_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(false)
           end
-        }.should_not change { @session.has_xpath?("//div[@id='another_foo']") }.from(true)
+        }.should_not change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)
       end
     end
 

data/lib/capybara/spec/views/form.erb

@@ -155,8 +155,27 @@
       <option selected="selected">Briefs</option>
       <option selected="selected">Commando</option>
       <option selected="selected">Frenchman's Pantalons</option>
+      <option selected="selected" value="thermal">Long Johns</option>
     </select>
   </p>
+ 
+  <p>
+    <span>First address<span>
+    <label for='address1_street'>Street</label>
+    <input type="text" name="form[addresses][][street]" value="" id="address1_street">
+  
+    <label for='address1_city'>City</label>
+    <input type="text" name="form[addresses][][city]" value="" id="address1_city"> 
+  </p>  
+
+  <p>  
+    <span>Second address<span>
+    <label for='address2_street'>Street</label>
+    <input type="text" name="form[addresses][][street]" value="" id="address2_street">
+  
+    <label for='address2_city'>City</label>
+    <input type="text" name="form[addresses][][city]" value="" id="address2_city"> 
+  </p>
 
   <div style="display:none;">
     <label for="form_first_name_hidden">
@@ -165,6 +184,50 @@
     </label>
   </div>
 
+  <p>
+    <label for="form_disabled_text_field">
+      Disabled Text Field
+      <input type="text" name="form[disabled_text_field]" value="Should not see me" id="form_disabled_text_field" disabled="disabled" />
+    </label>
+  </p>
+
+  <p>
+    <label for="form_disabled_textarea">
+      Disabled Textarea
+      <textarea name="form[disabled_textarea]" value="Should not see me" id="form_disabled_textarea" disabled="disabled"></textarea>
+    </label>
+  </p>
+
+  <p>
+    <label for="form_disabled_checkbox">
+      Disabled Checkbox
+      <input type="checkbox" name="form[disabled_checkbox]" value="Should not see me" id="form_disabled_checkbox" checked="checked" disabled="disabled" />
+    </label>
+  </p>
+
+  <p>
+    <label for="form_disabled_radio">
+      Disabled Checkbox
+      <input type="radio" name="form[disabled_radio]" value="Should not see me" id="form_disabled_radio" checked="checked" disabled="disabled" />
+    </label>
+  </p>
+
+  <p>
+    <label for="form_disabled_select">
+      Disabled Select
+      <select name="form[disabled_select]" id="form_disabled_select" disabled="disabled">
+        <option value="Should not see me" selected="selected">Should not see me</option>
+      </select>
+    </label>
+  </p>
+
+  <p>
+    <label for="form_disabled_file">
+      Disabled File
+      <input type="file" name="form[disabled_file]" value="/should/not/see/me" id="form_disabled_file" disabled="disabled" />
+    </label>
+  </p>
+
   <p>
     <input type="button" name="form[fresh]" id="fresh_btn" value="i am fresh"/>
     <input type="submit" name="form[awesome]" id="awe123" value="awesome"/>
@@ -172,10 +235,11 @@
     <input type="image" name="form[okay]" id="okay556" value="okay" alt="oh hai thar"/>
     <button type="submit" id="click_me_123" value="click_me">Click me!</button>
     <button type="submit" name="form[no_value]">No Value!</button>
+    <button id="no_type">No Type!</button>
   </p>
 </form>
 
-<form action="/form/get?foo=bar" method="get">
+<form id="get-form" action="/form/get?foo=bar" method="get">
   <p>
     <label for="form_middle_name">Middle Name</label>
     <input type="text" name="form[middle_name]" value="Darren" id="form_middle_name"/>

data/lib/capybara/spec/views/popup_one.erb

@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>This is the title of the first popup</title>
+    </head>
+    <body>
+        <div id="divInPopupOne">This is the text of divInPopupOne</div>
+    </body>
+</html>

data/lib/capybara/spec/views/popup_two.erb

@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>This is the title of popup two</title>
+    </head>
+    <body>
+        <div id="divInPopupTwo">This is the text of divInPopupTwo</div>
+    </body>
+</html>

data/lib/capybara/spec/views/with_html.erb

@@ -41,3 +41,8 @@
   <div id="hidden_via_ancestor">Inside element with hidden ancestor</div>
   <a href="/with_simple_html" title="awesome title" class="simple">hidden link</a>
 </div>
+
+<ul>
+  <li id="john_monkey">Monkey John</li>
+  <li id="paul_monkey">Monkey Paul</li>
+</ul>

data/lib/capybara/spec/views/within_popups.erb

@@ -0,0 +1,25 @@
+<html>
+    <head>
+        <title>With Popups</title>
+        <script language="javascript" type="text/javascript">
+        <!--
+
+        function popItUp(name, url) {
+          newwindow=window.open(url,name,'height=200,width=150');
+          if (window.focus) { newwindow.focus() }
+          return false;
+        }
+
+        function init() {
+          popItUp('firstPopup', '/popup_one');
+          popItUp('secondPopup', '/popup_two');
+        }
+        window.onload = init; 
+
+        // -->
+        </script>
+    </head>
+    <body>
+        <div id="divInMainWindow">This is the text for divInMainWindow</div>
+    </body>
+</html>

data/lib/capybara/{save_and_open_page.rb → util/save_and_open_page.rb}

@@ -1,7 +1,5 @@
 module Capybara
-  module SaveAndOpenPage
-    extend(self)
-
+  class << self
     def save_and_open_page(html)
       name = File.join(*[Capybara.save_and_open_page_path, "capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}.html"].compact)
 
@@ -17,6 +15,8 @@ module Capybara
       open_in_browser(tempfile.path)
     end
 
+  protected
+
     def open_in_browser(path) # :nodoc
       require "launchy"
       Launchy::Browser.run(path)

data/lib/capybara/util/timeout.rb

@@ -0,0 +1,27 @@
+module Capybara
+  class << self
+
+    ##
+    # Provides timeout similar to standard library Timeout, but avoids threads
+    #
+    def timeout(seconds = 1, driver = nil, &block)
+      start_time = Time.now
+
+      result = nil
+
+      until result
+        return result if result = yield
+
+        delay = seconds - (Time.now - start_time)
+        if delay <= 0
+          raise TimeoutError
+        end
+
+        driver && driver.wait_until(delay)
+
+        sleep(0.05)
+      end
+    end
+
+  end
+end

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '0.3.9'
+  VERSION = '0.4.0.rc'
 end

data/spec/capybara_spec.rb

@@ -1,18 +1,28 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
-
-require 'capybara'
+require 'spec_helper'
 
 describe Capybara do
-  
+
   describe 'default_wait_time' do
     after do
-      Capybara.default_wait_time = 2
+      Capybara.default_wait_time = @previous_default_time
     end
-    
+
     it "should be changeable" do
+      @previous_default_time = Capybara.default_wait_time
       Capybara.default_wait_time = 5
       Capybara.default_wait_time.should == 5
     end
   end
-  
-end
+
+  describe '.register_driver' do
+    it "should add a new driver" do
+      Capybara.register_driver :schmoo do |app|
+        Capybara::Driver::RackTest.new(app)
+      end
+      session = Capybara::Session.new(:schmoo, TestApp)
+      session.visit('/')
+      session.body.should include("Hello world!")
+    end
+  end
+
+end

data/spec/driver/celerity_driver_spec.rb

@@ -1,17 +1,13 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
-if RUBY_PLATFORM =~ /java/
-  describe Capybara::Driver::Celerity do
-    before(:all) do
-      @driver = Capybara::Driver::Celerity.new(TestApp)
-    end
-
-    it_should_behave_like "driver"
-    it_should_behave_like "driver with javascript support"
-    it_should_behave_like "driver with header support"
-    it_should_behave_like "driver with status code support"
-    it_should_behave_like "driver with cookies support"
+describe Capybara::Driver::Celerity, :jruby => :platform do
+  before(:all) do
+    @driver = TestSessions::Celerity.driver
   end
-else
-  puts "#{File.basename(__FILE__)} requires JRuby; skipping.."
+
+  it_should_behave_like "driver"
+  it_should_behave_like "driver with javascript support"
+  it_should_behave_like "driver with header support"
+  it_should_behave_like "driver with status code support"
+  it_should_behave_like "driver with cookies support"
 end

data/spec/driver/culerity_driver_spec.rb

@@ -1,8 +1,9 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
+
+describe Capybara::Driver::Culerity, :jruby => :installed do
 
-describe Capybara::Driver::Culerity do
   before(:all) do
-    @driver = Capybara::Driver::Culerity.new(TestApp)
+    @driver = TestSessions::Culerity.driver
   end
 
   it_should_behave_like "driver"

data/spec/driver/rack_test_driver_spec.rb

@@ -1,8 +1,22 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+# encoding: utf-8
+require 'spec_helper'
+require 'stringio'
+
+def capture(*streams)
+  streams.map! { |stream| stream.to_s }
+  begin
+    result = StringIO.new
+    streams.each { |stream| eval "$#{stream} = result" }
+    yield
+  ensure
+    streams.each { |stream| eval("$#{stream} = #{stream.upcase}") }
+  end
+  result.string
+end
 
 describe Capybara::Driver::RackTest do
   before do
-    @driver = Capybara::Driver::RackTest.new(TestApp)
+    @driver = TestSessions::RackTest.driver
   end
 
   it "should throw an error when no rack app is given" do
@@ -11,6 +25,29 @@ describe Capybara::Driver::RackTest do
     end.should raise_error(ArgumentError)
   end
 
+  if '1.9'.respond_to?(:encode)
+    describe "with non-binary parameters" do
+
+      it "should convert attribute values to binary" do
+        output = capture(:stderr) {
+          @driver.visit('/mypage', :param => 'µ')
+        }.should_not =~ %r{warning: regexp match /.../n against to UTF-8 string}
+      end
+
+      it "should convert attribute with Array to binary" do
+        output = capture(:stderr) {
+          @driver.visit('/mypage', :param => ['µ'])
+        }.should_not =~ %r{warning: regexp match /.../n against to UTF-8 string}
+      end
+
+      it "should convert path to binary" do
+        output = capture(:stderr) {
+          @driver.visit('/mypage'.encode('utf-8'))
+        }.should_not =~ %r{warning: regexp match /.../n against to UTF-8 string}
+      end
+    end
+  end
+
   it_should_behave_like "driver"
   it_should_behave_like "driver with header support"
   it_should_behave_like "driver with status code support"

data/spec/driver/remote_culerity_driver_spec.rb

@@ -1,22 +1,20 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
-describe Capybara::Driver::Culerity do
+describe Capybara::Driver::Culerity, :jruby => :installed do
   before(:all) do
     Capybara.app_host = "http://capybara-testapp.heroku.com"
-    Capybara.run_server = false
-    @driver = Capybara::Driver::Culerity.new(TestApp)
+    @driver = TestSessions::Culerity.driver
   end
-  
+
   after(:all) do
     Capybara.app_host = nil
-    Capybara.run_server = true
   end
 
   it "should navigate to a fully qualified remote page" do
     @driver.visit('http://capybara-testapp.heroku.com/foo')
     @driver.body.should include('Another World')
   end
-  
+
   it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver with header support"

data/spec/driver/remote_selenium_driver_spec.rb

@@ -1,19 +1,16 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Driver::Selenium do
-  before(:all) do
-    Capybara.app_host = "http://capybara-testapp.heroku.com"
-  end
-  
-  after(:all) do
-    Capybara.app_host = nil
+  before do
+    #Capybara.app_host = "http://capybara-testapp.heroku.com"
+    @driver = TestSessions::Selenium.driver
   end
 
-  before do
-    @driver = Capybara::Driver::Selenium.new(TestApp)
+  after do
+    Capybara.app_host = nil
   end
 
   it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver without status code support"
-end
+end