capybara 2.0.3 → 2.1.0.beta1

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

@@ -4,6 +4,37 @@ Capybara::SpecHelper.spec '#text' do
     @session.text.should == 'Bar'
   end
 
+  it "ignores invisible text by default" do
+    @session.visit('/with_html')
+    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+  end
+
+  it "shows invisible text if `:all` given" do
+    @session.visit('/with_html')
+    @session.find(:id, "hidden-text").text(:all).should == 'Some of this text is hidden!'
+  end
+
+  it "ignores invisible text if `:visible` given" do
+    Capybara.ignore_hidden_elements = false
+    @session.visit('/with_html')
+    @session.find(:id, "hidden-text").text(:visible).should == 'Some of this text is'
+  end
+
+  it "ignores invisible text if `Capybara.ignore_hidden_elements = true`" do
+    @session.visit('/with_html')
+    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+    Capybara.ignore_hidden_elements = false
+    @session.find(:id, "hidden-text").text.should == 'Some of this text is hidden!'
+  end
+
+  it "ignores invisible text if `Capybara.visible_text_only = true`" do
+    @session.visit('/with_html')
+    Capybara.visible_text_only = true
+    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+    Capybara.ignore_hidden_elements = false
+    @session.find(:id, "hidden-text").text.should == 'Some of this text is'
+  end
+
   context "with css as default selector" do
     before { Capybara.default_selector = :css }
     it "should print the text of the page" do

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

@@ -0,0 +1,16 @@
+Capybara::SpecHelper.spec '#title' do
+
+  it "should print the title of the page" do
+    @session.visit('/with_title')
+    @session.title.should == 'Test Title'
+  end
+
+  context "with css as default selector" do
+    before { Capybara.default_selector = :css }
+    it "should print the title of the page" do
+      @session.visit('/with_title')
+      @session.title.should == 'Test Title'
+    end
+    after { Capybara.default_selector = :xpath }
+  end
+end

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

@@ -23,4 +23,18 @@ Capybara::SpecHelper.spec "#uncheck" do
     extract_results(@session)['pets'].should include('dog')
     extract_results(@session)['pets'].should_not include('hamster')
   end
+
+  context "with :exact option" do
+    it "should accept partial matches when false" do
+      @session.uncheck('Ham', :exact => false)
+      @session.click_button('awesome')
+      extract_results(@session)['pets'].should_not include('hamster')
+    end
+
+    it "should not accept partial matches when true" do
+      expect do
+        @session.uncheck('Ham', :exact => true)
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+  end
 end

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

@@ -69,4 +69,46 @@ Capybara::SpecHelper.spec "#unselect" do
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
+
+  context "with :exact option" do
+    context "when `false`" do
+      it "can match select box approximately" do
+        @session.unselect("Boxerbriefs", :from => "Under", :exact => false)
+        @session.click_button("awesome")
+        extract_results(@session)["underwear"].should_not include("Boxerbriefs")
+      end
+
+      it "can match option approximately" do
+        @session.unselect("Boxerbr", :from => "Underwear", :exact => false)
+        @session.click_button("awesome")
+        extract_results(@session)["underwear"].should_not include("Boxerbriefs")
+      end
+
+      it "can match option approximately when :from not given" do
+        @session.unselect("Boxerbr", :exact => false)
+        @session.click_button("awesome")
+        extract_results(@session)["underwear"].should_not include("Boxerbriefs")
+      end
+    end
+
+    context "when `true`" do
+      it "can match select box approximately" do
+        expect do
+          @session.unselect("Boxerbriefs", :from => "Under", :exact => true)
+        end.to raise_error(Capybara::ElementNotFound)
+      end
+
+      it "can match option approximately" do
+        expect do
+          @session.unselect("Boxerbr", :from => "Underwear", :exact => true)
+        end.to raise_error(Capybara::ElementNotFound)
+      end
+
+      it "can match option approximately when :from not given" do
+        expect do
+          @session.unselect("Boxerbr", :exact => true)
+        end.to raise_error(Capybara::ElementNotFound)
+      end
+    end
+  end
 end

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

@@ -72,18 +72,18 @@ Capybara::SpecHelper.spec '#visit' do
   it "should send a referer when following a link" do
     @session.visit '/referer_base'
     @session.find('//a[@href="/get_referer"]').click
-    @session.body.should match %r{http://.*/referer_base}
+    @session.should have_content %r{http://.*/referer_base}
   end
 
   it "should preserve the original referer URL when following a redirect" do
     @session.visit('/referer_base')
     @session.find('//a[@href="/redirect_to_get_referer"]').click
-    @session.body.should match %r{http://.*/referer_base}
+    @session.should have_content %r{http://.*/referer_base}
   end
 
   it "should send a referer when submitting a form" do
     @session.visit '/referer_base'
     @session.find('//input').click
-    @session.body.should match %r{http://.*/referer_base}
+    @session.should have_content %r{http://.*/referer_base}
   end
 end

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

@@ -28,4 +28,18 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
   it "should return the result of executing the block" do
     @session.within_frame("frameOne") { "return value" }.should eql "return value"
   end
+  it "should find the div given Element" do
+    element = @session.find(:id, 'frameOne')
+    @session.within_frame element do
+      @session.find("//*[@id='divInFrameOne']").text.should eql 'This is the text of divInFrameOne'
+    end
+  end
+  it "should find multiple nested frames" do
+    @session.within_frame 'parentFrame' do
+      @session.within_frame 'childFrame' do
+        @session.within_frame 'grandchildFrame1' do end
+        @session.within_frame 'grandchildFrame2' do end
+      end    
+    end
+  end
 end

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

@@ -5,7 +5,7 @@ Capybara::SpecHelper.spec '#within' do
 
   context "with CSS selector" do
     it "should click links in the given scope" do
-      @session.within(:css, "#for_bar li[contains('With Simple HTML')]") do
+      @session.within(:css, "#for_bar li", text: 'With Simple HTML') do
         @session.click_link('Go')
       end
       @session.should have_content('Bar')
@@ -46,7 +46,7 @@ Capybara::SpecHelper.spec '#within' do
 
   context "with Node rather than selector" do
     it "should click links in the given scope" do
-      node_of_interest = @session.find(:css, "#for_bar li[contains('With Simple HTML')]")
+      node_of_interest = @session.find(:css, "#for_bar li", text: 'With Simple HTML')
 
       @session.within(node_of_interest) do
         @session.click_link('Go')
@@ -58,7 +58,7 @@ Capybara::SpecHelper.spec '#within' do
   context "with the default selector set to CSS" do
     before { Capybara.default_selector = :css }
     it "should use CSS" do
-      @session.within("#for_bar li[contains('With Simple HTML')]") do
+      @session.within("#for_bar li", text: 'With Simple HTML') do
         @session.click_link('Go')
       end
       @session.should have_content('Bar')

data/lib/capybara/spec/spec_helper.rb

@@ -2,7 +2,6 @@ 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
@@ -19,6 +18,12 @@ module Capybara
         Capybara.app_host = nil
         Capybara.default_selector = :xpath
         Capybara.default_wait_time = 1
+        Capybara.ignore_hidden_elements = true
+        Capybara.exact = false
+        Capybara.exact_options = false
+        Capybara.raise_server_errors = true
+        Capybara.visible_text_only = false
+        Capybara.match = :smart
       end
 
       def filter(requires, metadata)

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

@@ -8,9 +8,21 @@
       <option>Mrs</option>
       <option>Mr</option>
       <option>Miss</option>
+      <option disabled="disabled">Other</option>
     </select>
+    </p>
+
+  <p>
+    <label for="customer_name">Customer Name
+      <input type="text" name="form[customer_name]" value="Blah" id="customer_name" disabled="disabled"/>
+    </label>
   </p>
 
+  <p>
+    <label for="customer_email">Customer Email
+      <input type="text" name="form[customer_email]" value="ben@ben.com" id="customer_email"/>
+    </label>
+  </p>
 
   <p>
     <label for="form_other_title">Other title</label>
@@ -253,10 +265,35 @@
     <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"/>
+    <input type="button" disabled="disabled" value="Disabled button"/>
   </p>
 </form>
 
+<input type="text" name="form[outside_input]" value="outside_input" form="form1"/>
+
+<form id="form1" action="/form" method="post">
+  <input type="text" name="form[which_form]" value="form1" id="form_which_form"/>
+  <input type="text" name="form[for_form2]" value="for_form2" form="form2"/>
+  <input type="submit" name="form[submit_form1]" value="submit_form1" id="submit_form1"/>
+</form>
+
+<form id="form2" action="/form" method="post">
+  <input type="text" name="form[which_form]" value="form2" id="form_which_form"/>
+  <input type="submit" name="form[unused]" value="unused"/>
+  <button type="submit" name="form[other_form_button]" value="other_form_button" form="form1">Form1</button>
+</form>
+
+<textarea name="form[outside_textarea]" form="form1">Some text here</textarea>
+<select name="form[outside_select]" form="form1">
+  <option>Lisp</option>
+  <option selected="selected">Ruby</option>
+  <option>Php</option>
+</select>
+
+<input type="submit" name="form[outside_submit]" value="outside_submit" form="form1"/>
+<button type="submit" name="form[outside_button]" value="outside_button" form="form2">Outside!</button>
+
+
 <form id="get-form" action="/form/get?foo=bar" method="get">
   <p>
     <label for="form_middle_name">Middle Name</label>
@@ -304,7 +341,7 @@
 
   <p>
     <label for="form_multiple_documents">Multiple Documents</label>
-    <input type="file" name="form[multiple_documents][]" id="form_multiple_documents" multiple />
+    <input type="file" name="form[multiple_documents][]" id="form_multiple_documents" multiple="multiple" />
   </p>
 
   <p>

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

@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <title>This is the child frame title</title>
+    </head>
+    <body>
+      <iframe src="/frame_one" id="grandchildFrame1"></iframe>
+      <iframe src="/frame_two" id="grandchildFrame2"></iframe>
+    </body>
+</html>

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

@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>This is the parent frame title</title>
+    </head>
+    <body>
+      <iframe src='/frame_child' id='childFrame'></iframe>
+    </body>
+</html>

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

@@ -0,0 +1,10 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <base href="http://example2.com" />
+    <title>with_external_source</title>
+  </head>
+  <body id="with_js">
+    <h1>FooBar</h1>
+  </body>
+</html

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

@@ -0,0 +1,7 @@
+<h1>This page is used for testing number options of has_text?</h1>
+
+<p>count1</p>
+<div>
+  <p>2 count</p>
+  <p>Count</p>
+</div>

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

@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_hover</title>
+  </head>
+
+  <body id="with_hover">
+    <style type="text/css">
+      .hidden_until_hover {display: none;}
+      .wrapper:hover .hidden_until_hover { display: block }
+    </style>
+    <div class="wrapper">
+      Some text here so the wrapper has size
+      <div class="hidden_until_hover">Here I am</div>
+    </div>
+  </body>
+</html>

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

@@ -28,11 +28,13 @@
 
 <p>
   <input type="text" id="test_field" value="monkey"/>
+  <input type="text" readonly="readonly" value="should not change" />
   <textarea id="normal">
 banana</textarea>
   <textarea id="additional_newline">
 
 banana</textarea>
+  <textarea readonly="readonly">textarea should not change</textarea>
   <a href="/redirect_back">BackToMyself</a>
   <a title="twas a fine link" href="/redirect">A link came first</a>
   <a title="a fine link" href="/with_simple_html">A link</a>
@@ -49,6 +51,7 @@ banana</textarea>
   <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>
+  <a href="/with_simple_html" disabled="disabled">Disabled link</a>
 
   <a href="?query_string=true">Naked Query String</a>
   <% if params[:query_string] %>
@@ -61,6 +64,10 @@ banana</textarea>
   <a href="/with_simple_html" title="hidden link" class="simple">hidden link</a>
 </div>
 
+<div id="hidden-text">
+  Some of this text is <em style="display:none">hidden!</em>
+</div>
+
 <div style="display: none;">
   <a id="first_invisble" class="hidden">first hidden link</a>
 </div>
@@ -78,6 +85,18 @@ banana</textarea>
 </div>
 
 <ul>
-  <li id="john_monkey">Monkey John</li>
-  <li id="paul_monkey">Monkey Paul</li>
+  <li class="beatle guitarist" id="john">John</li>
+  <li class="beatle bassist drummer" id="paul">Paul</li>
+  <li class="beatle guitarist" id="george">George</li>
+  <li class="beatle drummer" id="ringo">Ringo</li>
 </ul>
+
+<div>
+  <div class="singular">singular</div>
+  <div class="multiple">multiple one</div>
+  <div class="multiple">multiple two</div>
+  <div class="almost_singular but_not_quite">almost singular but not quite</div>
+  <div class="almost_singular">almost singular</div>
+</div>
+
+<input type="text" disabled="disabled" name="disabled_text" value="This is disabled"/>

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

@@ -19,6 +19,7 @@
     </div>
 
     <p><a href="#" id="clickable">Click me</a></p>
+    <p><a href="#" id="slow-click">Slowly</a></p>
 
     <p>
       <select id="waiter">
@@ -57,6 +58,10 @@
       </ul>
     </p>
 
+    <p>
+      <a href="#" id="change-title">Change title</a>
+    </p>
+
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

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

@@ -4,6 +4,7 @@
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
   incididunt ut labore et dolore magna aliqua. Ut enim ad minim venia.
   <a href="/redirect">Go</a>
+  <input name="disabled" disabled="disabled"/>
 </p>
 
 <div id="for_bar">
@@ -23,6 +24,10 @@
           <label for="bar_first_name">First Name</label>
           <input type="text" name="form[first_name]" value="Peter" id="bar_first_name"/>
         </p>
+        <p>
+          <label for="bar_other_name">Other Name</label>
+          <input type="text" name="form[other_name]" value="James" id="bar_other_name" disabled="disabled"/>
+        </p>
         <p><input type="submit" value="Go"/></p>
       </form>
     </li>
@@ -33,4 +38,4 @@
   <ul>
     <li>With Simple HTML: <a href="/">Go</a>
   </ul>
-</div>
+</div>

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

@@ -0,0 +1 @@
+<title>Test Title</title>

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

@@ -6,5 +6,6 @@
         <div id="divInMainWindow">This is the text for divInMainWindow</div>
     <iframe src="/frame_one" id="frameOne"></iframe>
     <iframe src="/frame_two" id="frameTwo"></iframe>
+    <iframe src="/frame_parent" id="parentFrame"></iframe>
     </body>
 </html>