capybara 2.10.2 → 2.11.0

data/lib/capybara/spec/session/element/matches_selector_spec.rb

@@ -52,6 +52,8 @@ Capybara::SpecHelper.spec '#match_selector?' do
   it 'should accept a custom filter block' do
     @session.visit('/form')
     cbox = @session.find(:css, '#form_pets_dog')
+    expect(cbox).to match_selector(:checkbox){ |node| node[:id] == "form_pets_dog"}
+    expect(cbox).not_to match_selector(:checkbox){ |node| node[:id] != "form_pets_dog"}
     expect(cbox.matches_selector?(:checkbox){ |node| node[:id] == "form_pets_dog"}).to be true
     expect(cbox.matches_selector?(:checkbox){ |node| node[:id] != "form_pets_dog"}).to be false
   end

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

@@ -181,4 +181,9 @@ Capybara::SpecHelper.spec "#fill_in" do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  it "should return the element filled in" do
+    el = @session.find(:fillable_field, 'form_first_name')
+    expect(@session.fill_in('form_first_name', with: 'Harry')).to eq el
+  end
 end

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

@@ -320,7 +320,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error when there is a single inexact matches" do
           expect do
-            result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is no match" do

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

@@ -19,6 +19,11 @@ Capybara::SpecHelper.spec '#first' do
     expect(@session.first(@xpath).value).to eq('John')
   end
 
+  it "should warn when unused parameters are passed" do
+    expect_any_instance_of(Kernel).to receive(:warn).with(/Unused parameters passed.*unused text/)
+    @session.first(:css, '.header h2', 'unused text')
+  end
+
   context "with css selectors" do
     it "should find the first element using the given selector" do
       expect(@session.first(:css, 'h1').text).to eq('This is a test')
@@ -48,21 +53,26 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should find nodes regardless of whether they are invisible when false" do
       expect(@session.first(:css, "a#invisible", visible: false)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: false, text: 'hidden link')).not_to be_nil
       expect(@session.first(:css, "a#visible", visible: false)).not_to be_nil
     end
 
     it "should find nodes regardless of whether they are invisible when :all" do
       expect(@session.first(:css, "a#invisible", visible: :all)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :all, text: 'hidden link')).not_to be_nil
       expect(@session.first(:css, "a#visible", visible: :all)).not_to be_nil
     end
 
     it "should find only hidden nodes when :hidden" do
       expect(@session.first(:css, "a#invisible", visible: :hidden)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'hidden link')).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')).to be_nil
       expect(@session.first(:css, "a#visible", visible: :hidden)).to be_nil
     end
 
     it "should find only visible nodes when :visible" do
       expect(@session.first(:css, "a#invisible", visible: :visible)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :visible, text: 'hidden link')).to be_nil
       expect(@session.first(:css, "a#visible", visible: :visible)).not_to be_nil
     end
 

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

@@ -29,6 +29,10 @@ Capybara::SpecHelper.spec '#has_selector?' do
     end
   end
 
+  it "should accept a filter block" do
+    expect(@session).to have_selector(:css, "a", count: 1) { |el| el[:id] == "foo" }
+  end
+
   context "with count" do
     it "should be true if the content is on the page the given number of times" do
       expect(@session).to have_selector("//p", count: 3)
@@ -105,6 +109,13 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
     end
   end
 
+  it "should accept a filter block" do
+    if !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
+      skip "RSpec < 3 doesn't pass the block along to the matcher for the Builtin::Has matcher"
+    end
+    expect(@session).to have_no_selector(:css, "a#foo") { |el| el[:id] != "foo" }
+  end
+
   context "with count" do
     it "should be false if the content is on the page the given number of times" do
       expect(@session).not_to have_no_selector("//p", count: 3)

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

@@ -425,18 +425,18 @@ Capybara::SpecHelper.spec "node" do
         @session.find(:css, 'span')
       end.to raise_error(TestApp::TestAppError) do |e|
         expect(e.cause).to be_a Capybara::CapybaraError
-        expect(e.cause.message).to match /Your application server raised an error/
+        expect(e.cause.message).to match(/Your application server raised an error/)
       end
     end
 
-    it "sets an explanatory exception as the cause of server exceptions with errors with initializers", requires: [:server, :js], twtw: true do
+    it "sets an explanatory exception as the cause of server exceptions with errors with initializers", requires: [:server, :js] do
       skip "This version of ruby doesn't support exception causes" unless Exception.instance_methods.include? :cause
       quietly { @session.visit("/other_error") }
       expect do
         @session.find(:css, 'span')
       end.to raise_error(TestApp::TestAppOtherError) do |e|
         expect(e.cause).to be_a Capybara::CapybaraError
-        expect(e.cause.message).to match /Your application server raised an error/
+        expect(e.cause.message).to match(/Your application server raised an error/)
       end
     end
   end

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

@@ -35,7 +35,7 @@ Capybara::SpecHelper.spec '#text' do
     Capybara.ignore_hidden_elements = false
     expect(@session.find(:id, "hidden-text").text).to eq('Some of this text is')
   end
-  
+
   it "ignores invisible text if ancestor is invisible" do
     @session.visit('/with_html')
     expect(@session.find(:id, "hidden_via_ancestor", visible: false).text).to eq('')
@@ -52,8 +52,7 @@ Capybara::SpecHelper.spec '#text' do
 
   it "should strip whitespace" do
     @session.visit('/with_html')
-    n = @session.find(:css, '#second')
-    expect(@session.find(:css, '#second').text).to match \
-      /\ADuis aute .* text with whitespace .* est laborum\.\z/
+    @session.find(:css, '#second')
+    expect(@session.find(:css, '#second').text).to match(/\ADuis aute .* text with whitespace .* est laborum\.\z/)
   end
 end

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

@@ -97,7 +97,9 @@
     <p>
       <input id="disable-on-click"/>
     </p>
-
+    <p>
+      <input id="set-storage"/>
+    </p>
     <p>
       <a href="#" id="delayed-page-change">Change page</a>
       <a href="/with_html?options[]=things">Non-escaped query options</a>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.10.2'
+  VERSION = '2.11.0'
 end

data/lib/capybara/window.rb

@@ -85,7 +85,7 @@ module Capybara
     # @param height [String]  the new window height in pixels
     #
     def resize_to(width, height)
-      @driver.resize_window_to(handle, width, height)
+      wait_for_stable_size { @driver.resize_window_to(handle, width, height) }
     end
 
     ##
@@ -97,7 +97,7 @@ module Capybara
     # @macro about_current
     #
     def maximize
-      @driver.maximize_window(handle)
+      wait_for_stable_size { @driver.maximize_window(handle) }
     end
 
     def eql?(other)
@@ -115,6 +115,22 @@ module Capybara
 
     private
 
+    def wait_for_stable_size(seconds=Capybara.default_max_wait_time)
+      res = yield if block_given?
+      prev_size = size
+      start_time = Capybara::Helpers.monotonic_time
+      begin
+        sleep 0.05
+        cur_size = size
+        return res if cur_size == prev_size
+        prev_size = cur_size
+      end while (Capybara::Helpers.monotonic_time - start_time) < seconds
+      #TODO raise error in 3.0
+      #raise Capybara::WindowError, "Window size not stable."
+      warn "Window size not stable in #{seconds} seconds.  This will raise an exception in a future version of Capybara"
+      return res
+    end
+
     def raise_unless_current(what)
       unless current?
         raise Capybara::WindowError, "#{what} not current window is not possible."

data/spec/basic_node_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Capybara do
 
     it "allows using custom matchers" do
       Capybara.add_selector :lifeform do
-        xpath { |name| "//option[contains(.,'#{name}')]" }
+        xpath { |name| ".//option[contains(.,'#{name}')]" }
       end
       expect(string).to have_selector(:id, "page")
       expect(string).not_to have_selector(:id, 'does-not-exist')

data/spec/capybara_spec.rb

@@ -46,11 +46,14 @@ RSpec.describe Capybara do
     end
 
     it "should add a new server" do
+      skip "JRuby fails this because of path issues to geckodriver I think. Its tested in other runs - not worth figuring out at this time" if RUBY_PLATFORM == 'java'
+
+      require 'rack/handler/webrick'
       Capybara.register_server :blob do |app, port, host|
         Rack::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0))
       end
       Capybara.server = :blob
-      session = Capybara::Session.new(:selenium, TestApp.dup)
+      session = Capybara::Session.new(:selenium, TestApp.new)
       session.visit('/')
       expect(session.body).to include("Hello world!")
     end

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 require 'spec_helper'
+require 'selenium-webdriver'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a non-zero exit status" do
-    browser = Capybara::Selenium::Driver.new(TestApp, browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym).browser
+    options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
+    options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false) if ENV['LEGACY_FIREFOX']
+    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
     expect(true).to eq(false)
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 require 'spec_helper'
+require 'selenium-webdriver'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a zero exit status" do
-    browser = Capybara::Selenium::Driver.new(TestApp, browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym).browser
+    options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
+    options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false) if ENV['LEGACY_FIREFOX']
+    browser = Capybara::Selenium::Driver.new(TestApp, options ).browser
     expect(true).to eq(true)
   end
 end

data/spec/result_spec.rb

@@ -66,8 +66,8 @@ RSpec.describe Capybara::Result do
 
   it 'supports all modes of []' do
     expect(result[1].text).to eq 'Beta'
-    expect(result[0,2].map &:text).to eq ['Alpha', 'Beta']
-    expect(result[1..3].map &:text).to eq ['Beta', 'Gamma', 'Delta']
+    expect(result[0,2].map(&:text)).to eq ['Alpha', 'Beta']
+    expect(result[1..3].map(&:text)).to eq ['Beta', 'Gamma', 'Delta']
     expect(result[-1].text).to eq 'Delta'
   end
 
@@ -92,4 +92,30 @@ RSpec.describe Capybara::Result do
     result.to_a
     expect(result.instance_variable_get('@result_cache').size).to eq 4
   end
+
+  context '#each' do
+    it 'lazily evaluates' do
+      skip 'JRuby has an issue with lazy enumerator next evaluation' if RUBY_PLATFORM == 'java'
+      results=[]
+      result.each do |el|
+        results << el
+        expect(result.instance_variable_get('@result_cache').size).to eq results.size
+      end
+
+      expect(results.size).to eq 4
+    end
+
+    context 'without a block' do
+      it 'returns an iterator' do
+        expect(result.each).to be_a(Enumerator)
+      end
+
+      it 'lazily evaluates' do
+        skip 'JRuby has an issue with lazy enumerator next evaluation' if RUBY_PLATFORM == 'java'
+        result.each.with_index do |el, idx|
+          expect(result.instance_variable_get('@result_cache').size).to eq(idx+1)  # 0 indexing
+        end
+      end
+    end
+  end
 end

data/spec/rspec/{matchers_spec.rb → shared_spec_matchers.rb}

@@ -3,7 +3,8 @@ require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 
-RSpec.describe Capybara::RSpecMatchers do
+RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
+
   include Capybara::DSL
   include Capybara::RSpecMatchers
 
@@ -541,7 +542,7 @@ RSpec.describe Capybara::RSpecMatchers do
 
       context 'with wait' do
         before(:each) do
-          @session = TestSessions::Selenium
+          @session = session
           @session.visit('/with_js')
         end
 
@@ -586,7 +587,7 @@ RSpec.describe Capybara::RSpecMatchers do
 
       context 'with wait' do
         before(:each) do
-          @session = TestSessions::Selenium
+          @session = session
           @session.visit('/with_js')
         end
 

data/spec/selector_spec.rb

@@ -102,7 +102,7 @@ RSpec.describe Capybara do
             table: ".//table"
           }
           selectors.each do |selector, xpath|
-            results = string.all(selector,nil).to_a.map &:native
+            results = string.all(selector,nil).to_a.map(&:native)
             expect(results.size).to be > 0
             expect(results).to eq string.all(:xpath, xpath).to_a.map(&:native)
           end

data/spec/selenium_spec_chrome.rb

@@ -8,16 +8,47 @@ Capybara.register_driver :selenium_chrome do |app|
   Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
 end
 
+Capybara.register_driver :selenium_chrome_clear_storage do |app|
+  args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
+  Capybara::Selenium::Driver.new(app, :browser => :chrome,
+                                      :args => args,
+                                      clear_local_storage: true,
+                                      clear_session_storage: true)
+end
+
 module TestSessions
   Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: [
-  :response_headers,
-  :status_code,
-  :trigger
-  ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')
+skipped_tests = [:response_headers, :status_code, :trigger]
+skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+
+Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do
   include_examples  "Capybara::Session", TestSessions::Chrome, :selenium_chrome
+
+  context "storage" do
+    describe "#reset!" do
+      it "does not clear either storage by default" do
+        @session = TestSessions::Chrome
+        @session.visit('/with_js')
+        @session.find(:css, '#set-storage').click
+        @session.reset!
+        @session.visit('/with_js')
+        expect(@session.driver.browser.local_storage.keys).not_to be_empty
+        expect(@session.driver.browser.session_storage.keys).not_to be_empty
+      end
+
+      it "clears storage when set" do
+        @session = Capybara::Session.new(:selenium_chrome_clear_storage, TestApp)
+        @session.visit('/with_js')
+        @session.find(:css, '#set-storage').click
+        @session.reset!
+        @session.visit('/with_js')
+        expect(@session.driver.browser.local_storage.keys).to be_empty
+        expect(@session.driver.browser.session_storage.keys).to be_empty
+      end
+    end
+  end
 end

data/spec/selenium_spec_firefox.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :selenium_firefox do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false)
+  )
+end
+
+Capybara.register_driver :selenium_firefox_cant_clear_storage do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false),
+    clear_local_storage: true,
+    clear_session_storage: true
+  )
+end
+
+module TestSessions
+  Selenium = Capybara::Session.new(:selenium_firefox, TestApp)
+end
+
+skipped_tests = [
+  :response_headers,
+  :status_code,
+  :trigger
+]
+skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", capybara_skip: skipped_tests
+
+RSpec.describe "Capybara::Session with legacy firefox" do
+  include_examples  "Capybara::Session", TestSessions::Selenium, :selenium_firefox
+  include_examples  Capybara::RSpecMatchers, TestSessions::Selenium, :selenium_firefox
+
+  context "storage" do
+    it "warns storage clearing isn't available" do
+      @session = Capybara::Session.new(:selenium_firefox_cant_clear_storage, TestApp)
+      expect_any_instance_of(Kernel).to receive(:warn).with('sessionStorage clear requested but is not available for this driver')
+      expect_any_instance_of(Kernel).to receive(:warn).with('localStorage clear requested but is not available for this driver')
+      @session.visit('/')
+      @session.reset!
+    end
+  end
+end
+
+RSpec.describe Capybara::Selenium::Driver do
+  before do
+    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox, desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false))
+  end
+
+  describe '#quit' do
+    it "should reset browser when quit" do
+      expect(@driver.browser).to be
+      @driver.quit
+      #access instance variable directly so we don't create a new browser instance
+      expect(@driver.instance_variable_get(:@browser)).to be_nil
+    end
+  end
+end
+