capybara 2.2.1 → 2.3.0

data/lib/capybara/spec/public/jquery.js

@@ -4768,7 +4768,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};
 }
 
-// Utility function for retreiving the text value of an array of DOM nodes
+// Utility function for retrieving the text value of an array of DOM nodes
 Sizzle.getText = function( elems ) {
 	var ret = "", elem;
 

data/lib/capybara/spec/public/test.js

@@ -60,4 +60,11 @@ $(function() {
       $('title').text('changed title')
     }, 250)
   });
+  $('#click-test').dblclick(function() {
+    $(this).after('<a id="has-been-double-clicked" href="#">Has been double clicked</a>');
+  });
+  $('#click-test').bind('contextmenu', function(e) {
+    e.preventDefault();
+    $(this).after('<a id="has-been-right-clicked" href="#">Has been right clicked</a>');
+  });
 });

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

@@ -4,20 +4,20 @@ Capybara::SpecHelper.spec "#all" do
   end
 
   it "should find all elements using the given locator" do
-    @session.all('//p').should have(3).elements
-    @session.all('//h1').first.text.should == 'This is a test'
-    @session.all("//input[@id='test_field']").first[:value].should == 'monkey'
+    expect(@session.all('//p').size).to eq(3)
+    expect(@session.all('//h1').first.text).to eq('This is a test')
+    expect(@session.all("//input[@id='test_field']").first[:value]).to eq('monkey')
   end
 
   it "should return an empty array when nothing was found" do
-    @session.all('//div[@id="nosuchthing"]').should be_empty
+    expect(@session.all('//div[@id="nosuchthing"]')).to be_empty
   end
 
   it "should accept an XPath instance" do
     @session.visit('/form')
     @xpath = XPath::HTML.fillable_field('Name')
     @result = @session.all(@xpath).map { |r| r.value }
-    @result.should include('Smith', 'John', 'John Smith')
+    expect(@result).to include('Smith', 'John', 'John Smith')
   end
 
   it "should raise an error when given invalid options" do
@@ -26,44 +26,115 @@ Capybara::SpecHelper.spec "#all" do
 
   context "with css selectors" do
     it "should find all elements using the given selector" do
-      @session.all(:css, 'h1').first.text.should == 'This is a test'
-      @session.all(:css, "input[id='test_field']").first[:value].should == 'monkey'
+      expect(@session.all(:css, 'h1').first.text).to eq('This is a test')
+      expect(@session.all(:css, "input[id='test_field']").first[:value]).to eq('monkey')
     end
 
     it "should find all elements when given a list of selectors" do
-      @session.all(:css, 'h1, p').should have(4).elements
+      expect(@session.all(:css, 'h1, p').size).to eq(4)
     end
   end
 
   context "with xpath selectors" do
     it "should find the first element using the given locator" do
-      @session.all(:xpath, '//h1').first.text.should == 'This is a test'
-      @session.all(:xpath, "//input[@id='test_field']").first[:value].should == 'monkey'
+      expect(@session.all(:xpath, '//h1').first.text).to eq('This is a test')
+      expect(@session.all(:xpath, "//input[@id='test_field']").first[:value]).to eq('monkey')
     end
   end
 
   context "with css as default selector" do
     before { Capybara.default_selector = :css }
     it "should find the first element using the given locator" do
-      @session.all('h1').first.text.should == 'This is a test'
-      @session.all("input[id='test_field']").first[:value].should == 'monkey'
+      expect(@session.all('h1').first.text).to eq('This is a test')
+      expect(@session.all("input[id='test_field']").first[:value]).to eq('monkey')
     end
   end
 
   context "with visible filter" do
     it "should only find visible nodes when true" do
-      @session.all(:css, "a.simple", :visible => true).should have(1).elements
+      expect(@session.all(:css, "a.simple", :visible => true).size).to eq(1)
     end
 
     it "should find nodes regardless of whether they are invisible when false" do
-      @session.all(:css, "a.simple", :visible => false).should have(2).elements
+      expect(@session.all(:css, "a.simple", :visible => false).size).to eq(2)
     end
 
     it "should default to Capybara.ignore_hidden_elements" do
       Capybara.ignore_hidden_elements = true
-      @session.all(:css, "a.simple").should have(1).elements
+      expect(@session.all(:css, "a.simple").size).to eq(1)
       Capybara.ignore_hidden_elements = false
-      @session.all(:css, "a.simple").should have(2).elements
+      expect(@session.all(:css, "a.simple").size).to eq(2)
+    end
+  end
+
+  context 'with element count filters' do
+    context ':count' do
+      it 'should succeed when the number of elements founds matches the expectation' do
+        expect { @session.all(:css, 'h1, p', :count => 4) }.to_not raise_error
+      end
+      it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
+        expect { @session.all(:css, 'h1, p', :count => 5) }.to raise_error(Capybara::ExpectationNotMet)
+      end
+    end
+    context ':minimum' do
+      it 'should succeed when the number of elements founds matches the expectation' do
+        expect { @session.all(:css, 'h1, p', :minimum => 0) }.to_not raise_error
+      end
+      it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
+        expect { @session.all(:css, 'h1, p', :minimum => 5) }.to raise_error(Capybara::ExpectationNotMet)
+      end
+    end
+    context ':maximum' do
+      it 'should succeed when the number of elements founds matches the expectation' do
+        expect { @session.all(:css, 'h1, p', :maximum => 4) }.to_not raise_error
+      end
+      it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
+        expect { @session.all(:css, 'h1, p', :maximum => 0) }.to raise_error(Capybara::ExpectationNotMet)
+      end
+    end
+    context ':between' do
+      it 'should succeed when the number of elements founds matches the expectation' do
+        expect { @session.all(:css, 'h1, p', :between => 2..7) }.to_not raise_error
+      end
+      it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
+        expect { @session.all(:css, 'h1, p', :between => 0..3) }.to raise_error(Capybara::ExpectationNotMet)
+      end
+    end
+
+    context 'with multiple count filters' do
+      it 'ignores other filters when :count is specified' do
+        o = {:count   => 4,
+             :minimum => 5,
+             :maximum => 0,
+             :between => 0..3}
+        expect { @session.all(:css, 'h1, p', o) }.to_not raise_error
+      end
+      context 'with no :count expectation' do
+        it 'fails if :minimum is not met' do
+          o = {:minimum => 5,
+               :maximum => 4,
+               :between => 2..7}
+          expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
+        end
+        it 'fails if :maximum is not met' do
+          o = {:minimum => 0,
+               :maximum => 0,
+               :between => 2..7}
+          expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
+        end
+        it 'fails if :between is not met' do
+          o = {:minimum => 0,
+               :maximum => 4,
+               :between => 0..3}
+          expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
+        end
+        it 'succeeds if all combineable expectations are met' do
+          o = {:minimum => 0,
+               :maximum => 4,
+               :between => 2..7}
+          expect { @session.all(:css, 'h1, p', o) }.to_not raise_error
+        end
+      end
     end
   end
 
@@ -74,7 +145,7 @@ Capybara::SpecHelper.spec "#all" do
 
     it "should find any element using the given locator" do
       @session.within(:xpath, "//div[@id='for_bar']") do
-        @session.all('.//li').should have(2).elements
+        expect(@session.all('.//li').size).to eq(2)
       end
     end
   end

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

@@ -70,6 +70,12 @@ Capybara::SpecHelper.spec '#assert_selector' do
   end
 end
 
+Capybara::SpecHelper.spec '#refute_selector' do
+  it "should be an alias of #assert_no_selector" do
+    expect(Capybara::Node::Matchers.instance_method(:refute_selector)).to eq Capybara::Node::Matchers.instance_method(:assert_no_selector)
+  end
+end
+
 Capybara::SpecHelper.spec '#assert_no_selector' do
   before do
     @session.visit('/with_html')

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

@@ -10,19 +10,19 @@ Capybara::SpecHelper.spec "#attach_file" do
     it "should set a file path by id" do
       @session.attach_file "form_image", __FILE__
       @session.click_button('awesome')
-      extract_results(@session)['image'].should == File.basename(__FILE__)
+      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "should set a file path by label" do
       @session.attach_file "Image", __FILE__
       @session.click_button('awesome')
-      extract_results(@session)['image'].should == File.basename(__FILE__)
+      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "casts to string" do
       @session.attach_file :"form_image", __FILE__
       @session.click_button('awesome')
-      extract_results(@session)['image'].should == File.basename(__FILE__)
+      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
   end
 
@@ -30,51 +30,51 @@ Capybara::SpecHelper.spec "#attach_file" do
     it "should set a file path by id" do
       @session.attach_file "form_document", @test_file_path
       @session.click_button('Upload Single')
-      @session.should have_content(File.read(@test_file_path))
+      expect(@session).to have_content(File.read(@test_file_path))
     end
 
     it "should set a file path by label" do
       @session.attach_file "Single Document", @test_file_path
       @session.click_button('Upload Single')
-      @session.should have_content(File.read(@test_file_path))
+      expect(@session).to have_content(File.read(@test_file_path))
     end
 
     it "should not break if no file is submitted" do
       @session.click_button('Upload Single')
-      @session.should have_content('No file uploaded')
+      expect(@session).to have_content('No file uploaded')
     end
 
     it "should send content type text/plain when uploading a text file" do
       @session.attach_file "Single Document", @test_file_path
       @session.click_button 'Upload Single'
-      @session.should have_content('text/plain')
+      expect(@session).to have_content('text/plain')
     end
 
     it "should send content type image/jpeg when uploading an image" do
       @session.attach_file "Single Document", @test_jpg_file_path
       @session.click_button 'Upload Single'
-      @session.should have_content('image/jpeg')
+      expect(@session).to have_content('image/jpeg')
     end
 
     it "should not break when using HTML5 multiple file input" do
       @session.attach_file "Multiple Documents", @test_file_path
       @session.click_button('Upload Multiple')
-      @session.body.should include("1 | ")#number of files
-      @session.should have_content(File.read(@test_file_path))
+      expect(@session.body).to include("1 | ")#number of files
+      expect(@session).to have_content(File.read(@test_file_path))
     end
 
     it  "should not break when using HTML5 multiple file input uploading multiple files" do
       pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium/
       @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path]
       @session.click_button('Upload Multiple')
-      @session.body.should include("2 | ")#number of files
-      @session.body.should include(File.read(@test_file_path))
-      @session.body.should include(File.read(@another_test_file_path))
+      expect(@session.body).to include("2 | ")#number of files
+      expect(@session.body).to include(File.read(@test_file_path))
+      expect(@session.body).to include(File.read(@another_test_file_path))
     end
 
     it "should not send anything when attaching no files to a multiple upload field" do
       @session.click_button('Upload Empty Multiple')
-      @session.body.should include("Successfully ignored empty file field")
+      expect(@session.body).to include("Successfully ignored empty file field")
     end
   end
 
@@ -97,7 +97,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     it "should set a file path by partial label when false" do
       @session.attach_file "Imag", __FILE__, :exact => false
       @session.click_button('awesome')
-      extract_results(@session)['image'].should == File.basename(__FILE__)
+      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "not allow partial matches when true" do

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

@@ -1,20 +1,20 @@
 Capybara::SpecHelper.spec '#body' do
   it "should return the unmodified page body" do
     @session.visit('/')
-    @session.should have_content('Hello world!') # wait for content to appear if visit is async
-    @session.body.should include('Hello world!')
+    expect(@session).to have_content('Hello world!') # wait for content to appear if visit is async
+    expect(@session.body).to include('Hello world!')
   end
 
   if "".respond_to?(:encoding)
     context "encoding of response between ascii and utf8" do
       it "should be valid with html entities" do
         @session.visit('/with_html_entities')
-        lambda { @session.body.encode!("UTF-8") }.should_not raise_error
+        expect { @session.body.encode!("UTF-8") }.not_to raise_error
       end
 
       it "should be valid without html entities" do
         @session.visit('/with_html')
-        lambda { @session.body.encode!("UTF-8") }.should_not raise_error
+        expect { @session.body.encode!("UTF-8") }.not_to raise_error
       end
     end
   end

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

@@ -6,64 +6,64 @@ Capybara::SpecHelper.spec "#check" do
   describe "'checked' attribute" do
     it "should be true if checked" do
       @session.check("Terms of Use")
-      @session.find(:xpath, "//input[@id='form_terms_of_use']")['checked'].should be_true
+      expect(@session.find(:xpath, "//input[@id='form_terms_of_use']")['checked']).to be_truthy
     end
 
     it "should be false if unchecked" do
-      @session.find(:xpath, "//input[@id='form_terms_of_use']")['checked'].should be_false
+      expect(@session.find(:xpath, "//input[@id='form_terms_of_use']")['checked']).to be_falsey
     end
   end
 
   it "should trigger associated events", :requires => [:js] do
     @session.visit('/with_js')
     @session.check('checkbox_with_event')
-    @session.should have_css('#checkbox_event_triggered');
+    expect(@session).to have_css('#checkbox_event_triggered');
   end
 
   describe "checking" do
     it "should not change an already checked checkbox" do
-      @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
       @session.check('form_pets_dog')
-      @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
     end
 
     it "should check an unchecked checkbox" do
-      @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
       @session.check('form_pets_cat')
-      @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_true
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_truthy
     end
   end
 
   describe "unchecking" do
     it "should not change an already unchecked checkbox" do
-      @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
       @session.uncheck('form_pets_cat')
-      @session.find(:xpath, "//input[@id='form_pets_cat']")['checked'].should be_false
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
     end
 
     it "should uncheck a checked checkbox" do
-      @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_true
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
       @session.uncheck('form_pets_dog')
-      @session.find(:xpath, "//input[@id='form_pets_dog']")['checked'].should be_false
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_falsey
     end
   end
 
   it "should check a checkbox by id" do
     @session.check("form_pets_cat")
     @session.click_button('awesome')
-    extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+    expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
   it "should check a checkbox by label" do
     @session.check("Cat")
     @session.click_button('awesome')
-    extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+    expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
   it "casts to string" do
     @session.check(:"form_pets_cat")
     @session.click_button('awesome')
-    extract_results(@session)['pets'].should include('dog', 'cat', 'hamster')
+    expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
   context "with a locator that doesn't exist" do
@@ -87,7 +87,7 @@ Capybara::SpecHelper.spec "#check" do
     it "should accept partial matches when false" do
       @session.check('Ham', :exact => false)
       @session.click_button('awesome')
-      extract_results(@session)['pets'].should include('hamster')
+      expect(extract_results(@session)['pets']).to include('hamster')
     end
 
     it "should not accept partial matches when true" do
@@ -101,7 +101,7 @@ Capybara::SpecHelper.spec "#check" do
     it "can check boxes by their value" do
       @session.check('form[pets][]', :option => "cat")
       @session.click_button('awesome')
-      extract_results(@session)['pets'].should include('cat')
+      expect(extract_results(@session)['pets']).to include('cat')
     end
 
     it "should raise an error if option not found" do

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

@@ -6,19 +6,19 @@ Capybara::SpecHelper.spec "#choose" do
   it "should choose a radio button by id" do
     @session.choose("gender_male")
     @session.click_button('awesome')
-    extract_results(@session)['gender'].should == 'male'
+    expect(extract_results(@session)['gender']).to eq('male')
   end
 
   it "should choose a radio button by label" do
     @session.choose("Both")
     @session.click_button('awesome')
-    extract_results(@session)['gender'].should == 'both'
+    expect(extract_results(@session)['gender']).to eq('both')
   end
 
   it "casts to string" do
     @session.choose("Both")
     @session.click_button(:'awesome')
-    extract_results(@session)['gender'].should == 'both'
+    expect(extract_results(@session)['gender']).to eq('both')
   end
 
   context "with a locator that doesn't exist" do
@@ -42,7 +42,7 @@ Capybara::SpecHelper.spec "#choose" do
     it "should accept partial matches when false" do
       @session.choose("Mal", :exact => false)
       @session.click_button('awesome')
-      extract_results(@session)['gender'].should == 'male'
+      expect(extract_results(@session)['gender']).to eq('male')
     end
 
     it "should not accept partial matches when true" do
@@ -56,7 +56,7 @@ Capybara::SpecHelper.spec "#choose" do
     it "can check radio buttons by their value" do
       @session.choose('form[gender]', :option => "male")
       @session.click_button('awesome')
-      extract_results(@session)['gender'].should == "male"
+      expect(extract_results(@session)['gender']).to eq("male")
     end
 
     it "should raise an error if option not found" do