capybara 3.21.0 → 3.22.0

data/lib/capybara/session/config.rb

@@ -96,7 +96,7 @@ module Capybara
     # This attribute will be checked by builtin selector types whenever id would normally be checked.
     # If `nil` then it will be ignored.
     #
-    #  @params [String, Symbol, nil] id Name of the attribute to use as the test id
+    # @param [String, Symbol, nil] id Name of the attribute to use as the test id
     #
     def test_id=(id)
       @test_id = id&.to_sym

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

@@ -120,6 +120,12 @@ Capybara::SpecHelper.spec '#check' do
       expect(extract_results(@session)['pets']).to include('cat')
     end
 
+    it 'should alias `with`' do
+      @session.check('form[pets][]', with: 'cat')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['pets']).to include('cat')
+    end
+
     it 'should raise an error if option not found' do
       expect do
         @session.check('form[pets][]', option: 'elephant')

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

@@ -74,6 +74,12 @@ Capybara::SpecHelper.spec '#choose' do
       expect(extract_results(@session)['gender']).to eq('male')
     end
 
+    it 'should alias `:with` option' do
+      @session.choose('form[gender]', with: 'male')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['gender']).to eq('male')
+    end
+
     it 'should raise an error if option not found' do
       expect do
         @session.choose('form[gender]', option: 'hermaphrodite')

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#have_ancestor' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it 'should assert an ancestor using the given locator' do
+    el = @session.find(:css, '#ancestor1')
+    expect(el).to have_ancestor(:css, '#ancestor2')
+  end
+
+  it 'should assert an ancestor even if not parent' do
+    el = @session.find(:css, '#child')
+    expect(el).to have_ancestor(:css, '#ancestor3')
+  end
+
+  it 'should not raise an error if there are multiple matches' do
+    el = @session.find(:css, '#child')
+    expect(el).to have_ancestor(:css, 'div')
+  end
+
+  it 'should allow counts to be specified' do
+    el = @session.find(:css, '#child')
+
+    expect do
+      expect(el).to have_ancestor(:css, 'div').once
+    end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+
+    expect(el).to have_ancestor(:css, 'div').exactly(3).times
+  end
+end
+
+Capybara::SpecHelper.spec '#have_no_ancestor' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it 'should assert no matching ancestor' do
+    el = @session.find(:css, '#ancestor1')
+    expect(el).to have_no_ancestor(:css, '#child')
+    expect(el).not_to have_ancestor(:css, '#child')
+  end
+end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#have_sibling' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it 'should assert a prior sibling element using the given locator' do
+    el = @session.find(:css, '#mid_sibling')
+    expect(el).to have_sibling(:css, '#pre_sibling')
+  end
+
+  it 'should assert a following sibling element using the given locator' do
+    el = @session.find(:css, '#mid_sibling')
+    expect(el).to have_sibling(:css, '#post_sibling')
+  end
+
+  it 'should not raise an error if there are multiple matches' do
+    el = @session.find(:css, '#mid_sibling')
+    expect(el).to have_sibling(:css, 'div')
+  end
+
+  it 'should allow counts to be specified' do
+    el = @session.find(:css, '#mid_sibling')
+
+    expect(el).to have_sibling(:css, 'div').exactly(2).times
+    expect do
+      expect(el).to have_sibling(:css, 'div').once
+    end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+  end
+end
+
+Capybara::SpecHelper.spec '#have_no_sibling' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  it 'should assert no matching sibling' do
+    el = @session.find(:css, '#mid_sibling')
+    expect(el).to have_no_sibling(:css, '#not_a_sibling')
+    expect(el).not_to have_sibling(:css, '#not_a_sibling')
+  end
+
+  it 'should raise if there are matching siblings' do
+    el = @session.find(:css, '#mid_sibling')
+    expect do
+      expect(el).to have_no_sibling(:css, '#pre_sibling')
+    end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+  end
+end

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

@@ -42,13 +42,13 @@ Capybara::SpecHelper.spec '#select' do
   end
 
   it 'should select an option from a select box by id' do
-    @session.select('Finish', from: 'form_locale')
+    @session.select('Finnish', from: 'form_locale')
     @session.click_button('awesome')
     expect(extract_results(@session)['locale']).to eq('fi')
   end
 
   it 'should select an option from a select box by label' do
-    @session.select('Finish', from: 'Locale')
+    @session.select('Finnish', from: 'Locale')
     @session.click_button('awesome')
     expect(extract_results(@session)['locale']).to eq('fi')
   end
@@ -183,7 +183,7 @@ Capybara::SpecHelper.spec '#select' do
   context 'with :exact option' do
     context 'when `false`' do
       it 'can match select box approximately' do
-        @session.select('Finish', from: 'Loc', exact: false)
+        @session.select('Finnish', from: 'Loc', exact: false)
         @session.click_button('awesome')
         expect(extract_results(@session)['locale']).to eq('fi')
       end
@@ -204,13 +204,13 @@ Capybara::SpecHelper.spec '#select' do
     context 'when `true`' do
       it 'can match select box approximately' do
         expect do
-          @session.select('Finish', from: 'Loc', exact:  true)
+          @session.select('Finnish', from: 'Loc', exact: true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it 'can match option approximately' do
         expect do
-          @session.select('Fin', from: 'Locale', exact:  true)
+          @session.select('Fin', from: 'Locale', exact: true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 

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

@@ -108,7 +108,7 @@
     <select name="form[locale]" id="form_locale">
       <option value="sv">Swedish</option>
       <option selected="selected" value="en">English</option>
-      <option value="fi">Finish</option>
+      <option value="fi">Finnish</option>
       <option value="no">Norwegian</option>
       <option value="jo">John's made-up language</option>
       <option value="jbo"> Lojban </option>

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.21.0'
+  VERSION = '3.22.0'
 end

data/lib/capybara/window.rb

@@ -2,7 +2,7 @@
 
 module Capybara
   ##
-  # The Window class represents a browser window.
+  # The {Window} class represents a browser window.
   #
   # You can get an instance of the class by calling either of:
   #
@@ -12,12 +12,12 @@ module Capybara
   # * {Capybara::Session#switch_to_window}
   #
   # Note that some drivers (e.g. Selenium) support getting size of/resizing/closing only
-  #   current window. So if you invoke such method for:
+  # current window. So if you invoke such method for:
   #
-  #   * window that is current, Capybara will make 2 Selenium method invocations
-  #     (get handle of current window + get size/resize/close).
-  #   * window that is not current, Capybara will make 4 Selenium method invocations
-  #     (get handle of current window + switch to given handle + get size/resize/close + switch to original handle)
+  # * window that is current, Capybara will make 2 Selenium method invocations
+  #   (get handle of current window + get size/resize/close).
+  # * window that is not current, Capybara will make 4 Selenium method invocations
+  #   (get handle of current window + switch to given handle + get size/resize/close + switch to original handle)
   #
   class Window
     # @return [String]   a string that uniquely identifies window within session
@@ -57,12 +57,12 @@ module Capybara
     # Close window.
     #
     # If this method was called for window that is current, then after calling this method
-    #   future invocations of other Capybara methods should raise
-    #   `session.driver.no_such_window_error` until another window will be switched to.
+    # future invocations of other Capybara methods should raise
+    # {Capybara::Driver::Base#no_such_window_error session.driver.no_such_window_error} until another window will be switched to.
     #
     # @!macro about_current
     #   If this method was called for window that is not current, then after calling this method
-    #   current window shouldn remain the same as it was before calling this method.
+    #   current window should remain the same as it was before calling this method.
     #
     def close
       @driver.close_window(handle)
@@ -93,7 +93,7 @@ module Capybara
     # Maximize window.
     #
     # If a particular driver (e.g. headless driver) doesn't have concept of maximizing it
-    #   may not support this method.
+    # may not support this method.
     #
     # @macro about_current
     #

data/spec/minitest_spec.rb

@@ -130,6 +130,16 @@ class MinitestTest < Minitest::Test
     visit('/with_html')
     assert_matches_style(find(:css, '#second'), display: 'inline')
   end
+
+  def test_assert_ancestor
+    option = find(:option, 'Finnish')
+    assert_ancestor(option, :css, '#form_locale')
+  end
+
+  def test_assert_sibling
+    option = find(:css, '#form_title').find(:option, 'Mrs')
+    assert_sibling(option, :option, 'Mr')
+  end
 end
 
 RSpec.describe 'capybara/minitest' do
@@ -148,6 +158,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('20 runs, 50 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('22 runs, 52 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/minitest_spec_spec.rb

@@ -127,6 +127,16 @@ class MinitestSpecTest < Minitest::Spec
     find(:css, '#second').must_have_style('display' => 'inline') # deprecated
     find(:css, '#second').must_match_style('display' => 'inline')
   end
+
+  it 'supports ancestor expectations' do
+    option = find(:option, 'Finnish')
+    option.must_have_ancestor(:css, '#form_locale')
+  end
+
+  it 'supports sibling expectations' do
+    option = find(:css, '#form_title').find(:option, 'Mrs')
+    option.must_have_sibling(:option, 'Mr')
+  end
 end
 
 RSpec.describe 'capybara/minitest/spec' do
@@ -145,7 +155,7 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('20 runs, 42 assertions, 1 failures, 0 errors, 1 skips')
+    expect(output.string).to include('22 runs, 44 assertions, 1 failures, 0 errors, 1 skips')
     # Make sure error messages are displayed
     expect(output.string).to match(/expected to find select box "non_existing_form_title" .*but there were no matches/)
   end

data/spec/regexp_dissassembler_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Capybara::Selector::RegexpDisassembler do
+RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
   it 'handles strings' do
     verify_strings(
       /abcdef/ => %w[abcdef],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -413,6 +413,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - History.md
 - License.txt
 - README.md
@@ -460,8 +461,10 @@ files:
 - lib/capybara/rspec/matchers/become_closed.rb
 - lib/capybara/rspec/matchers/compound.rb
 - lib/capybara/rspec/matchers/count_sugar.rb
+- lib/capybara/rspec/matchers/have_ancestor.rb
 - lib/capybara/rspec/matchers/have_current_path.rb
 - lib/capybara/rspec/matchers/have_selector.rb
+- lib/capybara/rspec/matchers/have_sibling.rb
 - lib/capybara/rspec/matchers/have_text.rb
 - lib/capybara/rspec/matchers/have_title.rb
 - lib/capybara/rspec/matchers/match_selector.rb
@@ -579,6 +582,7 @@ files:
 - lib/capybara/spec/session/go_back_spec.rb
 - lib/capybara/spec/session/go_forward_spec.rb
 - lib/capybara/spec/session/has_all_selectors_spec.rb
+- lib/capybara/spec/session/has_ancestor_spec.rb
 - lib/capybara/spec/session/has_any_selectors_spec.rb
 - lib/capybara/spec/session/has_button_spec.rb
 - lib/capybara/spec/session/has_css_spec.rb
@@ -588,6 +592,7 @@ files:
 - lib/capybara/spec/session/has_none_selectors_spec.rb
 - lib/capybara/spec/session/has_select_spec.rb
 - lib/capybara/spec/session/has_selector_spec.rb
+- lib/capybara/spec/session/has_sibling_spec.rb
 - lib/capybara/spec/session/has_table_spec.rb
 - lib/capybara/spec/session/has_text_spec.rb
 - lib/capybara/spec/session/has_title_spec.rb