capybara 2.13.0 → 2.14.0

data/spec/per_session_config_spec.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'capybara/dsl'
+
+RSpec.describe Capybara::SessionConfig do
+  describe "threadsafe" do
+    it "defaults to global session options" do
+      Capybara.threadsafe = true
+      session = Capybara::Session.new(:rack_test, TestApp)
+      [:default_host, :app_host, :save_and_open_page_path,
+       :always_include_port, :run_server, :default_selector, :default_max_wait_time, :ignore_hidden_elements,
+       :automatic_reload, :match, :exact, :raise_server_errors, :visible_text_only, :wait_on_first_by_default,
+       :automatic_label_click, :enable_aria_label,
+       :save_path, :exact_options, :asset_host].each do |m|
+         expect(session.config.public_send(m)).to eq Capybara.public_send(m)
+       end
+    end
+
+    it "doesn't change global session when changed" do
+      Capybara.threadsafe = true
+      host = "http://my.example.com"
+      session = Capybara::Session.new(:rack_test, TestApp) do |config|
+        config.default_host = host
+        config.automatic_label_click = !config.automatic_label_click
+        config.server_errors << ArgumentError
+      end
+      expect(Capybara.default_host).not_to eq host
+      expect(session.config.default_host).to eq host
+      expect(Capybara.automatic_label_click).not_to eq session.config.automatic_label_click
+      expect(Capybara.server_errors).not_to eq session.config.server_errors
+    end
+
+    it "doesn't allow session configuration block when false" do
+      Capybara.threadsafe = false
+      expect do
+        Capybara::Session.new(:rack_test, TestApp) { |config| }
+      end.to raise_error "A configuration block is only accepted when Capybara.threadsafe == true"
+    end
+
+    it "doesn't allow session config when false" do
+      Capybara.threadsafe = false
+      session = Capybara::Session.new(:rack_test, TestApp)
+      expect { session.config.default_selector = :title }.to raise_error /Per session settings are only supported when Capybara.threadsafe == true/
+      expect do
+        session.configure do |config|
+          config.exact = true
+        end
+      end.to raise_error /Session configuration is only supported when Capybara.threadsafe == true/
+    end
+
+    it "uses the config from the session" do
+      Capybara.threadsafe = true
+      session = Capybara::Session.new(:rack_test, TestApp) do |config|
+        config.default_selector = :link
+      end
+      session.visit('/with_html')
+      expect(session.find('foo').tag_name).to eq 'a'
+    end
+
+    it "won't change threadsafe once a session is created" do
+      Capybara.threadsafe = true
+      Capybara.threadsafe = false
+      session = Capybara::Session.new(:rack_test, TestApp)
+      expect { Capybara.threadsafe = true }.to raise_error /Threadsafe setting cannot be changed once a session is created/
+    end
+  end
+end

data/spec/rspec/shared_spec_matchers.rb

@@ -555,8 +555,8 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
         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')
+          using_wait_time 3 do
+            expect(@session).not_to have_title('changed title', wait: 0)
           end
         end
       end

data/spec/rspec/views_spec.rb

@@ -5,4 +5,8 @@ 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
+
+  it "doesn't include RSpecMatcherProxies" do
+    expect(self.class.ancestors).not_to include(Capybara::RSpecMatcherProxies)
+  end
 end

data/spec/rspec_spec.rb

@@ -7,6 +7,10 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     expect(page.body).to include('Another World')
   end
 
+  it "should include RSpec matcher proxies" do
+    expect(self.class.ancestors).to include Capybara::RSpecMatcherProxies
+  end
+
   context "resetting session" do
     it "sets a cookie in one example..." do
       visit('/set_cookie')
@@ -36,6 +40,79 @@ RSpec.describe 'capybara/rspec', :type => :feature do
   it "switches to the given driver when giving it as metadata", :driver => :culerity do
     expect(Capybara.current_driver).to eq(:culerity)
   end
+
+  context "#all" do
+    it "allows access to the Capybara finder" do
+      visit('/with_html')
+      expect(all(:css, 'h2.head').size).to eq(5)
+    end
+
+    it "allows access to the RSpec matcher" do
+      skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
+
+      visit('/with_html')
+      expect(["test1", "test2"]).to all(be_a(String))
+    end
+  end
+
+  context "#within" do
+    it "allows access to the Capybara scoper" do
+      visit('/with_html')
+      expect do
+        within(:css, "#does_not_exist") { click_link "Go to simple" }
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+
+    it "allows access to the RSpec matcher" do
+      skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
+      visit('/with_html')
+      # This reads terribly, but must call #within
+      expect(find(:css, 'span.number').text.to_i).to within(1).of(41)
+    end
+  end
+end
+
+RSpec.describe 'capybara/rspec', :type => :other do
+  context "when RSpec::Matchers is included after Capybara::DSL" do
+    before do
+      class DSL_MatchersTest
+        include Capybara::DSL
+        include RSpec::Matchers
+      end
+
+      @test_class_instance = DSL_MatchersTest.new
+    end
+
+    context "#all" do
+      it "allows access to the Capybara finder" do
+        @test_class_instance.visit('/with_html')
+        expect(@test_class_instance.all(:css, 'h2.head').size).to eq(5)
+      end
+
+      it "allows access to the RSpec matcher" do
+        skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
+
+        @test_class_instance.visit('/with_html')
+        expect(["test1", "test2"]).to @test_class_instance.all(be_a(String))
+      end
+    end
+
+    context "#within" do
+      it "allows access to the Capybara scoper" do
+        @test_class_instance.visit('/with_html')
+        expect do
+          @test_class_instance.within(:css, "#does_not_exist") { @test_class_instance.click_link "Go to simple" }
+        end.to raise_error(Capybara::ElementNotFound)
+      end
+
+      it "allows access to the RSpec matcher" do
+        skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
+        @test_class_instance.visit('/with_html')
+        # This reads terribly, but must call #within
+        expect(@test_class_instance.find(:css, 'span.number').text.to_i).to @test_class_instance.within(1).of(41)
+      end
+    end
+  end
 end
 
 RSpec.describe 'capybara/rspec', :type => :other do

data/spec/session_spec.rb

@@ -7,4 +7,48 @@ RSpec.describe Capybara::Session do
       Capybara::Session.new(:unknown, { random: "hash"})
     end.to raise_error TypeError, "The second parameter to Session::new should be a rack app if passed."
   end
+
+  context "current_driver" do
+    it "is global when threadsafe false" do
+      Capybara.threadsafe = false
+      Capybara.current_driver = :selenium
+      thread = Thread.new do
+        Capybara.current_driver = :random
+      end
+      thread.join
+      expect(Capybara.current_driver).to eq :random
+    end
+
+    it "is thread specific threadsafe true" do
+      Capybara.threadsafe = true
+      Capybara.current_driver = :selenium
+      thread = Thread.new do
+        Capybara.current_driver = :random
+      end
+      thread.join
+      expect(Capybara.current_driver).to eq :selenium
+    end
+  end
+
+  context "session_name" do
+    it "is global when threadsafe false" do
+      Capybara.threadsafe = false
+      Capybara.session_name = "sess1"
+      thread = Thread.new do
+        Capybara.session_name = "sess2"
+      end
+      thread.join
+      expect(Capybara.session_name).to eq "sess2"
+    end
+
+    it "is thread specific when threadsafe true" do
+      Capybara.threadsafe = true
+      Capybara.session_name = "sess1"
+      thread = Thread.new do
+        Capybara.session_name = "sess2"
+      end
+      thread.join
+      expect(Capybara.session_name).to eq "sess1"
+    end
+  end
 end

data/spec/shared_selenium_session.rb

@@ -147,5 +147,14 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         })
       end
     end
+
+    describe "Element#inspect" do
+      it "outputs obsolete elements" do
+        @session.visit('/form')
+        el = @session.find(:button, 'Click me!').click
+        sleep 2
+        expect(el.inspect).to eq "Obsolete #<Capybara::Node::Element>"
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,3 +8,7 @@ RSpec.configure do |config|
   config.filter_run_including focus_: true unless ENV['TRAVIS']
   config.run_all_when_everything_filtered = true
 end
+
+def rspec2?
+  !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -273,6 +273,7 @@ files:
 - License.txt
 - README.md
 - lib/capybara.rb
+- lib/capybara/config.rb
 - lib/capybara/cucumber.rb
 - lib/capybara/driver/base.rb
 - lib/capybara/driver/node.rb
@@ -304,6 +305,7 @@ files:
 - lib/capybara/result.rb
 - lib/capybara/rspec.rb
 - lib/capybara/rspec/features.rb
+- lib/capybara/rspec/matcher_proxies.rb
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
 - lib/capybara/selector/css.rb
@@ -314,6 +316,7 @@ files:
 - lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
 - lib/capybara/session.rb
+- lib/capybara/session/config.rb
 - lib/capybara/session/matchers.rb
 - lib/capybara/spec/fixtures/another_test_file.txt
 - lib/capybara/spec/fixtures/capybara.jpg
@@ -435,6 +438,7 @@ files:
 - spec/fixtures/selenium_driver_rspec_success.rb
 - spec/minitest_spec.rb
 - spec/minitest_spec_spec.rb
+- spec/per_session_config_spec.rb
 - spec/rack_test_spec.rb
 - spec/result_spec.rb
 - spec/rspec/features_spec.rb
@@ -470,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,