capybara 0.4.0 → 0.4.1.rc

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

@@ -22,13 +22,30 @@ shared_examples_for "has_css" do
       end
     end
 
+    context "with between" do
+      it "should be true if the content occurs within the range given" do
+        @session.should have_css("p", :between => 1..4)
+        @session.should have_css("p a#foo", :between => 1..3)
+      end
+
+      it "should be false if the content occurs more or fewer times than range" do
+        @session.should_not have_css("p", :between => 6..11 )
+        @session.should_not have_css("p a#foo", :between => 4..7)
+      end
+
+      it "should be false if the content isn't on the page at all" do
+        @session.should_not have_css("abbr", :between => 1..8)
+        @session.should_not have_css("p a.doesnotexist", :between => 3..8)
+      end
+    end
+
     context "with count" do
       it "should be true if the content is on the page the given number of times" do
         @session.should have_css("p", :count => 3)
         @session.should have_css("p a#foo", :count => 1)
       end
 
-      it "should be false if the content is on the page the given number of times" do
+      it "should be false if the content occurs the given number of times" do
         @session.should_not have_css("p", :count => 6)
         @session.should_not have_css("p a#foo", :count => 2)
       end
@@ -39,6 +56,42 @@ shared_examples_for "has_css" do
       end
     end
 
+    context "with maximum" do
+      it "should be true when content occurs same or fewer times than given" do
+        @session.should have_css("h2.head", :maximum => 5) # edge case
+        @session.should have_css("h2", :maximum => 10)
+      end
+
+      it "should be false when content occurs more times than given" do
+        @session.should_not have_css("h2.head", :maximum => 4) # edge case
+        @session.should_not have_css("h2", :maximum => 6)
+        @session.should_not have_css("p", :maximum => 1)
+      end
+
+      it "should be false if the content isn't on the page at all" do
+        @session.should_not have_css("abbr", :maximum => 2)
+        @session.should_not have_css("p a.doesnotexist", :maximum => 1)
+      end
+    end
+
+    context "with minimum" do
+      it "should be true when content occurs same or more times than given" do
+        @session.should have_css("h2.head", :minimum => 5) # edge case
+        @session.should have_css("h2", :minimum => 3)
+      end
+
+      it "should be false when content occurs fewer times than given" do
+        @session.should_not have_css("h2.head", :minimum => 6) # edge case
+        @session.should_not have_css("h2", :minimum => 8)
+        @session.should_not have_css("p", :minimum => 10)
+      end
+
+      it "should be false if the content isn't on the page at all" do
+        @session.should_not have_css("abbr", :minimum => 2)
+        @session.should_not have_css("p a.doesnotexist", :minimum => 7)
+      end
+    end
+
     context "with text" do
       it "should discard all matches where the given string is not contained" do
         @session.should have_css("p a", :text => "Redirect", :count => 1)
@@ -75,6 +128,23 @@ shared_examples_for "has_css" do
       end
     end
 
+    context "with between" do
+      it "should be false if the content occurs within the range given" do
+        @session.should_not have_no_css("p", :between => 1..4)
+        @session.should_not have_no_css("p a#foo", :between => 1..3)
+      end
+
+      it "should be true if the content occurs more or fewer times than range" do
+        @session.should have_no_css("p", :between => 6..11 )
+        @session.should have_no_css("p a#foo", :between => 4..7)
+      end
+
+      it "should be true if the content isn't on the page at all" do
+        @session.should have_no_css("abbr", :between => 1..8)
+        @session.should have_no_css("p a.doesnotexist", :between => 3..8)
+      end
+    end
+
     context "with count" do
       it "should be false if the content is on the page the given number of times" do
         @session.should_not have_no_css("p", :count => 3)
@@ -92,6 +162,42 @@ shared_examples_for "has_css" do
       end
     end
 
+    context "with maximum" do
+      it "should be false when content occurs same or fewer times than given" do
+        @session.should_not have_no_css("h2.head", :maximum => 5) # edge case
+        @session.should_not have_no_css("h2", :maximum => 10)
+      end
+
+      it "should be true when content occurs more times than given" do
+        @session.should have_no_css("h2.head", :maximum => 4) # edge case
+        @session.should have_no_css("h2", :maximum => 6)
+        @session.should have_no_css("p", :maximum => 1)
+      end
+
+      it "should be true if the content isn't on the page at all" do
+        @session.should have_no_css("abbr", :maximum => 5)
+        @session.should have_no_css("p a.doesnotexist", :maximum => 10)
+      end
+    end
+
+    context "with minimum" do
+      it "should be false when content occurs more times than given" do
+        @session.should_not have_no_css("h2.head", :minimum => 4) # edge case
+        @session.should_not have_no_css("h2", :minimum => 3)
+      end
+
+      it "should be true when content occurs fewer times than given" do
+        @session.should have_no_css("h2.head", :minimum => 6) # edge case
+        @session.should have_no_css("h2", :minimum => 8)
+        @session.should have_no_css("p", :minimum => 15)
+      end
+
+      it "should be true if the content isn't on the page at all" do
+        @session.should have_no_css("abbr", :minimum => 5)
+        @session.should have_no_css("p a.doesnotexist", :minimum => 10)
+      end
+    end
+
     context "with text" do
       it "should discard all matches where the given string is not contained" do
         @session.should_not have_no_css("p a", :text => "Redirect", :count => 1)

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

@@ -25,6 +25,16 @@ shared_examples_for "has_field" do
         @session.should_not have_field('Wrong Name', :with => 'John')  
         @session.should_not have_field('Description', :with => 'Monkey')
       end
+
+      it "should be true after the field has been filled in with the given value" do
+        @session.fill_in('First Name', :with => 'Jonas')
+        @session.should have_field('First Name', :with => 'Jonas')
+      end
+
+      it "should be false after the field has been filled in with a different value" do
+        @session.fill_in('First Name', :with => 'Jonas')
+        @session.should_not have_field('First Name', :with => 'John')
+      end
     end
   end
 
@@ -54,6 +64,16 @@ shared_examples_for "has_field" do
         @session.should have_no_field('Wrong Name', :with => 'John')  
         @session.should have_no_field('Description', :with => 'Monkey')
       end
+
+      it "should be false after the field has been filled in with the given value" do
+        @session.fill_in('First Name', :with => 'Jonas')
+        @session.should_not have_no_field('First Name', :with => 'Jonas')
+      end
+
+      it "should be true after the field has been filled in with a different value" do
+        @session.fill_in('First Name', :with => 'Jonas')
+        @session.should have_no_field('First Name', :with => 'John')
+      end
     end
   end
 
@@ -73,6 +93,26 @@ shared_examples_for "has_field" do
     it "should be false if no field is on the page" do
       @session.should_not have_checked_field('Does Not Exist')
     end
+
+    it "should be true after an unchecked checkbox is checked" do
+      @session.check('form_pets_cat')
+      @session.should have_checked_field('form_pets_cat')
+    end
+
+    it "should be false after a checked checkbox is unchecked" do
+      @session.uncheck('form_pets_dog')
+      @session.should_not have_checked_field('form_pets_dog')
+    end
+
+    it "should be true after an unchecked radio button is chosen" do
+      @session.choose('gender_male')
+      @session.should have_checked_field('gender_male')
+    end
+
+    it "should be false after another radio button in the group is chosen" do
+      @session.choose('gender_male')
+      @session.should_not have_checked_field('gender_female')
+    end
   end
 
   describe '#has_unchecked_field?' do
@@ -91,6 +131,26 @@ shared_examples_for "has_field" do
     it "should be false if no field is on the page" do
       @session.should_not have_unchecked_field('Does Not Exist')
     end
+
+    it "should be false after an unchecked checkbox is checked" do
+      @session.check('form_pets_cat')
+      @session.should_not have_unchecked_field('form_pets_cat')
+    end
+
+    it "should be true after a checked checkbox is unchecked" do
+      @session.uncheck('form_pets_dog')
+      @session.should have_unchecked_field('form_pets_dog')
+    end
+
+    it "should be false after an unchecked radio button is chosen" do
+      @session.choose('gender_male')
+      @session.should_not have_unchecked_field('gender_male')
+    end
+
+    it "should be true after another radio button in the group is chosen" do
+      @session.choose('gender_male')
+      @session.should have_unchecked_field('gender_female')
+    end
   end
 end
 

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

@@ -26,6 +26,26 @@ shared_examples_for "has_select" do
         @session.should_not have_select('Underwear', :selected => ['Briefs', 'Nonexistant'])
         @session.should_not have_select('Underwear', :selected => ['Briefs', 'Boxers'])
       end
+
+      it "should be true after the given value is selected" do
+        @session.select('Swedish', :from => 'Locale')
+        @session.should have_select('Locale', :selected => 'Swedish')
+      end
+
+      it "should be false after a different value is selected" do
+        @session.select('Swedish', :from => 'Locale')
+        @session.should_not have_select('Locale', :selected => 'English')
+      end
+
+      it "should be true after the given values are selected" do
+        @session.select('Boxers', :from => 'Underwear')
+        @session.should have_select('Underwear', :selected => ['Briefs', 'Boxers', 'Commando'])
+      end
+
+      it "should be false after one of the values is unselected" do
+        @session.unselect('Briefs', :from => 'Underwear')
+        @session.should_not have_select('Underwear', :selected => ['Briefs', 'Commando'])
+      end
     end
 
     context 'with options' do
@@ -69,6 +89,26 @@ shared_examples_for "has_select" do
         @session.should have_no_select('Underwear', :selected => ['Briefs', 'Nonexistant'])
         @session.should have_no_select('Underwear', :selected => ['Briefs', 'Boxers'])
       end
+
+      it "should be false after the given value is selected" do
+        @session.select('Swedish', :from => 'Locale')
+        @session.should_not have_no_select('Locale', :selected => 'Swedish')
+      end
+
+      it "should be true after a different value is selected" do
+        @session.select('Swedish', :from => 'Locale')
+        @session.should have_no_select('Locale', :selected => 'English')
+      end
+
+      it "should be false after the given values are selected" do
+        @session.select('Boxers', :from => 'Underwear')
+        @session.should_not have_no_select('Underwear', :selected => ['Briefs', 'Boxers', 'Commando'])
+      end
+
+      it "should be true after one of the values is unselected" do
+        @session.unselect('Briefs', :from => 'Underwear')
+        @session.should have_no_select('Underwear', :selected => ['Briefs', 'Commando'])
+      end
     end
 
     context 'with options' do

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

@@ -8,15 +8,6 @@ shared_examples_for "session with javascript support" do
       Capybara.default_wait_time = 0
     end
 
-    describe '#drag' do
-      it "should drag and drop an object" do
-        pending "drag/drop is currently broken under celerity/culerity" if @session.driver.is_a?(Capybara::Driver::Celerity)
-        @session.visit('/with_js')
-        @session.drag('//div[@id="drag"]', '//div[@id="drop"]')
-        @session.find('//div[contains(., "Dropped!")]').should_not be_nil
-      end
-    end
-
     describe 'Node#drag_to' do
       it "should drag and drop an object" do
         pending "drag/drop is currently broken under celerity/culerity" if @session.driver.is_a?(Capybara::Driver::Celerity)
@@ -27,7 +18,7 @@ shared_examples_for "session with javascript support" do
         @session.find('//div[contains(., "Dropped!")]').should_not be_nil
       end
     end
-    
+
     describe '#find' do
       it "should allow triggering of custom JS events" do
         pending "cannot figure out how to do this with selenium" if @session.mode == :selenium
@@ -111,7 +102,7 @@ shared_examples_for "session with javascript support" do
         begin
           @session.wait_until(0.1) { false }
         rescue Capybara::TimeoutError; end
-        (Time.now - start).should be_close(0.1, 0.1)
+        (Time.now - start).should be_within(0.1).of(0.1)
       end
 
       it "should default to Capybara.default_wait_time before timeout" do
@@ -122,9 +113,9 @@ shared_examples_for "session with javascript support" do
           @session.wait_until { false }
         rescue Capybara::TimeoutError; end
         if @session.driver.has_shortcircuit_timeout?
-          (Time.now - start).should be_close(0, 0.1)
+          (Time.now - start).should be_within(0.1).of(0)
         else
-          (Time.now - start).should be_close(0.2, 0.1)
+          (Time.now - start).should be_within(0.1).of(0.2)
         end
       end
     end

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

@@ -1,4 +1,4 @@
-shared_examples_for "within" do  
+shared_examples_for "within" do
   describe '#within' do
     before do
       @session.visit('/with_scope')
@@ -11,6 +11,13 @@ shared_examples_for "within" do
         end
         @session.body.should include('Bar')
       end
+
+      it "should accept additional options" do
+        @session.within(:css, "ul li", :text => 'With Simple HTML') do
+          @session.click_link('Go')
+        end
+        @session.body.should include('Bar')
+      end
     end
 
     context "with XPath selector" do
@@ -32,14 +39,14 @@ shared_examples_for "within" do
     end
 
     context "with the default selector set to CSS" do
-      before { Capybara.default_selector = :css } 
+      before { Capybara.default_selector = :css }
       it "should use CSS" do
         @session.within("ul li[contains('With Simple HTML')]") do
           @session.click_link('Go')
         end
         @session.body.should include('Bar')
       end
-      after { Capybara.default_selector = :xpath } 
+      after { Capybara.default_selector = :xpath }
     end
 
     context "with click_link" do

data/lib/capybara/spec/test_app.rb

@@ -77,6 +77,14 @@ class TestApp < Sinatra::Base
     '<pre id="results">' + params[:form].to_yaml + '</pre>'
   end
 
+  post '/upload_empty' do
+    if params[:form][:file].nil?
+      'Successfully ignored empty file field.'
+    else
+      'Something went wrong.'
+    end
+  end
+
   post '/upload' do
     begin
       buffer = []
@@ -87,8 +95,19 @@ class TestApp < Sinatra::Base
       'No file uploaded'
     end
   end
+
+  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.join(' | ')
+    rescue
+      'No files uploaded'
+    end
+  end
 end
 
 if __FILE__ == $0
-  Rack::Handler::Mongrel.run TestApp, :Port => 8070
+  Rack::Handler::WEBrick.run TestApp, :Port => 8070
 end

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

@@ -250,6 +250,17 @@
   <p>
 </form>
 
+<form action="/upload_empty" method="post" enctype="multipart/form-data">
+  <p>
+    <label for="form_file_name">File Name</label>
+    <input type="file" name="form[file]" id="form_file"/>
+  </p>
+
+  <p>
+    <input type="submit" value="Upload Empty"/>
+  <p>
+</form>
+
 <form action="/upload" method="post" enctype="multipart/form-data">
   <p>
     <label for="form_file_name">File Name</label>
@@ -266,6 +277,22 @@
   <p>
 </form>
 
+<form action="/upload_multiple" method="post" enctype="multipart/form-data">
+  <p>
+    <label for="form_multiple_file_name">File Name</label>
+    <input type="file" name="form[multiple_file_name]" id="form_multiple_file_name"/>
+  </p>
+
+  <p>
+    <label for="form_multiple_documents">Multiple Documents</label>
+    <input type="file" name="form[multiple_documents][]" id="form_multiple_documents" multiple />
+  </p>
+
+  <p>
+    <input type="submit" value="Upload Multiple"/>
+  <p>
+</form>
+
 <form action="/redirect" method="post">
   <p>
     <input type="submit" value="Go FAR"/>

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

@@ -1,15 +1,23 @@
 <h1>This is a test</h1>
 
-<p id="first">
+<h2 class="no text"></h2>
+<h2 class="no text"></h2>
+<h2 class="head" id="h2one">Header Class Test One</h2>
+<h2 class="head" id="h2two">Header Class Test Two</h2>
+<h2 class="head">Header Class Test Three</h2>
+<h2 class="head">Header Class Test Four</h2>
+<h2 class="head">Header Class Test Five</h2>
+
+<p class="para" id="first">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple">labore</a>
   et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation <a href="/foo" id="foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.
-  <a href="/with_simple_html"><img src="http://www.foobar.sun/dummy_image.jpg" width="20" height="20" alt="awesome image" /></a>
+  <a href="/with_simple_html"><img width="20" height="20" alt="awesome image" /></a>
 </p>
 
-<p id="second">
+<p class="para" id="second">
   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
@@ -33,8 +41,8 @@
   <a href="/with_html#anchor">Anchor on same page</a>
   <input type="text" value="" id="test_field">
   <input type="text" checked="checked" id="checked_field">
-  <a href="/redirect"><img src="http://www.foobar.sun/dummy_image.jpg" width="20" height="20" alt="very fine image" /></a>
-  <a href="/with_simple_html"><img src="http://www.foobar.sun/dummy_image.jpg" width="20" height="20" alt="fine image" /></a>
+  <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="?query_string=true">Naked Query String</a>
   <% if params[:query_string] %>
@@ -47,6 +55,14 @@
   <a href="/with_simple_html" title="awesome title" class="simple">hidden link</a>
 </div>
 
+<div style="display: none;">
+  <a class="visibility">hidden link</a>
+</div>
+
+<div>
+  <a class="visibility">visible link</a>
+</div>
+
 <ul>
   <li id="john_monkey">Monkey John</li>
   <li id="paul_monkey">Monkey Paul</li>