capybara 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8389b150e2b44270ed1d94b8f6e0f48af613f1a2f28b8ad772e35cb7db635ad7
-  data.tar.gz: bace2657813bc0681e4586ba2c96a66e824e12651f0e839a8649ed491f0eafa1
+  metadata.gz: e6f9f0b3e74df6a318719eb9ad775a72fbe2f4243218bb74e159ce4cc1a08e45
+  data.tar.gz: 72015cfed2914cb5d771bfcfe79c4efada7f19a1c5a3fe4c906404a99377b759
 SHA512:
-  metadata.gz: 5ffed0a0be90e5d8bf022b48d261aa160646562095114ca383a446431ab57403d67a6ccf252129a477484a6ea1bdc1edfefa6930571961e6307b5ce180c6aa30
-  data.tar.gz: e5956efba3a7e4a6833a9b63e61c6f136a3210eb77ac44d8b1603b81b6e5bea7bde1ea3fd4c76b8eda6a10f61c1e0e805aef7f8aa4bcf801061c46a7fded1c02
+  metadata.gz: 98d13268dbcd015ba6f4f38dc6a5d2dbb624fd12b593dc78969eedd56f8a9ab621911818b2ddeaf9d82e13e2a0d40edae34b8de84e1c7fcb7f7c01e7442432ea
+  data.tar.gz: eae1ee3569660c0e34a92154f422d2f1a777767439f3602a9eb827d00b09cdfb60a78e8a91472edee5b78adbd727cccc1c5eaa37c31badd9e56063a7e5eb6c5b

data/History.md

@@ -1,3 +1,10 @@
+# Version 3.0.1
+Release date: 2018-04-06
+
+### Changed
+
+* Restored ability for `Capybara.server=` to accept a proc which was accidentally removed in 3.0.0
+
 # Version 3.0.0
 Release date: 2018-04-05
 
@@ -16,7 +23,7 @@ Release date: 2018-03-23
 
 ### Changed
 
-* Drivers are now expected to return visible text more in line with the WebDriver spec for visible text
+* Visibile text whitespace is no longer fully normalized in favor of being more in line with the WebDriver spec for visible text
 * Drivers are expected to close extra windows when resetting the session
 * Selenium driver supports Date/Time when filling in date/time/datetime-local inputs
 * `current_url` returns the url for the top level browsing context

data/lib/capybara.rb

@@ -438,7 +438,11 @@ Capybara.register_server :webrick do |app, port, host, **options|
 end
 
 Capybara.register_server :puma do |app, port, host, **options|
-  require 'rack/handler/puma'
+  begin
+    require 'rack/handler/puma'
+  rescue LoadError
+    raise LoadError, "Capybara is unable to load `puma` for its server, please add `puma` to your project or specify a different server via something like `Capybara.server = :webrick`."
+  end
   # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
   # Therefore construct and run the Server instance ourselves.
   # Rack::Handler::Puma.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))

data/lib/capybara/config.rb

@@ -53,7 +53,9 @@ module Capybara
     #
     def server=(name)
       name, options = *name if name.is_a? Array
-      @server = if options
+      @server = if name.respond_to? :call
+        name
+      elsif options
         proc { |app, port, host| Capybara.servers[name.to_sym].call(app, port, host, options) }
       else
         Capybara.servers[name.to_sym]

data/lib/capybara/node/matchers.rb

@@ -622,10 +622,6 @@ module Capybara
       # Checks if the page or current node has the given text content,
       # ignoring any HTML tags.
       #
-      # Whitespaces are normalized in both node's text and passed text parameter.
-      # Note that whitespace isn't normalized in passed regexp as normalizing whitespace
-      # in regexp isn't easy and doesn't seem to be worth it.
-      #
       # By default it will check if the text occurs at least once,
       # but a different number can be specified.
       #

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/spec/capybara_spec.rb

@@ -64,6 +64,18 @@ RSpec.describe Capybara do
     end
   end
 
+  describe "server=" do
+    after do
+      Capybara.server = :default
+    end
+
+    it "accepts a proc" do
+      server = ->(_app, _port) {}
+      Capybara.server = server
+      expect(Capybara.server).to eq server
+    end
+  end
+
   describe 'app_host' do
     after do
       Capybara.app_host = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable