capybara 3.0.0.rc2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b394cb5aaa7d6849ba4fd9e486b7fae2298a64f6a5e2f88fd80abea82a2ba6
-  data.tar.gz: eeca1e3b972c9efb89224fb701a1612a5d503621327af3fb77bf1a028a21761d
+  metadata.gz: 8389b150e2b44270ed1d94b8f6e0f48af613f1a2f28b8ad772e35cb7db635ad7
+  data.tar.gz: bace2657813bc0681e4586ba2c96a66e824e12651f0e839a8649ed491f0eafa1
 SHA512:
-  metadata.gz: 615f9400b993c2408414f886a5cfdd41272e29cb9c3fa1763758888416d3e9c5f42d4d179686f8ac56b185610503aef904be6a508e5e8b7d703760ff85a498a0
-  data.tar.gz: 0045d33244fdc1cd6615cac65760399088330bc1751781c1ea2c0107570f096f52766841ad2f1a40efb595127e9e78b5c4b1d9341dcd146721eedba0e588062a
+  metadata.gz: 5ffed0a0be90e5d8bf022b48d261aa160646562095114ca383a446431ab57403d67a6ccf252129a477484a6ea1bdc1edfefa6930571961e6307b5ce180c6aa30
+  data.tar.gz: e5956efba3a7e4a6833a9b63e61c6f136a3210eb77ac44d8b1603b81b6e5bea7bde1ea3fd4c76b8eda6a10f61c1e0e805aef7f8aa4bcf801061c46a7fded1c02

data/History.md

@@ -1,3 +1,16 @@
+# Version 3.0.0
+Release date: 2018-04-05
+
+### Changed
+
+* Selenium driver only closes extra windows for browsers where that is known to work (Firefox, Chrome)
+* "threadsafe" mode is no longer considered beta
+
+### Fixes
+
+* Multiple file attach_file with Firefox
+* Use Puma::Server directly rather than Rack::Handler::Puma so signal handlers don't prevent test quitting
+
 # Version 3.0.0.rc2
 Release date: 2018-03-23
 
@@ -30,7 +43,7 @@ Release date: 2018-03-02
 ### Removed
 
 * Ruby < 2.2.2 support
-* `Capybara.exact_options` no longer exists. Just use `exact:true` on relevant actions/finders if necessary.
+* `Capybara.exact_options` no longer exists. Just use `exact: true` on relevant actions/finders if necessary.
 * All previously deprecated methods removed
 * RSpec 2.x support
 * selenium-webdriver 2.x support

data/README.md

@@ -7,7 +7,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jnicklas/capybara?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 **Note** You are viewing the README for the development version of Capybara.  If you are using the current release version
-you can find the README at https://github.com/teamcapybara/capybara/blob/2.17_stable/README.md
+you can find the README at https://github.com/teamcapybara/capybara/blob/3.0_stable/README.md
 
 
 Capybara helps you test web applications by simulating how a real user would
@@ -76,7 +76,7 @@ GitHub): http://groups.google.com/group/ruby-capybara
 
 ## <a name="setup"></a>Setup
 
-Capybara requires Ruby 2.2.0 or later. To install, add this line to your
+Capybara requires Ruby 2.2.2 or later. To install, add this line to your
 `Gemfile` and run `bundle install`:
 
 ```ruby
@@ -151,15 +151,15 @@ If you are using Rails, put your Capybara specs in `spec/features` or `spec/syst
 if [you have it configured in
 RSpec](https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#file-type-inference-disabled))
 and if you have your Capybara specs in a different directory, then tag the
-example groups with `:type => :feature` or `:type => :system` depending on which type of test you're writing.
+example groups with `type: :feature` or `type: :system` depending on which type of test you're writing.
 
 If you are not using Rails, tag all the example groups in which you want to use
-Capybara with `:type => :feature`.
+Capybara with `type: :feature`.
 
 You can now write your specs like so:
 
 ```ruby
-describe "the signin process", :type => :feature do
+describe "the signin process", type: :feature do
   before :each do
     User.make(email: 'user@example.com', password: 'password')
   end
@@ -183,7 +183,7 @@ to one specific driver. For example:
 ```ruby
 describe 'some stuff which requires js', js: true do
   it 'will use the default js driver'
-  it 'will switch to one specific driver', :driver => :webkit
+  it 'will switch to one specific driver', driver: :webkit
 end
 ```
 
@@ -219,7 +219,7 @@ feature "Signing in" do
 end
 ```
 
-`feature` is in fact just an alias for `describe ..., :type => :feature`,
+`feature` is in fact just an alias for `describe ..., type:> :feature`,
 `background` is an alias for `before`, `scenario` for `it`, and
 `given`/`given!` aliases for `let`/`let!`, respectively.
 
@@ -1047,7 +1047,7 @@ additional info about how the underlying driver can be configured.
   are testing for specific server errors and using multiple sessions make sure to test for the
   errors using the initial session (usually :default)
 
-## <a name="threadsafe"></a>"Threadsafe" mode - BETA - may change
+## <a name="threadsafe"></a>"Threadsafe" mode
 
 In normal mode most of Capybara's configuration options are global settings which can cause issues
 if using multiple sessions and wanting to change a setting for only one of the sessions.  To provide

data/lib/capybara.rb

@@ -439,7 +439,22 @@ end
 
 Capybara.register_server :puma do |app, port, host, **options|
   require 'rack/handler/puma'
-  Rack::Handler::Puma.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
+  # 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))
+
+  conf = Rack::Handler::Puma.config(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
+  events = conf.options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
+
+  events.log "Capybara starting Puma..."
+  events.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
+  events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
+
+  Puma::Server.new(conf.app, events, conf.options).tap do |s|
+    s.binder.parse conf.options[:binds], s.events
+    s.min_threads = conf.options[:min_threads]
+    s.max_threads = conf.options[:max_threads]
+  end.run.join
 end
 
 Capybara.configure do |config|

data/lib/capybara/config.rb

@@ -25,7 +25,6 @@ module Capybara
     attr_writer :reuse_server
 
     def threadsafe=(bool)
-      warn "Capybara.threadsafe == true is a BETA feature and may change in future minor versions" if bool
       raise "Threadsafe setting cannot be changed once a session is created" if (bool != threadsafe) && Session.instance_created?
       @threadsafe = bool
     end

data/lib/capybara/node/actions.rb

@@ -264,7 +264,8 @@ module Capybara
             raise unless allow_label_click && catch_error?(e)
             begin
               el ||= find(selector, locator, options.merge(visible: :all))
-              find(:label, for: el, visible: true).click unless el.checked? == checked
+              res = find(:label, for: el, visible: true).click unless el.checked? == checked
+              res
             rescue # swallow extra errors - raise original
               raise e
             end

data/lib/capybara/selenium/driver.rb

@@ -26,7 +26,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       @w3c = ((defined?(Selenium::WebDriver::Remote::W3CCapabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3CCapabilities)) ||
               (defined?(Selenium::WebDriver::Remote::W3C::Capabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3C::Capabilities)))
       main = Process.pid
-      @primary_window_handle = current_window_handle
 
       at_exit do
         # Store the exit status of the test run since it goes away after calling the at_exit proc...
@@ -110,8 +109,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Use instance variable directly so we avoid starting the browser just to reset the session
     return unless @browser
 
-    switch_to_window(@primary_window_handle)
-    window_handles.reject { |handle| handle == @primary_window_handle }.each { |win| close_window(win) }
+    if firefox? || chrome?
+      switch_to_window(window_handles.first)
+      window_handles.slice(1..-1).each { |win| close_window(win) }
+    end
 
     navigated = false
     start_time = Capybara::Helpers.monotonic_time
@@ -210,7 +211,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def close_window(handle)
-    raise ArgumentError, "Not allowed to close the primary window" if handle == @primary_window_handle
+    raise ArgumentError, "Not allowed to close the primary window" if handle == window_handles.first
     within_given_window(handle) do
       browser.close
     end
@@ -269,7 +270,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       ::Selenium::WebDriver::Error::ElementNotInteractableError,
       ::Selenium::WebDriver::Error::ElementClickInterceptedError,
       ::Selenium::WebDriver::Error::InvalidElementStateError,
-      ::Selenium::WebDriver::Error::ElementNotSelectableError
+      ::Selenium::WebDriver::Error::ElementNotSelectableError,
+      ::Selenium::WebDriver::Error::ElementNotSelectableError,
+      ::Selenium::WebDriver::Error::NoSuchElementError, # IE
+      ::Selenium::WebDriver::Error::InvalidArgumentError # IE
     ]
   end
 
@@ -297,6 +301,11 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser_name == "edge"
   end
 
+  # @api private
+  def ie?
+    browser_name == "ie"
+  end
+
 private
 
   def browser_name

data/lib/capybara/selenium/node.rb

@@ -279,10 +279,11 @@ private
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     path_names = value.to_s.empty? ? [] : value
-    if driver.chrome?
-      native.send_keys(Array(path_names).join("\n"))
+    if driver.marionette?
+      native.clear
+      Array(path_names).each { |p| native.send_keys(p) }
     else
-      native.send_keys(*path_names)
+      native.send_keys(Array(path_names).join("\n"))
     end
   end
 

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

@@ -73,7 +73,6 @@ Capybara::SpecHelper.spec "#attach_file" do
     end
 
     it "should not break when using HTML5 multiple file input uploading multiple files" do
-      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_(firefox|marionette)/
       @session.attach_file("Multiple Documents",
                            [@test_file_path, @another_test_file_path].map { |f| with_os_path_separators(f) })
       @session.click_button('Upload Multiple')
@@ -86,6 +85,16 @@ Capybara::SpecHelper.spec "#attach_file" do
       @session.click_button('Upload Empty Multiple')
       expect(@session).to have_content("Successfully ignored empty file field")
     end
+
+    it "should not append files to already attached" do
+      @session.attach_file "Multiple Documents", with_os_path_separators(@test_file_path)
+      @session.attach_file("Multiple Documents",
+                           [@test_file_path, @another_test_file_path].map { |f| with_os_path_separators(f) })
+      @session.click_button('Upload Multiple')
+      expect(@session.body).to include("2 | ") # number of files
+      expect(@session.body).to include(File.read(@test_file_path))
+      expect(@session.body).to include(File.read(@another_test_file_path))
+    end
   end
 
   context "with a locator that doesn't exist" do

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

@@ -169,7 +169,7 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
-  context "with fields associated with the form using the form attribute" do
+  context "with fields associated with the form using the form attribute", requires: [:form_attribute] do
     before do
       @session.click_button('submit_form1')
       @results = extract_results(@session)
@@ -192,7 +192,7 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
-  context "with submit button outside the form defined by <button> tag" do
+  context "with submit button outside the form defined by <button> tag", requires: [:form_attribute] do
     before do
       @session.click_button('outside_button')
       @results = extract_results(@session)
@@ -208,7 +208,7 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
-  context "with submit button outside the form defined by <input type='submit'> tag" do
+  context "with submit button outside the form defined by <input type='submit'> tag", requires: [:form_attribute] do
     before do
       @session.click_button('outside_submit')
       @results = extract_results(@session)
@@ -224,7 +224,7 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
-  context "with submit button for form1 located within form2" do
+  context "with submit button for form1 located within form2", requires: [:form_attribute] do
     it "should submit the form associated with the button" do
       @session.click_button('other_form_button')
       expect(extract_results(@session)['which_form']).to eq("form1")

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

@@ -18,7 +18,7 @@ Capybara::SpecHelper.spec '#refresh' do
   end
 
   it "it reposts" do
-    if marionette?(@session) || edge?(@session)
+    if marionette?(@session) || edge?(@session) || ie?(@session)
       skip "Firefox and Edge insist on prompting without providing a way to suppress"
     end
     @session.visit('/form')

data/lib/capybara/spec/spec_helper.rb

@@ -137,6 +137,10 @@ module Capybara
     def edge?(session)
       session.respond_to?(:driver) && session.driver.respond_to?(:edge?, true) && session.driver.send(:edge?)
     end
+
+    def ie?(session)
+      session.respond_to?(:driver) && session.driver.respond_to?(:ie?, true) && session.driver.send(:ie?)
+    end
   end
 end
 

data/lib/capybara/version.rb

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

data/spec/capybara_spec.rb

@@ -56,27 +56,11 @@ RSpec.describe Capybara do
     end
 
     it "should have :webrick registered" do
-      require 'rack/handler/webrick'
-      mock_app = double('app')
-      Capybara.server = :webrick
-      expect(Rack::Handler::WEBrick).to receive(:run)
-      Capybara.server.call(mock_app, 8000)
+      expect(Capybara.servers[:webrick]).not_to be_nil
     end
 
     it "should have :puma registered" do
-      require 'rack/handler/puma'
-      mock_app = double('app')
-      Capybara.server = :puma
-      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 8000))
-      Capybara.server.call(mock_app, 8000)
-    end
-
-    it "should pass options to server" do
-      require 'rack/handler/puma'
-      mock_app = double('app')
-      Capybara.server = :puma, { Silent: true }
-      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 9000, Silent: true))
-      Capybara.server.call(mock_app, 9000)
+      expect(Capybara.servers[:puma]).not_to be_nil
     end
   end
 

data/spec/rspec_matchers_spec.rb

@@ -26,7 +26,6 @@ RSpec.describe 'Capybara RSpec Matchers', type: :feature do
 
       not_to_msg = error_msg_for { expect(page).not_to have_text('This is a test') }
       have_no_msg = error_msg_for { expect(page).to have_no_text('This is a test') }
-      puts not_to_msg
       expect(not_to_msg).to eq have_no_msg
     end
   end

data/spec/selenium_spec_edge.rb

@@ -20,7 +20,7 @@ $stdout.puts `#{Selenium::WebDriver::Edge.driver_path} --version` if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, "selenium", capybara_skip: skipped_tests
 
-RSpec.describe "Capybara::Session with Edge" do
+RSpec.describe "Capybara::Session with Edge", capybara_skip: skipped_tests do
   include Capybara::SpecHelper
   include_examples  "Capybara::Session", TestSessions::SeleniumEdge, :selenium_edge
   include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumEdge, :selenium_edge

data/spec/selenium_spec_ie.rb

@@ -7,21 +7,25 @@ require 'rspec/shared_spec_matchers'
 
 Capybara.register_driver :selenium_ie do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
-  Capybara::Selenium::Driver.new(app, browser: :ie)
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :ie,
+    desired_capabilities: ::Selenium::WebDriver::Remote::Capabilities.ie('requireWindowFocus': true)
+  )
 end
 
 module TestSessions
   SeleniumIE = Capybara::Session.new(:selenium_ie, TestApp)
 end
 
-skipped_tests = %i[response_headers status_code trigger]
+skipped_tests = %i[response_headers status_code trigger modals hover form_attribute windows]
 
 $stdout.puts `#{Selenium::WebDriver::IE.driver_path} --version` if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, "selenium", capybara_skip: skipped_tests
 
-RSpec.describe "Capybara::Session with Internet Explorer" do
+RSpec.describe "Capybara::Session with Internet Explorer", capybara_skip: skipped_tests do
   include Capybara::SpecHelper
-  include_examples  "Capybara::Session", TestSessions::SeleniumIE, :selenium_ie
-  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumIE, :selenium_ie
+  include_examples "Capybara::Session", TestSessions::SeleniumIE, :selenium_ie
+  include_examples Capybara::RSpecMatchers, TestSessions::SeleniumIE, :selenium_ie
 end

data/spec/shared_selenium_session.rb

@@ -55,7 +55,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
     end
 
-    describe "#accept_alert" do
+    describe "#accept_alert", requires: [:modals] do
       it "supports a blockless mode" do
         @session.visit('/with_js')
         @session.click_link('Open alert')
@@ -64,7 +64,6 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
 
       it "can be called before visiting" do
-        skip "Edge driver doesn't get any interactions when alert is set" if edge?(@session)
         @session.accept_alert "Initial alert" do
           @session.visit('/initial_alert')
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -495,9 +495,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6