RubyGems - capybara - Versions diffs - 2.0.3 → 2.1.0.beta1 - Mend

capybara 2.0.3 → 2.1.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (81) hide show

data.tar.gz.sig +0 -0
data/History.md +73 -0
data/README.md +52 -5
data/lib/capybara.rb +44 -62
data/lib/capybara/cucumber.rb +4 -1
data/lib/capybara/driver/base.rb +13 -9
data/lib/capybara/driver/node.rb +18 -6
data/lib/capybara/helpers.rb +111 -22
data/lib/capybara/node/actions.rb +24 -19
data/lib/capybara/node/base.rb +25 -32
data/lib/capybara/node/document.rb +6 -2
data/lib/capybara/node/element.rb +45 -7
data/lib/capybara/node/finders.rb +48 -21
data/lib/capybara/node/matchers.rb +38 -21
data/lib/capybara/node/simple.rb +29 -7
data/lib/capybara/query.rb +72 -26
data/lib/capybara/rack_test/browser.rb +11 -3
data/lib/capybara/rack_test/css_handlers.rb +8 -0
data/lib/capybara/rack_test/driver.rb +11 -3
data/lib/capybara/rack_test/form.rb +8 -1
data/lib/capybara/rack_test/node.rb +92 -36
data/lib/capybara/rails.rb +1 -2
data/lib/capybara/result.rb +21 -37
data/lib/capybara/rspec/matchers.rb +60 -31
data/lib/capybara/selector.rb +46 -13
data/lib/capybara/selenium/driver.rb +42 -6
data/lib/capybara/selenium/node.rb +23 -5
data/lib/capybara/session.rb +46 -11
data/lib/capybara/spec/public/test.js +12 -0
data/lib/capybara/spec/session/all_spec.rb +9 -8
data/lib/capybara/spec/session/attach_file_spec.rb +14 -0
data/lib/capybara/spec/session/check_spec.rb +14 -0
data/lib/capybara/spec/session/choose_spec.rb +14 -0
data/lib/capybara/spec/session/click_button_spec.rb +77 -1
data/lib/capybara/spec/session/click_link_or_button_spec.rb +65 -0
data/lib/capybara/spec/session/click_link_spec.rb +24 -0
data/lib/capybara/spec/session/current_scope_spec.rb +29 -0
data/lib/capybara/spec/session/fill_in_spec.rb +14 -0
data/lib/capybara/spec/session/find_button_spec.rb +12 -0
data/lib/capybara/spec/session/find_by_id_spec.rb +12 -1
data/lib/capybara/spec/session/find_field_spec.rb +30 -0
data/lib/capybara/spec/session/find_link_spec.rb +12 -0
data/lib/capybara/spec/session/find_spec.rb +258 -16
data/lib/capybara/spec/session/first_spec.rb +25 -8
data/lib/capybara/spec/session/has_css_spec.rb +2 -2
data/lib/capybara/spec/session/has_field_spec.rb +10 -2
data/lib/capybara/spec/session/has_selector_spec.rb +9 -0
data/lib/capybara/spec/session/has_text_spec.rb +96 -0
data/lib/capybara/spec/session/has_title_spec.rb +47 -0
data/lib/capybara/spec/session/node_spec.rb +43 -0
data/lib/capybara/spec/session/reset_session_spec.rb +10 -2
data/lib/capybara/spec/session/save_page_spec.rb +30 -0
data/lib/capybara/spec/session/select_spec.rb +65 -0
data/lib/capybara/spec/session/text_spec.rb +31 -0
data/lib/capybara/spec/session/title_spec.rb +16 -0
data/lib/capybara/spec/session/uncheck_spec.rb +14 -0
data/lib/capybara/spec/session/unselect_spec.rb +42 -0
data/lib/capybara/spec/session/visit_spec.rb +3 -3
data/lib/capybara/spec/session/within_frame_spec.rb +14 -0
data/lib/capybara/spec/session/within_spec.rb +3 -3
data/lib/capybara/spec/spec_helper.rb +6 -1
data/lib/capybara/spec/views/form.erb +39 -2
data/lib/capybara/spec/views/frame_child.erb +9 -0
data/lib/capybara/spec/views/frame_parent.erb +8 -0
data/lib/capybara/spec/views/with_base_tag.erb +10 -0
data/lib/capybara/spec/views/with_count.erb +7 -0
data/lib/capybara/spec/views/with_hover.erb +17 -0
data/lib/capybara/spec/views/with_html.erb +21 -2
data/lib/capybara/spec/views/with_js.erb +5 -0
data/lib/capybara/spec/views/with_scope.erb +6 -1
data/lib/capybara/spec/views/with_title.erb +1 -0
data/lib/capybara/spec/views/within_frames.erb +1 -0
data/lib/capybara/version.rb +1 -1
data/spec/basic_node_spec.rb +75 -24
data/spec/dsl_spec.rb +2 -1
data/spec/rack_test_spec.rb +4 -3
data/spec/rspec/matchers_spec.rb +105 -17
data/spec/server_spec.rb +8 -8
data/spec/spec_helper.rb +2 -1
metadata +83 -23
metadata.gz.sig +0 -0

