capybara 2.0.3 → 2.1.0

data/spec/rspec/matchers_spec.rb

@@ -29,9 +29,28 @@ describe Capybara::RSpecMatchers do
 
         it "fails if matched node count does not equal expected count" do
           expect do
-            "<h1>Text</h1>".should have_css('h1', :count => 2)
-          end.to raise_error(/expected css "h1" to be found 2 times/)
+            "<h1>Text</h1>".should have_css('h1', count: 2)
+          end.to raise_error("expected to find css \"h1\" 2 times, found 1 match: \"Text\"")
         end
+
+        it "fails if matched node count is less than expected minimum count" do
+          expect do
+            "<h1>Text</h1>".should have_css('p', minimum: 1)
+          end.to raise_error("expected to find css \"p\" at least 1 time but there were no matches")
+        end
+
+        it "fails if matched node count is more than expected maximum count" do
+          expect do
+            "<h1>Text</h1><h1>Text</h1><h1>Text</h1>".should have_css('h1', maximum: 2)
+          end.to raise_error('expected to find css "h1" at most 2 times, found 3 matches: "Text", "Text", "Text"')
+        end
+
+        it "fails if matched node count does not belong to expected range" do
+          expect do
+            "<h1>Text</h1>".should have_css('h1', between: 2..3)
+          end.to raise_error("expected to find css \"h1\" between 2 and 3 times, found 1 match: \"Text\"")
+        end
+
       end
 
       context "with should_not" do
@@ -222,7 +241,7 @@ describe Capybara::RSpecMatchers do
 
   describe "have_content matcher" do
     it "gives proper description" do
-      have_content('Text').description.should == "have text \"Text\""
+      have_content('Text').description.should == "text \"Text\""
     end
 
     context "on a string" do
@@ -238,7 +257,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_content? returns false" do
           expect do
             "<h1>Text</h1>".should have_content('No such Text')
-          end.to raise_error(/expected there to be text "No such Text" in "Text"/)
+          end.to raise_error(/expected to find text "No such Text" in "Text"/)
         end
       end
 
@@ -254,7 +273,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_no_content? returns false" do
           expect do
             "<h1>Text</h1>".should_not have_content('Text')
-          end.to raise_error(/expected there not to be text "Text" in "Text"/)
+          end.to raise_error(/expected not to find text "Text" in "Text"/)
         end
       end
     end
@@ -276,7 +295,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_content? returns false" do
           expect do
             page.should have_content('No such Text')
-          end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
+          end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
         context "with default selector CSS" do
@@ -284,7 +303,7 @@ describe Capybara::RSpecMatchers do
           it "fails if has_content? returns false" do
             expect do
               page.should have_content('No such Text')
-            end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
+            end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
           after { Capybara.default_selector = :xpath }
         end
@@ -298,7 +317,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_no_content? returns false" do
           expect do
             page.should_not have_content('This is a test')
-          end.to raise_error(/expected there not to be text "This is a test"/)
+          end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
     end
@@ -306,7 +325,7 @@ describe Capybara::RSpecMatchers do
 
   describe "have_text matcher" do
     it "gives proper description" do
-      have_text('Text').description.should == "have text \"Text\""
+      have_text('Text').description.should == "text \"Text\""
     end
 
     context "on a string" do
@@ -322,13 +341,37 @@ describe Capybara::RSpecMatchers do
         it "fails if has_text? returns false" do
           expect do
             "<h1>Text</h1>".should have_text('No such Text')
-          end.to raise_error(/expected there to be text "No such Text" in "Text"/)
+          end.to raise_error(/expected to find text "No such Text" in "Text"/)
+        end
+
+        it "casts Fixnum to string" do
+          expect do
+            "<h1>Text</h1>".should have_text(3)
+          end.to raise_error(/expected to find text "3" in "Text"/)
+        end
+
+        it "fails if matched text count does not equal to expected count" do
+          expect do
+            "<h1>Text</h1>".should have_text('Text', count: 2)
+          end.to raise_error(/expected to find text "Text" 2 times in "Text"/)
+        end
+
+        it "fails if matched text count is less than expected minimum count" do
+          expect do
+            "<h1>Text</h1>".should have_text('Lorem', minimum: 1)
+          end.to raise_error(/expected to find text "Lorem" at least 1 time in "Text"/)
+        end
+
+        it "fails if matched text count is more than expected maximum count" do
+          expect do
+            "<h1>Text TextText</h1>".should have_text('Text', maximum: 2)
+          end.to raise_error(/expected to find text "Text" at most 2 times in "Text TextText"/)
         end
 
-        it "casts has_text? argument to string" do
+        it "fails if matched text count does not belong to expected range" do
           expect do
-            "<h1>Text</h1>".should have_text(:cast_me)
-          end.to raise_error(/expected there to be text "cast_me" in "Text"/)
+            "<h1>Text</h1>".should have_text('Text', between: 2..3)
+          end.to raise_error(/expected to find text "Text" between 2 and 3 times in "Text"/)
         end
       end
 
@@ -344,7 +387,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_no_text? returns false" do
           expect do
             "<h1>Text</h1>".should_not have_text('Text')
-          end.to raise_error(/expected there not to be text "Text" in "Text"/)
+          end.to raise_error(/expected not to find text "Text" in "Text"/)
         end
       end
     end
@@ -363,10 +406,19 @@ describe Capybara::RSpecMatchers do
           page.should have_text(/test/)
         end
 
+        it "can check for all text" do
+          page.should have_text(:all, 'Some of this text is hidden!')
+        end
+
+        it "can check for visible text" do
+          page.should have_text(:visible, 'Some of this text is')
+          page.should_not have_text(:visible, 'Some of this text is hidden!')
+        end
+
         it "fails if has_text? returns false" do
           expect do
             page.should have_text('No such Text')
-          end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
+          end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
         context "with default selector CSS" do
@@ -374,7 +426,7 @@ describe Capybara::RSpecMatchers do
           it "fails if has_text? returns false" do
             expect do
               page.should have_text('No such Text')
-            end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
+            end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
           after { Capybara.default_selector = :xpath }
         end
@@ -388,7 +440,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_no_text? returns false" do
           expect do
             page.should_not have_text('This is a test')
-          end.to raise_error(/expected there not to be text "This is a test"/)
+          end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
     end
@@ -412,6 +464,42 @@ describe Capybara::RSpecMatchers do
     end
   end
 
+  describe "have_title matcher" do
+    it "gives proper description" do
+      have_title('Just a title').description.should == "have title \"Just a title\""
+    end
+
+    context "on a string" do
+      let(:html) { '<title>Just a title</title>' }
+
+      it "passes if there is such a title" do
+        html.should have_title('Just a title')
+      end
+
+      it "fails if there is no such title" do
+        expect do
+          html.should have_title('No such title')
+        end.to raise_error(/expected there to be title "No such title"/)
+      end
+    end
+
+    context "on a page or node" do
+      before do
+        visit('/with_js')
+      end
+
+      it "passes if there is such a title" do
+        page.should have_title('with_js')
+      end
+
+      it "fails if there is no such title" do
+        expect do
+          page.should have_title('No such title')
+        end.to raise_error(/expected there to be title "No such title"/)
+      end
+    end
+  end
+
   describe "have_button matcher" do
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 

data/spec/server_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Capybara::Server do
 
   it "should spool up a rack server" do
-    @app = proc { |env| [200, {}, "Hello Server!"]}
+    @app = proc { |env| [200, {}, ["Hello Server!"]]}
     @server = Capybara::Server.new(@app).boot
 
     @res = Net::HTTP.start(@server.host, @server.port) { |http| http.get('/') }
@@ -20,7 +20,7 @@ describe Capybara::Server do
   it "should bind to the specified host" do
     Capybara.server_host = '0.0.0.0'
 
-    app = proc { |env| [200, {}, "Hello Server!"]}
+    app = proc { |env| [200, {}, ["Hello Server!"]]}
     server = Capybara::Server.new(app).boot
     server.host.should == '0.0.0.0'
 
@@ -30,7 +30,7 @@ describe Capybara::Server do
   it "should use specified port" do
     Capybara.server_port = 22789
 
-    @app = proc { |env| [200, {}, "Hello Server!"]}
+    @app = proc { |env| [200, {}, ["Hello Server!"]]}
     @server = Capybara::Server.new(@app).boot
 
     @res = Net::HTTP.start(@server.host, 22789) { |http| http.get('/') }
@@ -40,7 +40,7 @@ describe Capybara::Server do
   end
 
   it "should use given port" do
-    @app = proc { |env| [200, {}, "Hello Server!"]}
+    @app = proc { |env| [200, {}, ["Hello Server!"]]}
     @server = Capybara::Server.new(@app, 22790).boot
 
     @res = Net::HTTP.start(@server.host, 22790) { |http| http.get('/') }
@@ -50,8 +50,8 @@ describe Capybara::Server do
   end
 
   it "should find an available port" do
-    @app1 = proc { |env| [200, {}, "Hello Server!"]}
-    @app2 = proc { |env| [200, {}, "Hello Second Server!"]}
+    @app1 = proc { |env| [200, {}, ["Hello Server!"]]}
+    @app2 = proc { |env| [200, {}, ["Hello Second Server!"]]}
 
     @server1 = Capybara::Server.new(@app1).boot
     @server2 = Capybara::Server.new(@app2).boot
