capybara 2.3.0 → 2.4.0

data/spec/dsl_spec.rb

@@ -7,11 +7,13 @@ end
 
 Capybara::SpecHelper.run_specs TestClass.new, "DSL", :capybara_skip => [
   :js,
+  :modals,
   :screenshot,
   :frames,
   :windows,
   :server,
-  :hover
+  :hover,
+  :about_scheme,
 ]
 
 RSpec.describe Capybara::DSL do

data/spec/rack_test_spec.rb

@@ -6,11 +6,13 @@ end
 
 Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :capybara_skip => [
   :js,
+  :modals,
   :screenshot,
   :frames,
   :windows,
   :server,
-  :hover
+  :hover,
+  :about_scheme,
 ]
 
 RSpec.describe Capybara::Session do
@@ -57,6 +59,15 @@ RSpec.describe Capybara::Session do
         @session.driver.options[:respect_data_method] = false
       end
     end
+    
+    describe "#fill_in" do
+      it "should warn that :fill_options are not supported" do
+        expect_any_instance_of(Capybara::Node::Element).to receive(:warn)
+          .with("Options passed to Capybara::Node#set but the driver doesn't support them")
+        @session.visit "/with_html"
+        @session.fill_in 'test_field', with: 'not_moneky', fill_options: { random: true }
+      end
+    end
 
     describe "#attach_file" do
       context "with multipart form" do

data/spec/rspec/features_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'capybara/rspec'
 
-RSpec.configuration.before(:each, :example_group => {:file_path => "./spec/rspec/features_spec.rb"}) do
+RSpec.configuration.before(:each, { file_path: "./spec/rspec/features_spec.rb" } ) do
   @in_filtered_hook = true
 end
 

data/spec/rspec/matchers_spec.rb

@@ -74,6 +74,11 @@ RSpec.describe Capybara::RSpecMatchers do
           end.to raise_error(/expected not to find css "h1"/)
         end
       end
+      
+      it "supports compounding" do
+        expect("<h1>Text</h1><h2>Text</h2>").to have_css('h1').and have_css('h2')
+        expect("<h1>Text</h1><h2>Text</h2>").to have_css('h3').or have_css('h1')
+      end if RSpec::Version::STRING.to_f >= 3.0
     end
 
     context "on a page or node" do
@@ -136,6 +141,11 @@ RSpec.describe Capybara::RSpecMatchers do
           end.to raise_error(%r(expected not to find xpath "//h1"))
         end
       end
+      
+      it "supports compounding" do
+        expect("<h1>Text</h1><h2>Text</h2>").to have_xpath('//h1').and have_xpath('//h2')
+        expect("<h1>Text</h1><h2>Text</h2>").to have_xpath('//h3').or have_xpath('//h1')
+      end if RSpec::Version::STRING.to_f >= 3.0
     end
 
     context "on a page or node" do
@@ -237,6 +247,11 @@ RSpec.describe Capybara::RSpecMatchers do
         end
       end
     end
+    
+    it "supports compounding" do
+      expect("<h1>Text</h1><h2>Text</h2>").to have_selector('//h1').and have_selector('//h2')
+      expect("<h1>Text</h1><h2>Text</h2>").to have_selector('//h3').or have_selector('//h1')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_content matcher" do
@@ -321,6 +336,11 @@ RSpec.describe Capybara::RSpecMatchers do
         end
       end
     end
+    
+    it "supports compounding" do
+      expect("<h1>Text</h1><h2>And</h2>").to have_content('Text').and have_content('And')
+      expect("<h1>Text</h1><h2>Or</h2>").to have_content('XYZ').or have_content('Or')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_text matcher" do
@@ -330,20 +350,26 @@ RSpec.describe Capybara::RSpecMatchers do
 
     context "on a string" do
       context "with should" do
-        it "passes if has_text? returns true" do
+        it "passes if text contains given string" do
           expect("<h1>Text</h1>").to have_text('Text')
         end
 
-        it "passes if has_text? returns true using regexp" do
+        it "passes if text matches given regexp" do
           expect("<h1>Text</h1>").to have_text(/ext/)
         end
 
-        it "fails if has_text? returns false" do
+        it "fails if text doesn't contain given string" do
           expect do
             expect("<h1>Text</h1>").to have_text('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "Text"/)
         end
 
+        it "fails if text doesn't match given regexp" do
+          expect do
+            expect("<h1>Text</h1>").to have_text(/No such Text/)
+          end.to raise_error('expected to find text matching /No such Text/ in "Text"')
+        end
+
         it "casts Fixnum to string" do
           expect do
             expect("<h1>Text</h1>").to have_text(3)
@@ -353,30 +379,30 @@ RSpec.describe Capybara::RSpecMatchers do
         it "fails if matched text count does not equal to expected count" do
           expect do
             expect("<h1>Text</h1>").to have_text('Text', count: 2)
-          end.to raise_error(/expected to find text "Text" 2 times in "Text"/)
+          end.to raise_error('expected to find text "Text" 2 times but found 1 time in "Text"')
         end
 
         it "fails if matched text count is less than expected minimum count" do
           expect do
             expect("<h1>Text</h1>").to have_text('Lorem', minimum: 1)
-          end.to raise_error(/expected to find text "Lorem" at least 1 time in "Text"/)
+          end.to raise_error('expected to find text "Lorem" at least 1 time but found 0 times in "Text"')
         end
 
         it "fails if matched text count is more than expected maximum count" do
           expect do
             expect("<h1>Text TextText</h1>").to have_text('Text', maximum: 2)
-          end.to raise_error(/expected to find text "Text" at most 2 times in "Text TextText"/)
+          end.to raise_error('expected to find text "Text" at most 2 times but found 3 times in "Text TextText"')
         end
 
         it "fails if matched text count does not belong to expected range" do
           expect do
             expect("<h1>Text</h1>").to have_text('Text', between: 2..3)
-          end.to raise_error(/expected to find text "Text" between 2 and 3 times in "Text"/)
+          end.to raise_error('expected to find text "Text" between 2 and 3 times but found 1 time in "Text"')
         end
       end
 
       context "with should_not" do
-        it "passes if has_no_text? returns true" do
+        it "passes if text doesn't contain a string" do
           expect("<h1>Text</h1>").not_to have_text('No such Text')
         end
 
@@ -384,7 +410,7 @@ RSpec.describe Capybara::RSpecMatchers do
           expect("<h1>Text</h1>").not_to have_text('.')
         end
 
-        it "fails if has_no_text? returns false" do
+        it "fails if text contains a string" do
           expect do
             expect("<h1>Text</h1>").not_to have_text('Text')
           end.to raise_error(/expected not to find text "Text" in "Text"/)
@@ -444,10 +470,15 @@ RSpec.describe Capybara::RSpecMatchers do
         end
       end
     end
+    
+    it "supports compounding" do
+      expect("<h1>Text</h1><h2>And</h2>").to have_text('Text').and have_text('And')
+      expect("<h1>Text</h1><h2>Or</h2>").to have_text('Not here').or have_text('Or')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_link matcher" do
-    let(:html) { '<a href="#">Just a link</a>' }
+    let(:html) { '<a href="#">Just a link</a><a href="#">Another link</a>' }
 
     it "gives proper description" do
       expect(have_link('Just a link').description).to eq("have link \"Just a link\"")
@@ -462,6 +493,11 @@ RSpec.describe Capybara::RSpecMatchers do
         expect(html).to have_link('No such Link')
       end.to raise_error(/expected to find link "No such Link"/)
     end
+    
+    it "supports compounding" do
+      expect(html).to have_link('Just a link').and have_link('Another link')
+      expect(html).to have_link('Not a link').or have_link('Another link')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_title matcher" do
@@ -479,25 +515,54 @@ RSpec.describe Capybara::RSpecMatchers do
       it "fails if there is no such title" do
         expect do
           expect(html).to have_title('No such title')
-        end.to raise_error(/expected there to be title "No such title"/)
+        end.to raise_error('expected "Just a title" to include "No such title"')
       end
-    end
 
-    context "on a page or node" do
-      before do
-        visit('/with_js')
+      it "fails if title doesn't match regexp" do
+        expect do
+          expect(html).to have_title(/[[:upper:]]+[[:lower:]]+l{2}o/)
+        end.to raise_error('expected "Just a title" to match /[[:upper:]]+[[:lower:]]+l{2}o/')
       end
+    end
 
+    context "on a page or node" do
       it "passes if there is such a title" do
+        visit('/with_js')
         expect(page).to have_title('with_js')
       end
 
       it "fails if there is no such title" do
+        visit('/with_js')
         expect do
           expect(page).to have_title('No such title')
-        end.to raise_error(/expected there to be title "No such title"/)
+        end.to raise_error('expected "with_js" to include "No such title"')
+      end
+
+      context 'with wait' do
+        before(:each) do
+          @session = TestSessions::Selenium
+          @session.visit('/with_js')
+        end
+
+        it 'waits if wait time is more than timeout' do
+          @session.click_link("Change title")
+          using_wait_time 0 do
+            expect(@session).to have_title('changed title', wait: 0.5)
+          end
+        end
+
+        it "doesn't wait if wait time is less than timeout" do
+          @session.click_link("Change title")
+          using_wait_time 0 do
+            expect(@session).not_to have_title('changed title')
+          end
+        end
       end
     end
+    
+    it "supports compounding" do
+      expect("<title>I compound</title>").to have_title('I dont compound').or have_title('I compound')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_button matcher" do
@@ -516,6 +581,10 @@ RSpec.describe Capybara::RSpecMatchers do
         expect(html).to have_button('No such Button')
       end.to raise_error(/expected to find button "No such Button"/)
     end
+    
+    it "supports compounding" do
+      expect(html).to have_button('Not this button').or have_button('A button')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_field matcher" do
@@ -528,7 +597,7 @@ RSpec.describe Capybara::RSpecMatchers do
     it "gives proper description for a given value" do
       expect(have_field('Text field', with: 'some value').description).to eq("have field \"Text field\" with value \"some value\"")
     end
-
+    
     it "passes if there is such a field" do
       expect(html).to have_field('Text field')
     end
@@ -557,6 +626,10 @@ RSpec.describe Capybara::RSpecMatchers do
       end
       expect(html).to have_field('Text field', with: Foo.new)
     end
+    
+    it "supports compounding" do
+      expect(html).to have_field('Not this one').or have_field('Text field')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_checked_field matcher" do
@@ -566,9 +639,9 @@ RSpec.describe Capybara::RSpecMatchers do
     end
 
     it "gives proper description" do
-      expect(have_checked_field('it is checked').description).to eq("have field \"it is checked\"")
+      expect(have_checked_field('it is checked').description).to eq("have field \"it is checked\" that is checked")
     end
-
+    
     context "with should" do
       it "passes if there is such a field and it is checked" do
         expect(html).to have_checked_field('it is checked')
@@ -602,6 +675,10 @@ RSpec.describe Capybara::RSpecMatchers do
         expect(html).not_to have_checked_field('no such field')
       end
     end
+    
+    it "supports compounding" do
+      expect(html).to have_checked_field('not this one').or have_checked_field('it is checked')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_unchecked_field matcher" do
@@ -611,7 +688,7 @@ RSpec.describe Capybara::RSpecMatchers do
     end
 
     it "gives proper description" do
-      expect(have_unchecked_field('unchecked field').description).to eq("have field \"unchecked field\"")
+      expect(have_unchecked_field('unchecked field').description).to eq("have field \"unchecked field\" that is not checked")
     end
 
     context "with should" do
@@ -647,6 +724,10 @@ RSpec.describe Capybara::RSpecMatchers do
         expect(html).not_to have_unchecked_field('no such field')
       end
     end
+    
+    it "supports compounding" do
+      expect(html).to have_unchecked_field('it is checked').or have_unchecked_field('unchecked field')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_select matcher" do
@@ -655,6 +736,10 @@ RSpec.describe Capybara::RSpecMatchers do
     it "gives proper description" do
       expect(have_select('Select Box').description).to eq("have select box \"Select Box\"")
     end
+    
+    it "gives proper description for a given selected value" do
+      expect(have_select('Select Box', selected: 'some value').description).to eq("have select box \"Select Box\" with \"some value\" selected")
+    end
 
     it "passes if there is such a select" do
       expect(html).to have_select('Select Box')
@@ -665,6 +750,10 @@ RSpec.describe Capybara::RSpecMatchers do
         expect(html).to have_select('No such Select box')
       end.to raise_error(/expected to find select box "No such Select box"/)
     end
+    
+    it "supports compounding" do
+      expect(html).to have_select('Not this one').or have_select('Select Box')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 
   describe "have_table matcher" do
@@ -683,5 +772,9 @@ RSpec.describe Capybara::RSpecMatchers do
         expect(html).to have_table('No such Table')
       end.to raise_error(/expected to find table "No such Table"/)
     end
+    
+    it "supports compounding" do
+      expect(html).to have_table('nope').or have_table('Lovely table')
+    end if RSpec::Version::STRING.to_f >= 3.0
   end
 end

data/spec/selenium_spec.rb

@@ -63,6 +63,16 @@ RSpec.describe Capybara::Session do
         expect($?.exitstatus).to be 0
       end
     end
+    
+    describe "#accept_alert" do
+      it "supports a blockless mode" do
+        @session.visit('/with_js')
+        @session.click_link('Open alert')
+        expect(@session.driver.browser.switch_to.alert).to be_kind_of Selenium::WebDriver::Alert
+        @session.accept_alert
+        expect{@session.driver.browser.switch_to.alert}.to raise_error("No alert is present")
+      end
+    end
   end
 end
 
@@ -81,4 +91,3 @@ RSpec.describe Capybara::Selenium::Driver do
   end
 end
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -227,10 +227,14 @@ files:
 - lib/capybara/node/actions.rb
 - lib/capybara/node/base.rb
 - lib/capybara/node/document.rb
+- lib/capybara/node/document_matchers.rb
 - lib/capybara/node/element.rb
 - lib/capybara/node/finders.rb
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.rb
+- lib/capybara/queries/base_query.rb
+- lib/capybara/queries/text_query.rb
+- lib/capybara/queries/title_query.rb
 - lib/capybara/query.rb
 - lib/capybara/rack_test/browser.rb
 - lib/capybara/rack_test/css_handlers.rb
@@ -253,8 +257,13 @@ files:
 - lib/capybara/spec/public/jquery-ui.js
 - lib/capybara/spec/public/jquery.js
 - lib/capybara/spec/public/test.js
+- lib/capybara/spec/session/accept_alert_spec.rb
+- lib/capybara/spec/session/accept_confirm_spec.rb
+- lib/capybara/spec/session/accept_prompt_spec.rb
 - lib/capybara/spec/session/all_spec.rb
 - lib/capybara/spec/session/assert_selector.rb
+- lib/capybara/spec/session/assert_text.rb
+- lib/capybara/spec/session/assert_title.rb
 - lib/capybara/spec/session/attach_file_spec.rb
 - lib/capybara/spec/session/body_spec.rb
 - lib/capybara/spec/session/check_spec.rb
@@ -264,6 +273,8 @@ files:
 - lib/capybara/spec/session/click_link_spec.rb
 - lib/capybara/spec/session/current_scope_spec.rb
 - lib/capybara/spec/session/current_url_spec.rb
+- lib/capybara/spec/session/dismiss_confirm_spec.rb
+- lib/capybara/spec/session/dismiss_prompt_spec.rb
 - lib/capybara/spec/session/evaluate_script_spec.rb
 - lib/capybara/spec/session/execute_script_spec.rb
 - lib/capybara/spec/session/fill_in_spec.rb