capybara 1.1.4 → 2.0.0.beta2

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

@@ -17,9 +17,9 @@ shared_examples_for "fill_in" do
     end
 
     it "should fill in a text field by label without for" do
-      @session.fill_in('Street', :with => 'Avenue Q')
+      @session.fill_in('First Name', :with => 'Harry')
       @session.click_button('awesome')
-      extract_results(@session)['street'].should == 'Avenue Q'
+      extract_results(@session)['first_name'].should == 'Harry'
     end
 
     it "should fill in a url field by label without for" do
@@ -28,12 +28,6 @@ shared_examples_for "fill_in" do
       extract_results(@session)['html5_url'].should == 'http://www.avenueq.com'
     end
 
-    it "should favour exact label matches over partial matches" do
-      @session.fill_in('Name', :with => 'Harry Jones')
-      @session.click_button('awesome')
-      extract_results(@session)['name'].should == 'Harry Jones'
-    end
-
     it "should fill in a textarea by id" do
       @session.fill_in('form_description', :with => 'Texty text')
       @session.click_button('awesome')
@@ -93,32 +87,28 @@ shared_examples_for "fill_in" do
       @session.click_button('awesome')
       extract_results(@session)['password'].should == 'supasikrit'
     end
-    
-    it "should prefer exact matches over partial matches" do
-      @session.fill_in('Name', :with => 'Ford Prefect')
-      @session.click_button('awesome')
-      extract_results(@session)['name'].should == 'Ford Prefect'
-    end
-    
+
     it "should throw an exception if a hash containing 'with' is not provided" do
       lambda{@session.fill_in 'Name', 'ignu'}.should raise_error
     end
-    
+
     context "with ignore_hidden_fields" do
       before { Capybara.ignore_hidden_elements = true }
       after  { Capybara.ignore_hidden_elements = false }
       it "should not find a hidden field" do
+        msg = "Unable to find field \"Super Secret\""
         running do
           @session.fill_in('Super Secret', :with => '777')
-        end.should raise_error(Capybara::ElementNotFound)
+        end.should raise_error(Capybara::ElementNotFound, msg)
       end
     end
 
     context "with a locator that doesn't exist" do
       it "should raise an error" do
+        msg = "Unable to find field \"does not exist\""
         running do
           @session.fill_in('does not exist', :with => 'Blah blah')
-        end.should raise_error(Capybara::ElementNotFound)
+        end.should raise_error(Capybara::ElementNotFound, msg)
       end
     end
   end

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

@@ -15,29 +15,11 @@ shared_examples_for "find" do
 
     it "should find the first element using the given locator and options" do
       @session.find('//a', :text => 'Redirect')[:id].should == 'red'
-      @session.find(:css, 'a', :text => 'A link')[:title].should == 'twas a fine link'
+      @session.find(:css, 'a', :text => 'A link came first')[:title].should == 'twas a fine link'
     end
 
-    describe 'the returned node' do
-      it "should act like a session object" do
-        @session.visit('/form')
-        @form = @session.find(:css, '#get-form')
-        @form.should have_field('Middle Name')
-        @form.should have_no_field('Languages')
-        @form.fill_in('Middle Name', :with => 'Monkey')
-        @form.click_button('med')
-        extract_results(@session)['middle_name'].should == 'Monkey'
-      end
-
-      it "should scope CSS selectors" do
-        @session.find(:css, '#second').should have_no_css('h1')
-      end
-
-      it "should have a reference to its parent if there is one" do
-        @node = @session.find(:css, '#first')
-        @node.parent.should == @node.session.document
-        @node.find('a').parent.should == @node
-      end
+    it "should raise an error if there are multiple matches" do
+      expect { @session.find('//a') }.to raise_error(Capybara::Ambiguous)
     end
 
     context "with css selectors" do
@@ -85,25 +67,22 @@ shared_examples_for "find" do
       end
     end
 
-    context "with custom selector with failure_message option" do
-      it "should raise an error with the failure message if the element is not found" do
+    context "with custom selector with custom filter" do
+      before do
         Capybara.add_selector(:monkey) do
           xpath { |num| ".//*[contains(@id, 'monkey')][#{num}]" }
-          failure_message { |node, selector| node.all(".//*[contains(@id, 'monkey')]").map { |node| node.text }.sort.join(', ') }
+          filter(:name) { |node, name| node.text == name }
         end
-        running do
-          @session.find(:monkey, '14').text.should == 'Monkey Paul'
-        end.should raise_error(Capybara::ElementNotFound, "Monkey John, Monkey Paul")
       end
 
-      it "should pass the selector as the second argument" do
-        Capybara.add_selector(:monkey) do
-          xpath { |num| ".//*[contains(@id, 'monkey')][#{num}]" }
-          failure_message { |node, selector| selector.name.to_s + ': ' + selector.locator + ' - ' + node.all(".//*[contains(@id, 'monkey')]").map { |node| node.text }.sort.join(', ') }
-        end
-        running do
-          @session.find(:monkey, '14').text.should == 'Monkey Paul'
-        end.should raise_error(Capybara::ElementNotFound, "monkey: 14 - Monkey John, Monkey Paul")
+      it "should find elements that match the filter" do
+        @session.find(:monkey, '1', :name => 'Monkey John').text.should == 'Monkey John'
+        @session.find(:monkey, '2', :name => 'Monkey Paul').text.should == 'Monkey Paul'
+      end
+
+      it "should not find elements that don't match the filter" do
+        expect { @session.find(:monkey, '2', :name => 'Monkey John') }.to raise_error(Capybara::ElementNotFound)
+        expect { @session.find(:monkey, '1', :name => 'Monkey Paul') }.to raise_error(Capybara::ElementNotFound)
       end
     end
 
@@ -116,22 +95,16 @@ shared_examples_for "find" do
       after { Capybara.default_selector = :xpath }
     end
 
-    it "should raise ElementNotFound with specified fail message if nothing was found" do
-      running do
-        @session.find(:xpath, '//div[@id="nosuchthing"]', :message => 'arghh').should be_nil
-      end.should raise_error(Capybara::ElementNotFound, "arghh")
-    end
-
     it "should raise ElementNotFound with a useful default message if nothing was found" do
       running do
         @session.find(:xpath, '//div[@id="nosuchthing"]').should be_nil
       end.should raise_error(Capybara::ElementNotFound, "Unable to find xpath \"//div[@id=\\\"nosuchthing\\\"]\"")
     end
 
-    it "should accept an XPath instance and respect the order of paths" do
+    it "should accept an XPath instance" do
       @session.visit('/form')
-      @xpath = XPath::HTML.fillable_field('Name')
-      @session.find(@xpath).value.should == 'John Smith'
+      @xpath = XPath::HTML.fillable_field('First Name')
+      @session.find(@xpath).value.should == 'John'
     end
 
     context "within a scope" do
@@ -139,9 +112,9 @@ shared_examples_for "find" do
         @session.visit('/with_scope')
       end
 
-      it "should find the first element using the given locator" do
+      it "should find the an element using the given locator" do
         @session.within(:xpath, "//div[@id='for_bar']") do
-          @session.find('.//li').text.should =~ /With Simple HTML/
+          @session.find('.//li[1]').text.should =~ /With Simple HTML/
         end
       end
     end

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

@@ -15,8 +15,8 @@ shared_examples_for "first" do
 
     it "should accept an XPath instance" do
       @session.visit('/form')
-      @xpath = XPath::HTML.fillable_field('Name')
-      @session.first(@xpath).value.should == 'John Smith'
+      @xpath = XPath::HTML.fillable_field('First Name')
+      @session.first(@xpath).value.should == 'John'
     end
 
     context "with css selectors" do
@@ -58,38 +58,6 @@ shared_examples_for "first" do
       end
     end
 
