capybara 2.4.4 → 2.5.0

data/spec/dsl_spec.rb

@@ -11,6 +11,7 @@ Capybara::SpecHelper.run_specs TestClass.new, "DSL", :capybara_skip => [
   :screenshot,
   :frames,
   :windows,
+  :send_keys,
   :server,
   :hover,
   :about_scheme,
@@ -115,20 +116,20 @@ RSpec.describe Capybara::DSL do
 
   describe '#using_wait_time' do
     before do
-      @previous_wait_time = Capybara.default_wait_time
+      @previous_wait_time = Capybara.default_max_wait_time
     end
 
     after do
-      Capybara.default_wait_time = @previous_wait_time
+      Capybara.default_max_wait_time = @previous_wait_time
     end
 
     it "should switch the wait time and switch it back" do
       in_block = nil
       Capybara.using_wait_time 6 do
-        in_block = Capybara.default_wait_time
+        in_block = Capybara.default_max_wait_time
       end
       expect(in_block).to eq(6)
-      expect(Capybara.default_wait_time).to eq(@previous_wait_time)
+      expect(Capybara.default_max_wait_time).to eq(@previous_wait_time)
     end
 
     it "should ensure wait time is reset" do
@@ -136,8 +137,8 @@ RSpec.describe Capybara::DSL do
         Capybara.using_wait_time 6 do
           raise "hell"
         end
-      end.to raise_error
-      expect(Capybara.default_wait_time).to eq(@previous_wait_time)
+      end.to raise_error(RuntimeError, "hell")
+      expect(Capybara.default_max_wait_time).to eq(@previous_wait_time)
     end
   end
 
@@ -218,6 +219,17 @@ RSpec.describe Capybara::DSL do
       Capybara.using_session(:administrator) { called = true }
       expect(called).to eq(true)
     end
+
+    it "should be nestable" do
+      Capybara.using_session(:outer) do
+        expect(Capybara.session_name).to eq(:outer)
+        Capybara.using_session(:inner) do
+          expect(Capybara.session_name).to eq(:inner)
+        end
+        expect(Capybara.session_name).to eq(:outer)
+      end
+      expect(Capybara.session_name).to eq(:default)
+    end
   end
 
   describe "#session_name" do

data/spec/rack_test_spec.rb

@@ -10,6 +10,7 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :capybara_ski
   :screenshot,
   :frames,
   :windows,
+  :send_keys,
   :server,
   :hover,
   :about_scheme,
@@ -59,7 +60,7 @@ 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)
@@ -120,7 +121,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
       @driver.visit('/redirect')
       expect(@driver.response.header['Location']).to be_nil
-      expect(@driver.browser.current_url).to match %r{/landed$}
+      expect(@driver.current_url).to match %r{/landed$}
     end
 
     it "is possible to not follow redirects" do
@@ -128,7 +129,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
       @driver.visit('/redirect')
       expect(@driver.response.header['Location']).to match %r{/redirect_again$}
-      expect(@driver.browser.current_url).to match %r{/redirect$}
+      expect(@driver.current_url).to match %r{/redirect$}
     end
   end
 
@@ -176,9 +177,9 @@ module CSSHandlerIncludeTester
 end
 include CSSHandlerIncludeTester
 
-RSpec.describe  Capybara::RackTest::CSSHandlers do  
+RSpec.describe  Capybara::RackTest::CSSHandlers do
   it "should not be extended by global includes" do
     expect(Capybara::RackTest::CSSHandlers.new).not_to respond_to(:dont_extend_css_handler)
   end
 end
-  
+

data/spec/rspec/matchers_spec.rb

@@ -74,7 +74,7 @@ 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')
@@ -141,7 +141,7 @@ 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')
@@ -247,7 +247,7 @@ 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')
@@ -336,7 +336,7 @@ 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')
@@ -470,7 +470,7 @@ 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')
@@ -493,7 +493,7 @@ 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')
@@ -559,12 +559,58 @@ RSpec.describe Capybara::RSpecMatchers do
         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_current_path matcher" do
+    it "gives proper description" do
+      expect(have_current_path('http://www.example.com').description).to eq("have current path \"http://www.example.com\"")
+    end
+
+    context "on a page or node" do
+      it "passes if there is such a current path" do
+        visit('/with_js')
+        expect(page).to have_current_path('/with_js')
+      end
+
+      it "fails if there is no such current_path" do
+        visit('/with_js')
+        expect do
+          expect(page).to have_current_path('/not_with_js')
+        end.to raise_error('expected "/with_js" to equal "/not_with_js"')
+      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 page")
+          using_wait_time 0 do
+            expect(@session).to have_current_path('/with_html', wait: 1)
+          end
+        end
+
+        it "doesn't wait if wait time is less than timeout" do
+          @session.click_link("Change page")
+          using_wait_time 0 do
+            expect(@session).not_to have_current_path('/with_html')
+          end
+        end
+      end
+    end
+
+    it "supports compounding" do
+      visit('/with_html')
+      expect(page).to have_current_path('/not_with_html').or have_current_path('/with_html')
+    end if RSpec::Version::STRING.to_f >= 3.0
+  end
+
   describe "have_button matcher" do
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 
@@ -581,7 +627,7 @@ 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
@@ -597,7 +643,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
@@ -626,7 +672,7 @@ 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
@@ -641,7 +687,7 @@ RSpec.describe Capybara::RSpecMatchers do
     it "gives proper description" do
       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')
@@ -675,7 +721,7 @@ 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
@@ -724,7 +770,7 @@ 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
@@ -736,7 +782,7 @@ 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
@@ -750,7 +796,7 @@ 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
@@ -772,7 +818,7 @@ 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

data/spec/rspec/views_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+RSpec.describe "capybara/rspec", type: :view do
+  it "allows matchers to be used on strings" do
+    expect(%{<h1>Test header</h1>}).to have_css("h1", text: "Test header")
+  end
+end

data/spec/selenium_spec.rb

@@ -63,16 +63,51 @@ 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
+
+    context "#fill_in with { :clear => :backspace } fill_option", :requires => [:js] do
+      it 'should fill in a field, replacing an existing value' do
+        @session.visit('/form')
+        @session.fill_in('form_first_name', :with => 'Harry',
+                          fill_options: { clear: :backspace} )
+        expect(@session.find(:fillable_field, 'form_first_name').value).to eq('Harry')
+      end
+
+      it 'should only trigger onchange once' do
+        @session.visit('/with_js')
+        @session.fill_in('with_change_event', :with => 'some value',
+                         :fill_options => { :clear => :backspace })
+        # click outside the field to trigger the change event
+        @session.find(:css, 'body').click
+        expect(@session.find(:css, '.change_event_triggered', :match => :one)).to have_text 'some value'
+      end
+
+      it 'should trigger change when clearing field' do
+        @session.visit('/with_js')
+        @session.fill_in('with_change_event', :with => '',
+                         :fill_options => { :clear => :backspace })
+        # click outside the field to trigger the change event
+        @session.find(:css, 'body').click
+        expect(@session).to have_selector(:css, '.change_event_triggered', :match => :one)
+      end
+    end
+
+    describe "#path" do
+      it "returns xpath" do
+        # this is here because it is testing for an XPath that is specific to the algorithm used in the selenium driver
+        @session.visit('/path')
+        element = @session.find(:link, 'Second Link')
+        expect(element.path).to eq('/html/body/div[2]/a[1]')
+      end
+    end
   end
 end
 
@@ -80,7 +115,7 @@ RSpec.describe Capybara::Selenium::Driver do
   before do
     @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
   end
-  
+
   describe '#quit' do
     it "should reset browser when quit" do
       expect(@driver.browser).to be

data/spec/selenium_spec_chrome.rb

@@ -1,21 +1,17 @@
 require 'spec_helper'
+require 'selenium-webdriver'
 
 Capybara.register_driver :selenium_chrome do |app|
   args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
   Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
 end
 
-class ChromeTestApp < TestApp
-  # Object.id is different from the TestApp used in firefox session so 
-  # a new Capybar::Server instance will get launched for chrome testing
-end
-
 module TestSessions
-  Chrome = Capybara::Session.new(:selenium_chrome, ChromeTestApp)
+  Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
 end
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :capybara_skip => [
   :response_headers,
   :status_code,
-  :trigger  
+  :trigger
   ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -233,6 +233,7 @@ files:
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.rb
 - lib/capybara/queries/base_query.rb
+- lib/capybara/queries/current_path_query.rb
 - lib/capybara/queries/text_query.rb
 - lib/capybara/queries/title_query.rb
 - lib/capybara/query.rb
@@ -251,6 +252,7 @@ files:
 - lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
 - lib/capybara/session.rb
+- lib/capybara/session/matchers.rb
 - lib/capybara/spec/fixtures/another_test_file.txt
 - lib/capybara/spec/fixtures/capybara.jpg
 - lib/capybara/spec/fixtures/test_file.txt
@@ -261,6 +263,7 @@ files:
 - 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_current_path.rb
 - lib/capybara/spec/session/assert_selector.rb
 - lib/capybara/spec/session/assert_text.rb
 - lib/capybara/spec/session/assert_title.rb
@@ -288,6 +291,7 @@ files:
 - lib/capybara/spec/session/go_forward_spec.rb
 - lib/capybara/spec/session/has_button_spec.rb
 - lib/capybara/spec/session/has_css_spec.rb
+- lib/capybara/spec/session/has_current_path_spec.rb
 - lib/capybara/spec/session/has_field_spec.rb
 - lib/capybara/spec/session/has_link_spec.rb
 - lib/capybara/spec/session/has_select_spec.rb
@@ -301,8 +305,10 @@ files:
 - lib/capybara/spec/session/node_spec.rb
 - lib/capybara/spec/session/reset_session_spec.rb
 - lib/capybara/spec/session/response_code.rb
+- lib/capybara/spec/session/save_and_open_page_spec.rb
 - lib/capybara/spec/session/save_and_open_screenshot_spec.rb
 - lib/capybara/spec/session/save_page_spec.rb
+- lib/capybara/spec/session/save_screenshot_spec.rb
 - lib/capybara/spec/session/screenshot_spec.rb
 - lib/capybara/spec/session/select_spec.rb
 - lib/capybara/spec/session/source_spec.rb
@@ -332,6 +338,7 @@ files:
 - lib/capybara/spec/views/frame_two.erb
 - lib/capybara/spec/views/header_links.erb
 - lib/capybara/spec/views/host_links.erb
+- lib/capybara/spec/views/path.erb
 - lib/capybara/spec/views/popup_one.erb
 - lib/capybara/spec/views/popup_two.erb
 - lib/capybara/spec/views/postback.erb
@@ -358,6 +365,7 @@ files:
 - spec/result_spec.rb
 - spec/rspec/features_spec.rb
 - spec/rspec/matchers_spec.rb
+- spec/rspec/views_spec.rb
 - spec/rspec_spec.rb
 - spec/selenium_spec.rb
 - spec/selenium_spec_chrome.rb
@@ -382,10 +390,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: capybara
-rubygems_version: 2.4.2
+rubyforge_project: 
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,
   such as Rails, Sinatra or Merb
 test_files: []
+has_rdoc: