capybara 2.0.0.beta2 → 2.0.0.beta4

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

@@ -1,40 +1,38 @@
-shared_examples_for "session with window support" do
-  describe '#within_window' do
-    before(:each) do
-      @session.visit('/within_popups')
+Capybara::SpecHelper.spec '#within_window', :requires => [:windows] do
+  before(:each) do
+    @session.visit('/within_popups')
+  end
+  after(:each) do
+    @session.within_window("firstPopup") do
+      @session.evaluate_script('window.close()')
     end
-    after(:each) do
-      @session.within_window("firstPopup") do
-        @session.evaluate_script('window.close()')
-      end
-      @session.within_window("secondPopup") do
-        @session.evaluate_script('window.close()')
-      end
+    @session.within_window("secondPopup") do
+      @session.evaluate_script('window.close()')
     end
+  end
 
-    it "should find the div in firstPopup" do
-      @session.within_window("firstPopup") do
-        @session.find("//*[@id='divInPopupOne']").text.should eql 'This is the text of divInPopupOne'
-      end
+  it "should find the div in firstPopup" do
+    @session.within_window("firstPopup") do
+      @session.find("//*[@id='divInPopupOne']").text.should eql 'This is the text of divInPopupOne'
+    end
+  end
+  it "should find the div in secondPopup" do
+    @session.within_window("secondPopup") do
+      @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
     end
-    it "should find the div in secondPopup" do
-      @session.within_window("secondPopup") do
-        @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
-      end
+  end
+  it "should find the divs in both popups" do
+    @session.within_window("secondPopup") do
+      @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
     end
-    it "should find the divs in both popups" do
-      @session.within_window("secondPopup") do
-        @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
-      end
-      @session.within_window("firstPopup") do
-        @session.find("//*[@id='divInPopupOne']").text.should eql 'This is the text of divInPopupOne'
-      end
+    @session.within_window("firstPopup") do
+      @session.find("//*[@id='divInPopupOne']").text.should eql 'This is the text of divInPopupOne'
     end
-    it "should find the div in the main window after finding a div in a popup" do
-      @session.within_window("secondPopup") do
-        @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
-      end
-      @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
+  end
+  it "should find the div in the main window after finding a div in a popup" do
+    @session.within_window("secondPopup") do
+      @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
     end
+    @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
   end
 end

data/lib/capybara/spec/spec_helper.rb

@@ -0,0 +1,84 @@
+require "rspec"
+require "capybara"
+require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec deprecation warning
+require "capybara/spec/test_app"
+require "capybara/spec/spec_helper"
+require "nokogiri"
+
+module Capybara
+  module SpecHelper
+    class << self
+      def configure(config)
+        filter = lambda do |requires, metadata|
+          if requires and metadata[:skip]
+            requires.any? do |require|
+              metadata[:skip].include?(require)
+            end
+          else
+            false
+          end
+        end
+        config.filter_run_excluding :requires => filter
+        config.before do
+          Capybara.app = TestApp
+
+          Capybara.configure do |config|
+            config.default_selector = :xpath
+          end
+
+          Capybara.default_wait_time = 1
+        end
+      end
+
+      def spec(name, options={}, &block)
+        @specs ||= []
+        @specs << [name, options, block]
+      end
+
+      def run_specs(session, name, options={})
+        specs = @specs
+        describe Capybara::Session, name, options do
+          include Capybara::SpecHelper
+          before do
+            @session = session
+          end
+          after do
+            @session.reset_session!
+          end
+          specs.each do |name, options, block|
+            describe name, options do
+              class_eval(&block)
+            end
+          end
+        end
+      end
+    end # class << self
+
+    def silence_stream(stream)
+      old_stream = stream.dup
+      stream.reopen(RbConfig::CONFIG['host_os'] =~ /rmswin|mingw/ ? 'NUL:' : '/dev/null')
+      stream.sync = true
+      yield
+    ensure
+      stream.reopen(old_stream)
+    end
+
+    def quietly
+      silence_stream(STDOUT) do
+        silence_stream(STDERR) do
+          yield
+        end
+      end
+    end
+
+    def extract_results(session)
+      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.text.lstrip
+    end
+  end
+end
+
+RSpec.configure do |config|
+  Capybara::SpecHelper.configure(config)
+end
+
+Dir[File.dirname(__FILE__)+'/session/*'].each { |group| require group }

data/lib/capybara/spec/test_app.rb

@@ -151,9 +151,11 @@ class TestApp < Sinatra::Base
 
   post '/upload_multiple' do
     begin
-      buffer = []
-      buffer << "Content-type: #{params[:form][:multiple_documents][0][:type]}"
-      buffer << "File content: #{params[:form][:multiple_documents][0][:tempfile].read}"
+      buffer = ["#{params[:form][:multiple_documents].size}"]
+      params[:form][:multiple_documents].each do |doc|
+        buffer << "Content-type: #{doc[:type]}"
+        buffer << "File content: #{doc[:tempfile].read}"
+      end
       buffer.join(' | ')
     rescue
       'No files uploaded'

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

@@ -253,6 +253,7 @@
     <button type="submit" id="click_me_123" title="Click Title button" value="click_me">Click me!</button>
     <button type="submit" name="form[no_value]">No Value!</button>
     <button id="no_type">No Type!</button>
+    <input type="button" disabled value="Disabled button"/>
   </p>
 </form>
 

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

@@ -21,7 +21,7 @@
   Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
   dolore eu fugiat <a href="/redirect" id="red">Redirect</a> pariatur. Excepteur sint occaecat cupidatat non proident,
   sunt in culpa qui officia
-  text   with
+  text   with &nbsp;
   whitespace
   id est laborum.
 </p>
@@ -45,6 +45,7 @@ banana</textarea>
   <a href="/with_simple_html#anchor">Anchor on different page</a>
   <a href="/with_html#anchor">Anchor on same page</a>
   <a href="with_html">Relative</a>
+  <a href="//<%= request.host_with_port %>/foo">Protocol</a>
   <input type="text" checked="checked" id="checked_field">
   <a href="/redirect"><img width="20" height="20" alt="very fine image" /></a>
   <a href="/with_simple_html"><img width="20" height="20" alt="fine image" /></a>
@@ -72,6 +73,10 @@ banana</textarea>
   <a id="visible" class="visibility">visible link</a>
 </div>
 
+<div>
+  Number 42
+</div>
+
 <ul>
   <li id="john_monkey">Monkey John</li>
   <li id="paul_monkey">Monkey Paul</li>

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

@@ -45,6 +45,7 @@
 
     <p>
       <a id="reload-link" href="#">Reload!</a>
+      <em>this won't change</em>
       <div id="reload-me"><em>waiting to be reloaded</em></div>
     </p>
 

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.0.0.beta2'
+  VERSION = '2.0.0.beta4'
 end

data/spec/basic_node_spec.rb

@@ -36,8 +36,8 @@ describe Capybara do
       Capybara.add_selector :lifeform do
         xpath { |name| "//option[contains(.,'#{name}')]" }
       end
-      string.should have_selector(:page)
-      string.should_not have_selector(:'does-not-exist')
+      string.should have_selector(:id, "page")
+      string.should_not have_selector(:id, 'does-not-exist')
       string.should have_selector(:lifeform, "Monkey")
       string.should_not have_selector(:lifeform, "Gorilla")
     end

data/spec/capybara_spec.rb

@@ -42,5 +42,14 @@ describe Capybara do
       Capybara.server.should == server
     end
   end
+end
 
+describe Capybara::Session do
+  context 'with non-existant driver' do
+    it "should raise an error" do
+      expect {
+        Capybara::Session.new(:quox, TestApp).driver
+      }.to raise_error(Capybara::DriverNotFoundError)
+    end
+  end
 end

data/spec/dsl_spec.rb

@@ -1,10 +1,22 @@
 require 'spec_helper'
 require 'capybara/dsl'
 
+class TestClass
+  include Capybara::DSL
+end
+
+Capybara::SpecHelper.run_specs TestClass.new, "DSL", :skip => [
+  :js,
+  :screenshot,
+  :frames,
+  :windows
+]
+
 describe Capybara::DSL do
   after do
     Capybara.session_name = nil
     Capybara.default_driver = nil
+    Capybara.javascript_driver = nil
     Capybara.use_default_driver
     Capybara.app = TestApp
   end
@@ -98,13 +110,21 @@ describe Capybara::DSL do
   end
 
   describe '#using_wait_time' do
+    before do
+      @previous_wait_time = Capybara.default_wait_time
+    end
+
+    after do
+      Capybara.default_wait_time = @previous_wait_time
+    end
+
     it "should switch the wait time and switch it back" do
       in_block = nil
       Capybara.using_wait_time 6 do
         in_block = Capybara.default_wait_time
       end
       in_block.should == 6
-      Capybara.default_wait_time.should == 0
+      Capybara.default_wait_time.should == @previous_wait_time
     end
 
     it "should ensure wait time is reset" do
@@ -113,11 +133,7 @@ describe Capybara::DSL do
           raise "hell"
         end
       end.to raise_error
-      Capybara.default_wait_time.should == 0
-    end
-
-    after do
-      Capybara.default_wait_time = 0
+      Capybara.default_wait_time.should == @previous_wait_time
     end
   end
 
@@ -211,10 +227,6 @@ describe Capybara::DSL do
       @session = Class.new { include Capybara::DSL }.new
     end
 
-    it_should_behave_like "session"
-    it_should_behave_like "session without javascript support"
-    it_should_behave_like "session without screenshot support"
-
     it "should be possible to include it in another class" do
       klass = Class.new do
         include Capybara::DSL

data/spec/rack_test_spec.rb

@@ -1,5 +1,16 @@
 require 'spec_helper'
 
+module TestSessions
+  RackTest = Capybara::Session.new(:rack_test, TestApp)
+end
+
+Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :skip => [
+  :js,
+  :screenshot,
+  :frames,
+  :windows
+]
+
 describe Capybara::Session do
   context 'with rack test driver' do
     before do
@@ -23,21 +34,21 @@ describe Capybara::Session do
         @session.driver.options[:respect_data_method] = true
         @session.visit "/with_html"
         @session.click_link "A link with data-method"
-        @session.body.should include('The requested object was deleted')
+        @session.html.should include('The requested object was deleted')
       end
 
       it "should not use data-method if option is false" do
         @session.driver.options[:respect_data_method] = false
         @session.visit "/with_html"
         @session.click_link "A link with data-method"
-        @session.body.should include('Not deleted')
+        @session.html.should include('Not deleted')
       end
 
       it "should use data-method if available even if it's capitalized" do
         @session.driver.options[:respect_data_method] = true
         @session.visit "/with_html"
         @session.click_link "A link with capitalized data-method"
-        @session.body.should include('The requested object was deleted')
+        @session.html.should include('The requested object was deleted')
       end
 
       after do
@@ -50,16 +61,10 @@ describe Capybara::Session do
         it "should submit an empty form-data section if no file is submitted" do
           @session.visit("/form")
           @session.click_button("Upload Empty")
-          @session.body.should include('Successfully ignored empty file field.')
+          @session.html.should include('Successfully ignored empty file field.')
         end
       end
     end
-
-    it_should_behave_like "session"
-    it_should_behave_like "session without javascript support"
-    it_should_behave_like "session without screenshot support"
-    it_should_behave_like "session with headers support"
-    it_should_behave_like "session with status code support"
   end
 end
 
@@ -72,27 +77,27 @@ describe Capybara::RackTest::Driver do
     it 'should always set headers' do
       @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
       @driver.visit('/get_header')
-      @driver.body.should include('foobar')
+      @driver.html.should include('foobar')
     end
 
     it 'should keep headers on link clicks' do
       @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
       @driver.visit('/header_links')
       @driver.find('.//a').first.click
-      @driver.body.should include('foobar')
+      @driver.html.should include('foobar')
     end
 
     it 'should keep headers on form submit' do
       @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
       @driver.visit('/header_links')
       @driver.find('.//input').first.click
-      @driver.body.should include('foobar')
+      @driver.html.should include('foobar')
     end
 
     it 'should keep headers on redirects' do
       @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
       @driver.visit('/get_header_via_redirect')
-      @driver.body.should include('foobar')
+      @driver.html.should include('foobar')
     end
   end
 
@@ -102,15 +107,15 @@ describe Capybara::RackTest::Driver do
 
       @driver.visit('/redirect')
       @driver.response.header['Location'].should be_nil
-      @driver.browser.current_url.should eq "#{@driver.browser.current_host}/landed"
+      @driver.browser.current_url.should match %r{/landed$}
     end
 
     it "is possible to not follow redirects" do
       @driver = Capybara::RackTest::Driver.new(TestApp, :follow_redirects => false)
 
       @driver.visit('/redirect')
-      @driver.response.header['Location'].should eq "#{@driver.browser.current_host}/redirect_again"
-      @driver.browser.current_url.should eq "#{@driver.browser.current_host}/redirect"
+      @driver.response.header['Location'].should match %r{/redirect_again$}
+      @driver.browser.current_url.should match %r{/redirect$}
     end
   end
 
@@ -122,13 +127,13 @@ describe Capybara::RackTest::Driver do
 
       it "should follow 5 redirects" do
         @driver.visit("/redirect/5/times")
-        @driver.body.should include('redirection complete')
+        @driver.html.should include('redirection complete')
       end
 
       it "should not follow more than 6 redirects" do
-        running do
+        expect do
           @driver.visit("/redirect/6/times")
-        end.should raise_error(Capybara::InfiniteRedirectError)
+        end.to raise_error(Capybara::InfiniteRedirectError)
       end
     end
 
@@ -139,13 +144,13 @@ describe Capybara::RackTest::Driver do
 
       it "should follow 21 redirects" do
         @driver.visit("/redirect/21/times")
-        @driver.body.should include('redirection complete')
+        @driver.html.should include('redirection complete')
       end
 
       it "should not follow more than 21 redirects" do
-        running do
+        expect do
           @driver.visit("/redirect/22/times")
-        end.should raise_error(Capybara::InfiniteRedirectError)
+        end.to raise_error(Capybara::InfiniteRedirectError)
       end
     end
   end