-    context "with prefer visible elements" do
-      it "should find invisible elements if no visible element exists" do
-        @session.first(:css, 'a#invisible')[:id].should == 'invisible'
-      end
-
-      it "should prefer visible elements over invisible elements" do
-        @session.first(:css, 'a.visibility')[:id].should == 'visible'
-      end
-
-      it "should return the first invisible element if no visible elements exist" do
-        @session.first(:css, 'a.hidden')[:id].should == 'first_invisble'
-      end
-
-      it "find visible links normally" do
-        @session.first(:css, 'a#visible')[:id].should == 'visible'
-      end
-    end
-
-    context "without prefer visible elements" do
-      before { Capybara.prefer_visible_elements = false }
-
-      it "should find invisible elements if no visible element exists" do
-        @session.first(:css, 'a#invisible')[:id].should == 'invisible'
-      end
-
-      it "should not prefer visible elements over invisible elements" do
-        @session.first(:css, 'a.visibility')[:id].should == 'invisible'
-      end
-
-      after { Capybara.prefer_visible_elements = true }
-    end
-
     context "within a scope" do
       before do
         @session.visit('/with_scope')

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

@@ -1,4 +1,4 @@
-shared_examples_for "has_css" do  
+shared_examples_for "has_css" do
   describe '#has_css?' do
     before do
       @session.visit('/with_html')

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

@@ -36,6 +36,20 @@ shared_examples_for "has_field" do
         @session.should_not have_field('First Name', :with => 'John')
       end
     end
+
+    context 'with type' do
+      it "should be true if a field with the given type is on the page" do
+        @session.should have_field('First Name', :type => 'text')
+        @session.should have_field('Html5 Email', :type => 'email')
+        @session.should have_field('Html5 Tel', :type => 'tel')
+      end
+
+      it "should be false if the given field is not on the page" do
+        @session.should_not have_field('First Name', :type => 'email')
+        @session.should_not have_field('Html5 Email', :type => 'tel')
+        @session.should_not have_field('Description', :type => '')
+      end
+    end
   end
 
   describe '#has_no_field' do
@@ -75,6 +89,20 @@ shared_examples_for "has_field" do
         @session.should have_no_field('First Name', :with => 'John')
       end
     end
+
+    context 'with type' do
+      it "should be false if a field with the given type is on the page" do
+        @session.should_not have_no_field('First Name', :type => 'text')
+        @session.should_not have_no_field('Html5 Email', :type => 'email')
+        @session.should_not have_no_field('Html5 Tel', :type => 'tel')
+      end
+
+      it "should be true if the given field is not on the page" do
+        @session.should have_no_field('First Name', :type => 'email')
+        @session.should have_no_field('Html5 Email', :type => 'tel')
+        @session.should have_no_field('Description', :type => '')
+      end
+    end
   end
 
   describe '#has_checked_field?' do

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

@@ -1,4 +1,4 @@
-shared_examples_for "has_select" do  
+shared_examples_for "has_select" do
   describe '#has_select?' do
     before { @session.visit('/form') }
 
@@ -14,17 +14,26 @@ shared_examples_for "has_select" do
 
     context 'with selected value' do
       it "should be true if a field with the given value is on the page" do
-        @session.should have_select('form_locale', :selected => 'English')  
-        @session.should have_select('Region', :selected => 'Norway')  
-        @session.should have_select('Underwear', :selected => ['Briefs', 'Commando'])
+        @session.should have_select('form_locale', :selected => 'English')
+        @session.should have_select('Region', :selected => 'Norway')
+        @session.should have_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
       end
 
       it "should be false if the given field is not on the page" do
-        @session.should_not have_select('Locale', :selected => 'Swedish')  
-        @session.should_not have_select('Does not exist', :selected => 'John')  
+        @session.should_not have_select('Locale', :selected => 'Swedish')
+        @session.should_not have_select('Does not exist', :selected => 'John')
         @session.should_not have_select('City', :selected => 'Not there')
-        @session.should_not have_select('Underwear', :selected => ['Briefs', 'Nonexistant'])
-        @session.should_not have_select('Underwear', :selected => ['Briefs', 'Boxers'])
+        @session.should_not have_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistant'
+        ])
+        @session.should_not have_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
+        @session.should_not have_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
+        ])
       end
 
       it "should be true after the given value is selected" do
@@ -39,25 +48,44 @@ shared_examples_for "has_select" do
 
       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'])
+        @session.should have_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
       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'])
+        @session.should_not have_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
       end
     end
 
-    context 'with options' do
+    context 'with exact options' do
       it "should be true if a field with the given options is on the page" do
