capybara 3.35.2 → 3.39.2

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

@@ -110,6 +110,18 @@ Capybara::SpecHelper.spec '#has_field' do
     end
   end
 
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a field has focus' do
+      2.times { @session.send_keys(:tab) }
+
+      expect(@session).to have_field('An Input', focused: true)
+    end
+
+    it 'should be false if a field does not have focus' do
+      expect(@session).to have_field('An Input', focused: false)
+    end
+  end
+
   context 'with valid', requires: [:js] do
     it 'should be true if field is valid' do
       @session.fill_in 'required', with: 'something'
@@ -184,6 +196,18 @@ Capybara::SpecHelper.spec '#has_no_field' do
       expect(@session).to have_no_field('Languages', type: 'textarea')
     end
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a field does not have focus when focused: true' do
+      expect(@session).to have_no_field('An Input', focused: true)
+    end
+
+    it 'should be false if a field has focus when focused: true' do
+      2.times { @session.send_keys(:tab) }
+
+      expect(@session).not_to have_no_field('An Input', focused: true)
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#has_checked_field?' do
@@ -359,7 +383,7 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_no_unchecked_field?(disabled: false, id: 'form_disabled_unchecked_checkbox')).to eq true
+    expect(@session.has_no_unchecked_field?(disabled: false, id: 'form_disabled_unchecked_checkbox')).to be true
     expect(@session).to have_no_unchecked_field(disabled: false, id: 'form_disabled_unchecked_checkbox')
   end
 end

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

@@ -11,12 +11,38 @@ Capybara::SpecHelper.spec '#has_link?' do
     expect(@session).to have_link('A link', href: '/with_simple_html')
     expect(@session).to have_link(:'A link', href: :'/with_simple_html')
     expect(@session).to have_link('A link', href: %r{/with_simple_html})
+    expect(@session).to have_link('labore', target: '_self')
   end
 
   it 'should be false if the given link is not on the page' do
     expect(@session).not_to have_link('monkey')
     expect(@session).not_to have_link('A link', href: '/nonexistent-href')
     expect(@session).not_to have_link('A link', href: /nonexistent/)
+    expect(@session).not_to have_link('labore', target: '_blank')
+  end
+
+  it 'should notify if an invalid locator is specified' do
+    allow(Capybara::Helpers).to receive(:warn).and_return(nil)
+    @session.has_link?(@session)
+    expect(Capybara::Helpers).to have_received(:warn).with(/Called from: .+/)
+  end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if the given link is on the page and has focus' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_link('labore', focused: true)
+    end
+
+    it 'should be false if the given link is on the page and does not have focus' do
+      expect(@session).to have_link('labore', focused: false)
+    end
+  end
+
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_link('labore', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :href, :alt, :title, :target, :download')
   end
 end
 
@@ -29,11 +55,25 @@ Capybara::SpecHelper.spec '#has_no_link?' do
     expect(@session).not_to have_no_link('foo')
     expect(@session).not_to have_no_link('awesome title')
     expect(@session).not_to have_no_link('A link', href: '/with_simple_html')
+    expect(@session).not_to have_no_link('labore', target: '_self')
   end
 
   it 'should be true if the given link is not on the page' do
     expect(@session).to have_no_link('monkey')
     expect(@session).to have_no_link('A link', href: '/nonexistent-href')
     expect(@session).to have_no_link('A link', href: %r{/nonexistent-href})
+    expect(@session).to have_no_link('labore', target: '_blank')
+  end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if the given link is on the page and has focus' do
+      expect(@session).to have_no_link('labore', focused: true)
+    end
+
+    it 'should be false if the given link is on the page and does not have focus' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_no_link('labore', focused: false)
+    end
   end
 end

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

@@ -8,10 +8,10 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
   it 'should be false if any of the given locators are on the page' do
     expect do
       expect(@session).to have_none_of_selectors(:xpath, '//p', '//a')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
     expect do
       expect(@session).to have_none_of_selectors(:css, 'p a#foo')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   it 'should be true if none of the given locators are on the page' do
@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
     expect(@session).to have_none_of_selectors('p a#doesnotexist', 'abbr')
     expect do
       expect(@session).to have_none_of_selectors('abbr', 'p a#foo')
-    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error RSpec::Expectations::ExpectationNotMetError
   end
 
   context 'should respect scopes' do
@@ -32,7 +32,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
       @session.within "//p[@id='first']" do
         expect do
           expect(@session).to have_none_of_selectors(".//a[@id='foo']")
-        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error RSpec::Expectations::ExpectationNotMetError
         expect(@session).to have_none_of_selectors(".//a[@id='red']")
       end
     end
@@ -41,7 +41,7 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
       el = @session.find "//p[@id='first']"
       expect do
         expect(el).to have_none_of_selectors(".//a[@id='foo']")
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(el).to have_none_of_selectors(".//a[@id='red']")
     end
   end
@@ -50,14 +50,14 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
     it 'should apply the options to all locators' do
       expect do
         expect(@session).to have_none_of_selectors('//p//a', text: 'Redirect')
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors('//p', text: 'Doesnotexist')
     end
 
     it 'should discard all matches where the given regexp is matched' do
       expect do
         expect(@session).to have_none_of_selectors('//p//a', text: /re[dab]i/i, count: 1)
-      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors('//p//a', text: /Red$/)
     end
   end

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

@@ -179,10 +179,16 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
   end
 
+  it 'should raise an error if an invalid option is passed' do
+    expect do
+      expect(@session).to have_select('form_languages', invalid: true)
+    end.to raise_error(ArgumentError, 'Invalid option(s) :invalid, should be one of :above, :below, :left_of, :right_of, :near, :count, :minimum, :maximum, :between, :text, :id, :class, :style, :visible, :obscured, :exact, :exact_text, :normalize_ws, :match, :wait, :filter_set, :focused, :disabled, :name, :placeholder, :options, :enabled_options, :disabled_options, :selected, :with_selected, :multiple, :with_options')
+  end
+
   it 'should support locator-less usage' do
-    expect(@session.has_select?(with_options: %w[Norway Sweden])).to eq true
+    expect(@session.has_select?(with_options: %w[Norway Sweden])).to be true
     expect(@session).to have_select(with_options: ['London'])
-    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to eq true
+    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to be true
     expect(@session).to have_select(with_selected: ['Briefs'])
   end
 end
@@ -302,9 +308,9 @@ Capybara::SpecHelper.spec '#has_no_select?' do
   end
 
   it 'should support locator-less usage' do
-    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to eq true
+    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to be true
     expect(@session).to have_no_select(with_options: ['New London'])
-    expect(@session.has_no_select?(id: 'form_underwear', with_selected: ['Boxers'])).to eq true
+    expect(@session.has_no_select?(id: 'form_underwear', with_selected: ['Boxers'])).to be true
     expect(@session).to have_no_select(id: 'form_underwear', with_selected: %w[Commando Boxers])
   end
 end

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

@@ -117,6 +117,21 @@ Capybara::SpecHelper.spec '#has_selector?' do
         expect(@session).to have_selector(:id, 'h2one', text: 'Header Class Test One', exact_text: false)
         expect(@session).to have_selector(:id, 'h2one', text: 'Header Class Test', exact_text: false)
       end
+
+      it 'should warn if text option is a regexp that it is ignoring exact_text' do
+        allow(Capybara::Helpers).to receive(:warn)
+        expect(@session).to have_selector(:id, 'h2one', text: /Class Test/, exact_text: true)
+        expect(Capybara::Helpers).to have_received(:warn).with(/'exact_text' option is not supported/)
+      end
+    end
+
+    context 'regexp' do
+      it 'should only match when it fully matches' do
+        expect(@session).to have_selector(:id, 'h2one', exact_text: /Header Class Test One/)
+        expect(@session).to have_no_selector(:id, 'h2one', exact_text: /Header Class Test/)
+        expect(@session).to have_no_selector(:id, 'h2one', exact_text: /Class Test One/)
+        expect(@session).to have_no_selector(:id, 'h2one', exact_text: /Class Test/)
+      end
     end
   end
 

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

@@ -127,11 +127,7 @@ Capybara::SpecHelper.spec '#has_text?' do
         def to_hash; { value: 'Other hash' } end
       end.new
       @session.visit('/with_html')
-      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
+      expect(@session).to have_text(:visible, with_to_hash, **{})
     end
   end
 
@@ -157,16 +153,12 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text(42)
   end
 
-  it 'should be true when passed nil' do
+  it 'should be true when passed nil, and warn about it' do
     # nil is converted to '' when to_s is invoked
     @session.visit('/with_html')
-    expect(@session).to have_text(nil)
-  end
-
-  it 'should warn when passed nil' do
-    @session.visit('/with_html')
-    expect_any_instance_of(Kernel).to receive(:warn).with(/Checking for expected text of nil is confusing/) # rubocop:disable RSpec/AnyInstance
-    expect(@session).to have_text(nil)
+    expect do
+      expect(@session).to have_text(nil)
+    end.to output(/Checking for expected text of nil is confusing/).to_stderr
   end
 
   it 'should wait for text to appear', requires: [:js] do
@@ -356,7 +348,7 @@ Capybara::SpecHelper.spec '#has_no_text?' do
     expect(@session).to have_no_text(/xxxxyzzz/)
   end
 
-  it 'should be false if the text in the page  matches given regexp' do
+  it 'should be false if the text in the page matches given regexp' do
     @session.visit('/with_html')
     expect(@session).not_to have_no_text(/Lorem/)
   end

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

@@ -23,6 +23,7 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
     expect(@session.find(:css, '#first').matches_style?(display: /^in/)).to be false
   end
 
+  # rubocop:disable Capybara/MatchStyle
   it 'deprecated has_style?' do
     expect { have_style(display: /^bl/) }.to \
       output(/have_style is deprecated/).to_stderr
@@ -32,4 +33,5 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
     el.has_style?('display' => /^bl/)
     expect(Capybara::Helpers).to have_received(:warn)
   end
+  # rubocop:enable Capybara/MatchStyle
 end

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

@@ -157,6 +157,12 @@ Capybara::SpecHelper.spec 'node' do
         expect(@session.find(:css, '#existing_content_editable_child_parent').text).to eq("Some content\nWYSIWYG")
       end
     end
+
+    it 'should submit single text input forms if ended with \n' do
+      @session.visit('/form')
+      @session.find(:css, '#single_input').set("my entry\n")
+      expect(extract_results(@session)['single_input']).to eq('my entry')
+    end
   end
 
   describe '#tag_name' do
@@ -651,6 +657,16 @@ Capybara::SpecHelper.spec 'node' do
           expect(target).to have_text(%r{^HTML5 Dropped string: text/plain drag_html5-#{key}$}m, exact: true)
         end
       end
+
+      it 'should trigger a dragenter event, before the first dragover event' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+
+        # Events are listed in reverse chronological order
+        expect(@session).to have_text(/DragOver.*DragEnter/m)
+      end
     end
   end
 
@@ -775,6 +791,7 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'should allow to adjust the click offset', requires: [:js] do
+      Capybara.w3c_click_offset = false
       @session.visit('with_js')
       @session.find(:css, '#click-test').click(x: 5, y: 5)
       link = @session.find(:link, 'has-been-clicked')
@@ -901,6 +918,7 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'should allow to adjust the offset', requires: [:js] do
+      Capybara.w3c_click_offset = false
       @session.visit('with_js')
       @session.find(:css, '#click-test').double_click(x: 10, y: 5)
       link = @session.find(:link, 'has-been-double-clicked')
@@ -987,6 +1005,7 @@ Capybara::SpecHelper.spec 'node' do
     end
 
     it 'should allow to adjust the offset', requires: [:js] do
+      Capybara.w3c_click_offset = false
       @session.visit('with_js')
       @session.find(:css, '#click-test').right_click(x: 10, y: 10)
       link = @session.find(:link, 'has-been-right-clicked')
@@ -1115,7 +1134,7 @@ Capybara::SpecHelper.spec 'node' do
   end
 
   describe '#evaluate_script', requires: %i[js es_args] do
-    it 'should evaluate the given script in the context of the element and  return whatever it produces' do
+    it 'should evaluate the given script in the context of the element and return whatever it produces' do
       @session.visit('/with_js')
       el = @session.find(:css, '#with_change_event')
       expect(el.evaluate_script('this.value')).to eq('default value')
@@ -1176,6 +1195,68 @@ Capybara::SpecHelper.spec 'node' do
     end
   end
 
+  describe '#shadow_root', requires: %i[js] do
+    it 'should get the shadow root' do
+      @session.visit('/with_shadow')
+      expect do
+        shadow_root = @session.find(:css, '#shadow_host').shadow_root
+        expect(shadow_root).to be_a(Capybara::Node::Element)
+      end.not_to raise_error
+    end
+
+    it 'should find elements inside the shadow dom using CSS' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect(shadow_root).to have_css('#shadow_content', text: 'some text')
+    end
+
+    it 'should find nested shadow roots' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      nested_shadow_root = shadow_root.find(:css, '#nested_shadow_host').shadow_root
+      expect(nested_shadow_root).to have_css('#nested_shadow_content', text: 'nested text')
+    end
+
+    it 'should click on elements' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      checkbox = shadow_root.find(:css, 'input[type="checkbox"]')
+      expect(checkbox).not_to be_checked
+      checkbox.click
+      expect(checkbox).to be_checked
+    end
+
+    it 'should use convenience methods once moved to a descendant of the shadow root' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      descendant = shadow_root.find(:css, '#controls_wrapper')
+      expect do
+        descendant.check('shadow_checkbox')
+      end.not_to raise_error
+      expect(descendant).to have_checked_field('shadow_checkbox')
+    end
+
+    it 'should produce error messages when failing' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect do
+        expect(shadow_root).to have_css('#shadow_content', text: 'Not in the document')
+      end.to raise_error(/tag="ShadowRoot"/)
+    end
+
+    it 'should get visible text' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect(shadow_root).to have_text('some text scroll.html')
+    end
+
+    it 'should get all text' do
+      @session.visit('/with_shadow')
+      shadow_root = @session.find(:css, '#shadow_host').shadow_root
+      expect(shadow_root).to have_text(:all, 'some text scroll.html')
+    end
+  end
+
   describe '#reload', requires: [:js] do
     it 'should reload elements found via ancestor with CSS' do
       @session.visit('/with_js')

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

@@ -95,6 +95,19 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session.windows.size).to eq 1
   end
 
+  it 'does not block opening a new window after a frame was switched to and not switched back', requires: [:windows] do
+    @session.visit('/with_iframe?id=test_iframe&url=/')
+    @session.switch_to_frame(@session.find(:frame, 'test_iframe'))
+    within_window_test = lambda do
+      @session.within_window(@session.open_new_window) do
+        @session.visit('/')
+      end
+    end
+    expect(&within_window_test).to raise_error(Capybara::ScopeError)
+    @session.reset_session!
+    expect(&within_window_test).not_to raise_error
+  end
+
   context 'When reuse_server == false' do
     let!(:orig_reuse_server) { Capybara.reuse_server }
 

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

@@ -15,7 +15,7 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
     el = @session.find(:css, '#scroll')
     @session.scroll_to(el, align: :bottom)
     el_bottom = el.evaluate_script('this.getBoundingClientRect().bottom')
-    viewport_bottom = el.evaluate_script('document.body.clientHeight')
+    viewport_bottom = el.evaluate_script('document.documentElement.clientHeight')
     expect(el_bottom).to be_within(1).of(viewport_bottom)
   end
 
@@ -23,7 +23,7 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
     el = @session.find(:css, '#scroll')
     @session.scroll_to(el, align: :center)
     el_center = el.evaluate_script('(function(rect){return (rect.top + rect.bottom)/2})(this.getBoundingClientRect())')
-    viewport_bottom = el.evaluate_script('document.body.clientHeight')
+    viewport_bottom = el.evaluate_script('document.documentElement.clientHeight')
     expect(el_center).to be_within(2).of(viewport_bottom / 2)
   end
 
@@ -35,13 +35,15 @@ Capybara::SpecHelper.spec '#scroll_to', requires: [:scroll] do
 
   it 'can scroll the window to the vertical bottom' do
     @session.scroll_to :bottom
-    max_scroll = @session.evaluate_script('document.body.scrollHeight - document.body.clientHeight')
-    expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll]
+    max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.documentElement.clientHeight')
+    scrolled_location_x, scrolled_location_y = @session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')
+    expect(scrolled_location_x).to be_within(0.5).of(0)
+    expect(scrolled_location_y).to be_within(0.5).of(max_scroll)
   end
 
   it 'can scroll the window to the vertical center' do
     @session.scroll_to :center
-    max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.body.clientHeight')
+    max_scroll = @session.evaluate_script('document.documentElement.scrollHeight - document.documentElement.clientHeight')
     expect(@session.evaluate_script('[window.scrollX || window.pageXOffset, window.scrollY || window.pageYOffset]')).to eq [0, max_scroll / 2]
   end
 

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

@@ -201,4 +201,24 @@ Capybara::SpecHelper.spec '#visit' do
     @session.visit('/get_cookie')
     expect(@session).to have_content('root cookie')
   end
+
+  context 'with base element' do
+    it 'should use base href with relative links' do
+      @session.visit('/base/with_base')
+      @session.click_link('Title page')
+      expect(@session).to have_current_path('/with_title')
+    end
+
+    it 'should use base href with bare queries' do
+      @session.visit('/base/with_base')
+      @session.click_link('Bare query')
+      expect(@session).to have_current_path('/?a=3')
+    end
+
+    it 'should not use the base href with a new visit call' do
+      @session.visit('/base/with_other_base')
+      @session.visit('with_html')
+      expect(@session).to have_current_path('/with_html')
+    end
+  end
 end

data/lib/capybara/spec/session/window/window_spec.rb

@@ -59,7 +59,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
     it 'should return false if window is closed' do
       @session.switch_to_window(other_window)
       other_window.close
-      expect(other_window.current?).to eq(false)
+      expect(other_window.current?).to be(false)
     end
   end
 

data/lib/capybara/spec/session/window/windows_spec.rb

@@ -29,6 +29,6 @@ Capybara::SpecHelper.spec '#windows', requires: [:windows] do
     titles = @session.windows.map do |window|
       @session.within_window(window) { @session.title }
     end
-    expect(titles).to match_array(['With Windows', 'Title of the first popup', 'Title of popup two'])
+    expect(titles).to match_array(['With Windows', 'Title of the first popup', 'Title of popup two']) # rubocop:disable RSpec/MatchArray
   end
 end

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

@@ -49,6 +49,19 @@ Capybara::SpecHelper.spec '#within' do
         expect { @session.text }.to raise_error(StandardError)
       end
     end
+
+    it 'should pass scope element to the block' do
+      @session.within(:css, '#another_foo') do |scope|
+        expect(scope).to match_css('#another_foo')
+      end
+    end
+
+    it 'should scope click', requires: [:js] do
+      @session.within(:css, '#another_foo') do |scope|
+        @session.click
+        expect(scope).to have_text('I was clicked')
+      end
+    end
   end
 
   context 'with XPath selector' do

data/lib/capybara/spec/spec_helper.rb

@@ -24,6 +24,7 @@ module Capybara
         Capybara.app_host = nil
         Capybara.default_selector = :xpath
         Capybara.default_max_wait_time = 1
+        Capybara.default_retry_interval = 0.01
         Capybara.ignore_hidden_elements = true
         Capybara.exact = false
         Capybara.raise_server_errors = true
@@ -36,8 +37,8 @@ module Capybara
         Capybara.test_id = nil
         Capybara.predicates_wait = true
         Capybara.default_normalize_ws = false
-        Capybara.allow_gumbo = true
-        Capybara.w3c_click_offset = false
+        Capybara.use_html5_parsing = !ENV['HTML5_PARSING'].nil?
+        Capybara.w3c_click_offset = true
         reset_threadsafe
       end
 
@@ -117,8 +118,14 @@ module Capybara
 
     def extract_results(session)
       expect(session).to have_xpath("//pre[@id='results']")
-      # YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
-      YAML.load Capybara::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
+      perms = [(::Sinatra::IndifferentHash if defined? ::Sinatra::IndifferentHash)].compact
+      results = Capybara::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
+      YAML.safe_load results, permitted_classes: perms
+    end
+
+    def extract_content_type(session)
+      expect(session).to have_xpath("//pre[@id='content_type']")
+      Capybara::HTML(session.body).xpath("//pre[@id='content_type']").first.text
     end
 
     def be_an_invalid_element_error(session)
@@ -131,4 +138,4 @@ module Capybara
   end
 end
 
-Dir["#{File.dirname(__FILE__)}/session/**/*.rb"].each { |file| require_relative file }
+Dir["#{File.dirname(__FILE__)}/session/**/*.rb"].sort.each { |file| require_relative file }