@@ -64,8 +64,8 @@ describe Capybara::Server do
   end
 
   it "should use the server if it already running" do
-    @app1 = proc { |env| [200, {}, "Hello Server!"]}
-    @app2 = proc { |env| [200, {}, "Hello Second Server!"]}
+    @app1 = proc { |env| [200, {}, ["Hello Server!"]]}
+    @app2 = proc { |env| [200, {}, ["Hello Second Server!"]]}
 
     @server1a = Capybara::Server.new(@app1).boot
     @server1b = Capybara::Server.new(@app1).boot
@@ -98,4 +98,11 @@ describe Capybara::Server do
       Capybara.server {|app, port| Capybara.run_default_server(app, port)}
     end
   end
+
+  it "is not #responsive? when Net::HTTP raises a SystemCallError" do
+    app = lambda { [200, {}, ['Hello, world']] }
+    server = Capybara::Server.new(app)
+    Net::HTTP.should_receive(:start).and_raise(SystemCallError.allocate)
+    expect(server.responsive?).to eq false
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'capybara/spec/spec_helper'
+require "capybara/spec/spec_helper"
+require "pry"
 
 RSpec.configure do |config|
   Capybara::SpecHelper.configure(config)

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURQRENDQWlTZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJFTVJZd0ZBWURWUVFEREExcWIy
+  NWgKY3k1dWFXTnJiR0Z6TVJVd0V3WUtDWkltaVpQeUxHUUJHUllGWjIxaGFX
+  d3hFekFSQmdvSmtpYUprL0lzWkFFWgpGZ05qYjIwd0hoY05NVE13TWpFMU1q
+  RTFOVE0yV2hjTk1UUXdNakUxTWpFMU5UTTJXakJFTVJZd0ZBWURWUVFECkRB
+  MXFiMjVoY3k1dWFXTnJiR0Z6TVJVd0V3WUtDWkltaVpQeUxHUUJHUllGWjIx
+  aGFXd3hFekFSQmdvSmtpYUoKay9Jc1pBRVpGZ05qYjIwd2dnRWlNQTBHQ1Nx
+  R1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURiOUFaagpnTmRVS0lF
+  Rmt0blJUZXJmWXNDcXBBRlk5N3F0VGJydWo0dUVLSmV5SFJMUjRGTTNzVWU0
+  TjZZYjQ4YTNKTHBBCkhRMUVMaDVjU2RKZHl4OFRFWG1Lc2NycUVjYzJsWFNn
+  YmtvRnB5bzZJQWNFT1NwQzl2bEFleUdwd2tLSS8rYlAKYld3M2pWMjM2cTBD
+  cjdhRk1INm5tVXZKSnNhZE93TnlVWVpXQVRxT3Q2WDNRb0xpRXBoZjdTd2hM
+  ekFaSnI2ZgpIaHZqSjBYbzJ5L0xpSmo5TjBnb09oVUw2dEM1d3M1ajR3eFA4
+  WitZRlkwUTd4N1E2UlFCV2NDVWhjL0dBV2V4CjBlWFJqMlFPVHpWcnJJT25Q
+  TjFqcWlmbnFxVTMwWW9NRk1oL2U2bzN4L3ppWU1uN3pBYkZYU2J0WERLQ0s0
+  QlQKM3pHWmdDaXVlY3NwSHk5L0FnTUJBQUdqT1RBM01Ba0dBMVVkRXdRQ01B
+  QXdIUVlEVlIwT0JCWUVGUGI4K0RZMApmbTlCWmxkYy9lYUtaeGZJNlh1Y01B
+  c0dBMVVkRHdRRUF3SUVzREFOQmdrcWhraUc5dzBCQVFVRkFBT0NBUUVBCkp0
+  WnJqZDlEczVyY0JWUDJMOXZFYTZGMm9zZXE3eWU4YmF2UW85VWg4MWZEQ2JW
+  ZG5hWlBoeU10aDVRaGRJQkwKcEcrdWFmQ01BZmdVMHZRZU5YbkF6SXhtbHRu
+  UDQrZTNJd1IwT2UyMWVVRDZsU1BTdkNvSWFRMmVEVnhvSFBQSgo1TnJKS3hq
+  MnV1TlYxeUdMbVZoWFVGRVQwT2tWdkJnZHhObXRiRTJyUmJ4WGp2NXhxVzZu
+  QnNnVkF6MHFTeEIzCjl5RFRaS1c3KytFbSt5RnVmTWxEcjcrMXJsOGNUeHYx
+  S2o0M0dldTVMVno3bi9sSFlLQWRqZTR1SjNlQnRhZ0kKZHdDSTZtbGVYT3I0
+  TVNSZXpmMTlaVUZyMENxbEZjcnBCU3lPYWtTdFFMTThMYTNFQW1oT0VVYTJV
+  RTJGSWdxNQpSMVNIMW5pKzNiSDdCNHRBa2JXc2tnPT0KLS0tLS1FTkQgQ0VS
+  VElGSUNBVEUtLS0tLQo=
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -44,29 +72,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,39 +102,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: xpath
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: xpath
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +247,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capybara is an integration testing tool for rack based web applications.
   It simulates how a user would interact with a website
 email:
@@ -241,6 +285,7 @@ files:
 - lib/capybara/node/simple.rb
 - lib/capybara/query.rb
 - lib/capybara/rack_test/browser.rb
+- lib/capybara/rack_test/css_handlers.rb
 - lib/capybara/rack_test/driver.rb
 - lib/capybara/rack_test/form.rb
 - lib/capybara/rack_test/node.rb
@@ -269,6 +314,7 @@ files:
 - lib/capybara/spec/session/click_button_spec.rb
 - lib/capybara/spec/session/click_link_or_button_spec.rb
 - lib/capybara/spec/session/click_link_spec.rb
+- lib/capybara/spec/session/current_scope_spec.rb
 - lib/capybara/spec/session/current_url_spec.rb
 - lib/capybara/spec/session/evaluate_script_spec.rb
 - lib/capybara/spec/session/execute_script_spec.rb
@@ -287,6 +333,7 @@ files:
 - lib/capybara/spec/session/has_selector_spec.rb
 - lib/capybara/spec/session/has_table_spec.rb
 - lib/capybara/spec/session/has_text_spec.rb
+- lib/capybara/spec/session/has_title_spec.rb
 - lib/capybara/spec/session/has_xpath_spec.rb
 - lib/capybara/spec/session/headers.rb
 - lib/capybara/spec/session/html_spec.rb
@@ -298,6 +345,7 @@ files:
 - lib/capybara/spec/session/select_spec.rb
 - lib/capybara/spec/session/source_spec.rb
 - lib/capybara/spec/session/text_spec.rb
+- lib/capybara/spec/session/title_spec.rb
 - lib/capybara/spec/session/uncheck_spec.rb
 - lib/capybara/spec/session/unselect_spec.rb
 - lib/capybara/spec/session/visit_spec.rb
@@ -309,7 +357,9 @@ files:
 - lib/capybara/spec/views/buttons.erb
 - lib/capybara/spec/views/fieldsets.erb
 - lib/capybara/spec/views/form.erb
+- lib/capybara/spec/views/frame_child.erb
 - lib/capybara/spec/views/frame_one.erb
+- lib/capybara/spec/views/frame_parent.erb
 - lib/capybara/spec/views/frame_two.erb
 - lib/capybara/spec/views/header_links.erb
 - lib/capybara/spec/views/host_links.erb
@@ -317,11 +367,15 @@ files:
 - lib/capybara/spec/views/popup_two.erb
 - lib/capybara/spec/views/postback.erb
 - lib/capybara/spec/views/tables.erb
+- lib/capybara/spec/views/with_base_tag.erb
+- lib/capybara/spec/views/with_count.erb
+- lib/capybara/spec/views/with_hover.erb
 - lib/capybara/spec/views/with_html.erb
 - lib/capybara/spec/views/with_html_entities.erb
 - lib/capybara/spec/views/with_js.erb
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_simple_html.erb
+- lib/capybara/spec/views/with_title.erb
 - lib/capybara/spec/views/within_frames.erb
 - lib/capybara/spec/views/within_popups.erb
 - lib/capybara/version.rb
@@ -344,7 +398,13 @@ files:
 - License.txt
 homepage: http://github.com/jnicklas/capybara
 licenses: []
-post_install_message: 
+post_install_message: ! "IMPORTANT! Some of the defaults have changed in Capybara
+  2.1. If you're experiencing failures,\nplease revert to the old behaviour by setting:\n\n
+  \   Capybara.configure do |config|\n      config.match = :one\n      config.exact_options
+  = true\n      config.ignore_hidden_elements = true\n      config.visible_text_only
+  = true\n    end\n\nIf you're migrating from Capybara 1.x, try:\n\n    Capybara.configure
+  do |config|\n      config.match = :prefer_exact\n      config.ignore_hidden_elements
+  = false\n    end\n\nDetails here: http://www.elabs.se/blog/60-introducing-capybara-2-1\n\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -353,7 +413,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: