capybara 2.14.3 → 2.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02dc31ca457043556ca668229aa313e59b198363
-  data.tar.gz: 13528d46037d76c4deabfdfd57d2da09e45b7f01
+  metadata.gz: 987f25342ad56a2981f48c4cee5894c01601450e
+  data.tar.gz: c9c97e994be43ebde7ec94cd8cebcfcec74c2ad3
 SHA512:
-  metadata.gz: 0a98665ce0452986b3f6a138b29a53fadaf3f2fc0ada1332005062845585ced403c0ea352facaf34c8b80915581e3122b51fa53b158f7348d05afef47ca4a17e
-  data.tar.gz: 2a24b9da7fda6168106dedc1d621ab9184fa16ec391003199c85a3468b17535de939e9a044c715ac1c42b4cc9d907f41f3db8af808ffbb1256bb3d5a06c078f6
+  metadata.gz: 217162eb0ad144e6617666bc998f3f2dda3ccbd93b57f787762314f58203a53dcad4e2d78f9f760807cea15b597c3b6f3aa7533da4fe841af2aab73b211e222d
+  data.tar.gz: 59aef00f83df73f98197550976838d7b9e8690d89756a070497c3429a705b78d82b5807a89a24eebae0513277cf38bf23cf155bb32e1c6e4da17fa3b58709dee

data/History.md

@@ -1,3 +1,11 @@
+# Version 2.14.4
+
+Release date: 2017-06-27
+
+### Fixed
+
+* Fix retrieval of session_options for HaveSelector matcher descriptions - Issue #1883
+
 # Version 2.14.3
 
 Release date: 2017-06-15

data/lib/capybara/rspec/matchers.rb

@@ -45,7 +45,13 @@ module Capybara
 
       def session_options
         @context_el ||= nil
-        @context_el ? @context_el.session_options : Capybara.session_options
+        if @context_el.respond_to? :session_options
+          @context_el.session_options
+        elsif @context_el.respond_to? :current_scope
+          @context_el.current_scope.session_options
+        else
+          Capybara.session_options
+        end
       end
     end
 

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

@@ -39,14 +39,14 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session).to have_no_selector :xpath, "/html/body/*", wait: false
   end
 
-  it "handles modals during unload" do
+  it "handles modals during unload", requires: [:modals] do
     @session.visit('/with_unload_alert')
     expect(@session).to have_selector(:css, 'div')
     expect { @session.reset_session! }.not_to raise_error
     expect(@session).to have_no_selector :xpath, "/html/body/*", wait: false
   end
 
-  it "handles already open modals" do
+  it "handles already open modals", requires: [:modals] do
     @session.visit('/with_unload_alert')
     @session.click_link('Go away')
     expect { @session.reset_session! }.not_to raise_error

data/lib/capybara/version.rb

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

data/spec/rspec_matchers_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe 'Capybara RSpec Matchers', :type => :feature do
+  context "after called on session" do
+    it "HaveSelector should allow getting a description of the matcher" do
+      visit('/with_html')
+      matcher = have_selector(:css, 'h2.head', minimum: 3)
+      expect(page).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+
+    it "HaveText should allow getting a description" do
+      visit('/with_html')
+      matcher = have_text("Lorem")
+      expect(page).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+  end
+
+  context "after called on element" do
+    it "HaveSelector should allow getting a description" do
+      visit('/with_html')
+      el = find(:css, '#first')
+      matcher = have_selector(:css, 'a#foo')
+      expect(el).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+
+    it "MatchSelector should allow getting a description" do
+      visit('/with_html')
+      el = find(:css, '#first')
+      matcher = match_selector(:css, '#first')
+      expect(el).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+
+    it "HaveText should allow getting a description" do
+      visit('/with_html')
+      el = find(:css, '#first')
+      matcher = have_text("Lorem")
+      expect(el).to matcher
+      expect { matcher.description }.not_to raise_error
+    end
+  end
+end

data/spec/selenium_spec_chrome.rb

@@ -3,25 +3,22 @@ require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
 
+chrome_options = {
+  browser: :chrome,
+  options: ::Selenium::WebDriver::Chrome::Options.new(args: ENV['TRAVIS'] ? ['no-sandbox' ] : [])
+}
+
+if ENV['CAPYBARA_CHROME_HEADLESS']
+  chrome_options[:options].args << 'headless'
+  Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
+end
+
 Capybara.register_driver :selenium_chrome do |app|
-  args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
-  if ENV['CAPYBARA_CHROME_HEADLESS']
-    args << 'headless'
-    Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
-  end
-  Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
+  Capybara::Selenium::Driver.new(app, chrome_options)
 end
 
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
-  args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
-  if ENV['CAPYBARA_CHROME_HEADLESS']
-    args << 'headless'
-    Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
-  end
-  Capybara::Selenium::Driver.new(app, :browser => :chrome,
-                                      :args => args,
-                                      clear_local_storage: true,
-                                      clear_session_storage: true)
+  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
 end
 
 module TestSessions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 2.14.4
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -467,6 +467,7 @@ files:
 - spec/rspec/scenarios_spec.rb
 - spec/rspec/shared_spec_matchers.rb
 - spec/rspec/views_spec.rb
+- spec/rspec_matchers_spec.rb
 - spec/rspec_spec.rb
 - spec/selector_spec.rb
 - spec/selenium_spec_chrome.rb