-        @session.should have_select('form_locale', :options => ['English'])  
-        @session.should have_select('Region', :options => ['Norway', 'Sweden'])  
+        @session.should have_select('Region', :options => ['Norway', 'Sweden', 'Finland'])
+        @session.should have_select('Tendency', :options => [])
       end
 
       it "should be false if the given field is not on the page" do
-        @session.should_not have_select('Locale', :options => ['Not there'])
-        @session.should_not have_select('Does not exist', :options => ['John'])  
+        @session.should_not have_select('Locale', :options => ['Swedish'])
+        @session.should_not have_select('Does not exist', :options => ['John'])
         @session.should_not have_select('City', :options => ['London', 'Made up city'])
+        @session.should_not have_select('Region', :options => ['Norway', 'Sweden'])
+        @session.should_not have_select('Region', :options => ['Norway', 'Norway', 'Norway'])
+      end
+    end
+
+    context 'with partial options' do
+      it "should be true if a field with the given partial options is on the page" do
+        @session.should have_select('Region', :with_options => ['Norway', 'Sweden'])
+        @session.should have_select('City', :with_options => ['London'])
+      end
+
+      it "should be false if a field with the given partial options is not on the page" do
+        @session.should_not have_select('Locale', :with_options => ['Uruguayan'])
+        @session.should_not have_select('Does not exist', :with_options => ['John'])
+        @session.should_not have_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
       end
     end
   end
@@ -77,17 +105,26 @@ shared_examples_for "has_select" do
 
     context 'with selected value' do
       it "should be false if a field with the given value is on the page" do
-        @session.should_not have_no_select('form_locale', :selected => 'English')  
-        @session.should_not have_no_select('Region', :selected => 'Norway')  
-        @session.should_not have_no_select('Underwear', :selected => ['Briefs', 'Commando'])
+        @session.should_not have_no_select('form_locale', :selected => 'English')
+        @session.should_not have_no_select('Region', :selected => 'Norway')
+        @session.should_not have_no_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
       end
 
       it "should be true if the given field is not on the page" do
-        @session.should have_no_select('Locale', :selected => 'Swedish')  
-        @session.should have_no_select('Does not exist', :selected => 'John')  
+        @session.should have_no_select('Locale', :selected => 'Swedish')
+        @session.should have_no_select('Does not exist', :selected => 'John')
         @session.should have_no_select('City', :selected => 'Not there')
-        @session.should have_no_select('Underwear', :selected => ['Briefs', 'Nonexistant'])
-        @session.should have_no_select('Underwear', :selected => ['Briefs', 'Boxers'])
+        @session.should have_no_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistant'
+        ])
+        @session.should have_no_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
+        @session.should have_no_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
+        ])
       end
 
       it "should be false after the given value is selected" do
@@ -102,28 +139,44 @@ shared_examples_for "has_select" do
 
       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'])
+        @session.should_not have_no_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
       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'])
+        @session.should have_no_select('Underwear', :selected => [
+          'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
+        ])
       end
     end
 
-    context 'with options' do
+    context 'with exact options' do
       it "should be false if a field with the given options is on the page" do
-        @session.should_not have_no_select('form_locale', :options => ['English'])  
-        @session.should_not have_no_select('Region', :options => ['Norway', 'Sweden'])  
+        @session.should_not have_no_select('Region', :options => ['Norway', 'Sweden', 'Finland'])
       end
 
       it "should be true if the given field is not on the page" do
-        @session.should have_no_select('Locale', :options => ['Not there'])
-        @session.should have_no_select('Does not exist', :options => ['John'])  
+        @session.should have_no_select('Locale', :options => ['Swedish'])
+        @session.should have_no_select('Does not exist', :options => ['John'])
         @session.should have_no_select('City', :options => ['London', 'Made up city'])
+        @session.should have_no_select('Region', :options => ['Norway', 'Sweden'])
+        @session.should have_no_select('Region', :options => ['Norway', 'Norway', 'Norway'])
       end
     end
-  end
-end
 
+    context 'with partial options' do
+      it "should be false if a field with the given partial options is on the page" do
+        @session.should_not have_no_select('Region', :with_options => ['Norway', 'Sweden'])
+        @session.should_not have_no_select('City', :with_options => ['London'])
+      end
 
+      it "should be true if a field with the given partial options is not on the page" do
+        @session.should have_no_select('Locale', :with_options => ['Uruguayan'])
+        @session.should have_no_select('Does not exist', :with_options => ['John'])
+        @session.should have_no_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      end
+    end
+  end
+end

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

@@ -1,48 +1,17 @@
-shared_examples_for "has_table" do  
+shared_examples_for "has_table" do
   describe '#has_table?' do
     before do
       @session.visit('/tables')
     end
 
-    it "should be true if the field is on the page" do
-      @session.should have_table('Deaths')
+    it "should be true if the table is on the page" do
+      @session.should have_table('Villain')
       @session.should have_table('villain_table')
     end
 
-    it "should be false if the field is not on the page" do
+    it "should be false if the table is not on the page" do
       @session.should_not have_table('Monkey')
     end
-
-    context 'with rows' do
-      it "should be true if a table with the given rows is on the page" do
-        @session.should have_table('Ransom', :rows => [['2007', '$300', '$100']])
-        @session.should have_table('Deaths', :rows => [['2007', '66', '7'], ['2008', '123', '12']])
-      end
-
-      it "should be true if the given rows are incomplete" do
-        @session.should have_table('Ransom', :rows => [['$300', '$100']])
-      end
-
-      it "should be false if the given table is not on the page" do
-        @session.should_not have_table('Does not exist', :selected => 'John')  
-      end
-
-      it "should be false if the given rows contain incorrect elements" do
-        @session.should_not have_table('Ransom', :rows => [['2007', '$1000000000', '$100']])
-      end
-
-      it "should be false if the given rows are incorrectly ordered" do
-        @session.should_not have_table('Ransom', :rows => [['2007', '$100', '$300']])
-      end
-
-      it "should be false if the only some of the given rows are correct" do
-        @session.should_not have_table('Deaths', :rows => [['2007', '66', '7'], ['2007', '99999999', '12']])
-      end
-
-      it "should be false if the given rows are out of order" do
-        @session.should_not have_table('Deaths', :rows => [['2007', '123', '12'], ['2007', '66', '7']])
-      end
-    end
   end
 
   describe '#has_no_table?' do
@@ -50,45 +19,14 @@ shared_examples_for "has_table" do
       @session.visit('/tables')
     end
 
-    it "should be false if the field is on the page" do
-      @session.should_not have_no_table('Deaths')
+    it "should be false if the table is on the page" do
+      @session.should_not have_no_table('Villain')
       @session.should_not have_no_table('villain_table')
     end
 
-    it "should be true if the field is not on the page" do
+    it "should be true if the table is not on the page" do
       @session.should have_no_table('Monkey')
     end
-
-    context 'with rows' do
-      it "should be false if a table with the given rows is on the page" do
-        @session.should_not have_no_table('Ransom', :rows => [['2007', '$300', '$100']])
-        @session.should_not have_no_table('Deaths', :rows => [['2007', '66', '7'], ['2008', '123', '12']])
-      end
-
-      it "should be false if the given rows are incomplete" do
-        @session.should_not have_no_table('Ransom', :rows => [['$300', '$100']])
-      end
-
-      it "should be true if the given table is not on the page" do
-        @session.should have_no_table('Does not exist', :selected => 'John')  
-      end
-
-      it "should be true if the given rows contain incorrect elements" do
-        @session.should have_no_table('Ransom', :rows => [['2007', '$1000000000', '$100']])
-      end
-
-      it "should be true if the given rows are incorrectly ordered" do
-        @session.should have_no_table('Ransom', :rows => [['2007', '$100', '$300']])
-      end
-
-      it "should be true if the only some of the given rows are correct" do
-        @session.should have_no_table('Deaths', :rows => [['2007', '66', '7'], ['2007', '99999999', '12']])
-      end
-
-      it "should be true if the given rows are out of order" do
-        @session.should have_no_table('Deaths', :rows => [['2007', '123', '12'], ['2007', '66', '7']])
-      end
-    end
   end
 end