data/lib/capybara/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.0.3'
+  VERSION = '2.1.0.beta1'
 end

data/spec/basic_node_spec.rb CHANGED

@@ -4,26 +4,42 @@ describe Capybara do
   describe '.string' do
     let :string do
       Capybara.string <<-STRING
-        <div id="page">
-          <div id="content">
-            <h1 data="fantastic">Totally awesome</h1>
-            <p>Yes it is</p>
-          </div>
-          <div id="footer" style="display: none">
-            <p>c2010</p>
-            <p>Jonas Nicklas</p>
-            <input type="text" name="foo" value="bar"/>
-            <select name="animal">
-              <option>Monkey</option>
-              <option selected="selected">Capybara</option>
-            </select>
-          </div>
-          <section>
-            <div class="subsection"></div>
-          </div>
-        </div>
+        <html>
+          <head>
+            <title>simple_node</title>
+          </head>
+          <body>
+            <div id="page">
+              <div id="content">
+                <h1 data="fantastic">Totally awesome</h1>
+                <p>Yes it is</p>
+              </div>
+              <form>
+                <input type="text" name="bleh" disabled="disabled"/>
+                <input type="text" name="meh"/>
+              </form>
+              <div id="footer">
+                <p>c2010</p>
+                <p>Jonas Nicklas</p>
+                <input type="text" name="foo" value="bar"/>
+                <select name="animal">
+                  <option>Monkey</option>
+                  <option selected="selected">Capybara</option>
+                </select>
+              </div>
+              <div id="hidden" style="display: none">
+                <p id="secret">Secret</p>
+              </div>
+              <section>
+                <div class="subsection"></div>
+              </section>
+            </div>
+          </body>
+        </html>
       STRING
     end
@@ -56,8 +72,8 @@ describe Capybara do
     end
     it "allows finding only visible nodes" do
-      string.all('//p', :text => 'c2010', :visible => true).should be_empty
-      string.all('//p', :text => 'c2010', :visible => false).should have(1).element
+      string.all(:css, '#secret', :visible => true).should be_empty
+      string.all(:css, '#secret', :visible => false).should have(1).element
     end
     it "allows finding elements and extracting text from them" do
@@ -77,13 +93,48 @@ describe Capybara do
     end
     it "allows finding elements and extracting the path" do
-      string.find('//input').value.should == 'bar'
+      string.find('//div/input').value.should == 'bar'
       string.find('//select').value.should == 'Capybara'
     end
     it "allows finding elements and checking if they are visible" do
       string.find('//h1').should be_visible
-      string.find('//input').should_not be_visible
+      string.find(:css, "#secret", :visible => false).should_not be_visible
+    end
+    it "allows finding elements and checking if they are disabled" do
+      string.find('//form/input[@name="bleh"]').should be_disabled
+      string.find('//form/input[@name="meh"]').should_not be_disabled
+    end
+    describe "#title" do
+      it "returns the page title" do
+        string.title.should == "simple_node"
+      end
+    end
+    describe "#has_title?" do
+      it "returns whether the page has the given title" do
+        string.has_title?('simple_node').should be_true
+        string.has_title?('monkey').should be_false
+      end
+      it "allows regexp matches" do
+        string.has_title?(/s[a-z]+_node/).should be_true
+        string.has_title?(/monkey/).should be_false
+      end
+    end
+    describe '#has_no_title?' do
+      it "returns whether the page does not have the given title" do
+        string.has_no_title?('simple_node').should be_false
+        string.has_no_title?('monkey').should be_true
+      end
+      it "allows regexp matches" do
+        string.has_no_title?(/s[a-z]+_node/).should be_false
+        string.has_no_title?(/monkey/).should be_true
+      end
     end
   end
 end

data/spec/dsl_spec.rb CHANGED

@@ -10,7 +10,8 @@ Capybara::SpecHelper.run_specs TestClass.new, "DSL", :skip => [
   :screenshot,
   :frames,
   :windows,
-  :server
+  :server,
+  :hover
 ]
 describe Capybara::DSL do

data/spec/rack_test_spec.rb CHANGED

@@ -9,7 +9,8 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :skip => [
   :screenshot,
   :frames,
   :windows,
-  :server
+  :server,
+  :hover
 ]
 describe Capybara::Session do
@@ -84,14 +85,14 @@ describe Capybara::RackTest::Driver do
     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.find_xpath('.//a').first.click
       @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.find_xpath('.//input').first.click
       @driver.html.should include('foobar')
     end

data/spec/rspec/matchers_spec.rb CHANGED

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

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

data/spec/spec_helper.rb CHANGED

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