capybara 3.30.0 → 3.31.0

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

@@ -95,6 +95,26 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['html5_color']).to eq('#112233')
   end
 
+  describe 'with input[type="range"]' do
+    it 'should set the range slider correctly' do
+      @session.fill_in('form_age', with: 51)
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 51
+    end
+
+    it 'should set the range slider to valid values' do
+      @session.fill_in('form_age', with: '37.6')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 37.5
+    end
+
+    it 'should respect the range slider limits' do
+      @session.fill_in('form_age', with: '3')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 13
+    end
+  end
+
   it 'should fill in a field with a custom type' do
     @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @session.click_button('awesome')

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

@@ -185,10 +185,10 @@ Capybara::SpecHelper.spec '#has_css?' do
     end
 
     it 'should be false when content occurs more times than given' do
-      expect(@session).not_to have_css('h2.head', maximum: 4) # edge case
-      expect(@session).not_to have_css('h2', maximum: 3)
+      # expect(@session).not_to have_css('h2.head', maximum: 4) # edge case
+      # expect(@session).not_to have_css('h2', maximum: 3)
       expect(@session).not_to have_css('h2').at_most(3).times
-      expect(@session).not_to have_css('p', maximum: 1)
+      # expect(@session).not_to have_css('p', maximum: 1)
     end
 
     it 'should coerce maximum to an integer' do

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

@@ -117,6 +117,34 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
   end
 
+  context 'with enabled options' do
+    it 'should be true if the listed options exist and are enabled' do
+      expect(@session).to have_select('form_title', enabled_options: %w[Mr Mrs Miss])
+    end
+
+    it 'should be false if the listed options do not exist' do
+      expect(@session).not_to have_select('form_title', enabled_options: ['Not there'])
+    end
+
+    it 'should be false if the listed option exists but is not enabled' do
+      expect(@session).not_to have_select('form_title', enabled_options: %w[Mr Mrs Miss Other])
+    end
+  end
+
+  context 'with disabled options' do
+    it 'should be true if the listed options exist and are disabled' do
+      expect(@session).to have_select('form_title', disabled_options: ['Other'])
+    end
+
+    it 'should be false if the listed options do not exist' do
+      expect(@session).not_to have_select('form_title', disabled_options: ['Not there'])
+    end
+
+    it 'should be false if the listed option exists but is not disabled' do
+      expect(@session).not_to have_select('form_title', disabled_options: %w[Other Mrs])
+    end
+  end
+
   context 'with partial options' do
     it 'should be true if a field with the given partial options is on the page' do
       expect(@session).to have_select('Region', with_options: %w[Norway Sweden])

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

@@ -127,7 +127,11 @@ Capybara::SpecHelper.spec '#has_text?' do
         def to_hash; { value: 'Other hash' } end
       end.new
       @session.visit('/with_html')
-      expect(@session).to have_text(:visible, with_to_hash, {})
+      if RUBY_VERSION >= '2.7'
+        expect(@session).to have_text(:visible, with_to_hash, **{})
+      else
+        expect(@session).to have_text(:visible, with_to_hash, {})
+      end
     end
 
     it 'should fail if passed without empty options' do

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

@@ -270,11 +270,11 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'works when details is toggled open and closed' do
-      @session.find(:css, '#closed_details').click
+      @session.find(:css, '#closed_details > summary').click
       expect(@session).to have_css('#closed_details *', visible: true, count: 5)
         .and(have_no_css('#closed_details *', visible: :hidden))
 
-      @session.find(:css, '#closed_details').click
+      @session.find(:css, '#closed_details > summary').click
       descendants_css = '#closed_details > *:not(summary), #closed_details > *:not(summary) *'
       expect(@session).to have_no_css(descendants_css, visible: true)
         .and(have_css(descendants_css, visible: :hidden, count: 3))
@@ -468,6 +468,50 @@ Capybara::SpecHelper.spec 'node' do
       end
     end
 
+    it 'should simulate a single held down modifier key' do
+      %I[
+        alt
+        ctrl
+        meta
+        shift
+      ].each do |modifier_key|
+        @session.visit('/with_js')
+
+        element = @session.find('//div[@id="drag"]')
+        target = @session.find('//div[@id="drop"]')
+
+        element.drag_to(target, drop_modifiers: modifier_key)
+        expect(@session).to have_css('div.drag_start', exact_text: 'Dragged!')
+        expect(@session).to have_xpath("//div[contains(., 'Dropped!-#{modifier_key}')]")
+      end
+    end
+
+    it 'should simulate multiple held down modifier keys' do
+      @session.visit('/with_js')
+
+      element = @session.find('//div[@id="drag"]')
+      target = @session.find('//div[@id="drop"]')
+
+      modifier_keys = %I[alt ctrl meta shift]
+
+      element.drag_to(target, drop_modifiers: modifier_keys)
+      expect(@session).to have_xpath("//div[contains(., 'Dropped!-#{modifier_keys.join('-')}')]")
+    end
+
+    it 'should support key aliases' do
+      { control: :ctrl,
+        command: :meta,
+        cmd: :meta }.each do |(key_alias, key)|
+        @session.visit('/with_js')
+
+        element = @session.find('//div[@id="drag"]')
+        target = @session.find('//div[@id="drop"]')
+
+        element.drag_to(target, drop_modifiers: [key_alias])
+        expect(target).to have_text("Dropped!-#{key}", exact: true)
+      end
+    end
+
     context 'HTML5', requires: %i[js html5_drag] do
       it 'should HTML5 drag and drop an object' do
         @session.visit('/with_js')
@@ -499,8 +543,13 @@ Capybara::SpecHelper.spec 'node' do
         target = @session.find('//div[@id="drop_html5"]')
         element.drag_to(target)
 
+        conditions = %w[DragLeave Drop DragEnd].map do |text|
+          have_css('div.log', text: text)
+        end
+        expect(@session).to(conditions.reduce { |memo, cond| memo.and(cond) })
+
         # The first "DragOver" div is inserted by the last dragover event dispatched
-        drag_over_div = @session.find('//div[@class="log" and starts-with(text(), "DragOver")]', match: :first)
+        drag_over_div = @session.first('//div[@class="log" and starts-with(text(), "DragOver")]')
         position = drag_over_div.text.sub('DragOver ', '')
 
         expect(@session).to have_css('div.log', text: /DragLeave #{position}/, count: 1)
@@ -551,6 +600,46 @@ Capybara::SpecHelper.spec 'node' do
         source.drag_to target
         expect(@session).to have_xpath('//div[contains(., "HTML5 Dropped")]')
       end
+
+      it 'should simulate a single held down modifier key' do
+        %I[alt ctrl meta shift].each do |modifier_key|
+          @session.visit('/with_js')
+
+          element = @session.find('//div[@id="drag_html5"]')
+          target = @session.find('//div[@id="drop_html5"]')
+
+          element.drag_to(target, drop_modifiers: modifier_key)
+
+          expect(@session).to have_css('div.drag_start', exact_text: 'HTML5 Dragged!')
+          expect(@session).to have_xpath("//div[contains(., 'HTML5 Dropped string: text/plain drag_html5-#{modifier_key}')]")
+        end
+      end
+
+      it 'should simulate multiple held down modifier keys' do
+        @session.visit('/with_js')
+
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+
+        modifier_keys = %I[alt ctrl meta shift]
+
+        element.drag_to(target, drop_modifiers: modifier_keys)
+        expect(@session).to have_xpath("//div[contains(., 'HTML5 Dropped string: text/plain drag_html5-#{modifier_keys.join('-')}')]")
+      end
+
+      it 'should support key aliases' do
+        { control: :ctrl,
+          command: :meta,
+          cmd: :meta }.each do |(key_alias, key)|
+          @session.visit('/with_js')
+
+          element = @session.find('//div[@id="drag_html5"]')
+          target = @session.find('//div[@id="drop_html5"]')
+
+          element.drag_to(target, drop_modifiers: [key_alias])
+          expect(target).to have_text(%r{^HTML5 Dropped string: text/plain drag_html5-#{key}$}m, exact: true)
+        end
+      end
     end
   end
 

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

@@ -11,7 +11,7 @@
       <option>Miss</option>
       <option disabled="disabled">Other</option>
     </select>
-    </p>
+  </p>
 
   <p>
     <label for="customer_name">Customer Name
@@ -62,6 +62,11 @@
     <input type="text" name="form[name]" value="John Smith" id="form_name"/>
   </p>
 
+  <p>
+    <label for="form_age">Age</label>
+    <input type="range" name="form[age]" value="18" min="13" max="100" step="0.5" id="form_age"/>
+  </p>
+
   <p>
     <label for="form_schmooo">Schmooo</label>
     <input type="schmooo" name="form[schmooo]" value="This is Schmooo!" id="form_schmooo"/>

data/lib/capybara/version.rb

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

data/spec/rack_test_spec.rb

@@ -82,7 +82,6 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
         session.visit '/with_html'
-
         expect { session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true } }.to \
           output(/^Options passed to Node#set but the RackTest driver doesn't support any - ignoring/).to_stderr
         expect(session).to have_field('test_field', with: 'not_monkey')

data/spec/result_spec.rb

@@ -78,6 +78,10 @@ RSpec.describe Capybara::Result do
     eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
       expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
     TEST
+    eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
+      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+    TEST
   end
 
   it 'works with filter blocks' do

data/spec/selenium_spec_chrome.rb

@@ -14,7 +14,8 @@ browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']
 browser_options.add_option(:w3c, ENV['W3C'] != 'false')
 # Chromedriver 77 requires setting this for headless mode on linux
-# browser_options.add_preference('download.default_directory', Capybara.save_path)
+# Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
+browser_options.add_preference('download.default_directory', Capybara.save_path)
 browser_options.add_preference(:download, default_directory: Capybara.save_path)
 
 Capybara.register_driver :selenium_chrome do |app|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.30.0
+  version: 3.31.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable