capybara 3.35.3 → 3.36.0

data/lib/capybara/selenium/driver.rb

@@ -43,7 +43,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
           Gem::Version.new(Selenium::WebDriver::VERSION)
         end
 
-      unless Gem::Requirement.new('>= 3.5.0').satisfied_by? @selenium_webdriver_version
+      unless Gem::Requirement.new('>= 3.142.7').satisfied_by? @selenium_webdriver_version
         warn "Warning: You're using an unsupported version of selenium-webdriver, please upgrade."
       end
 
@@ -148,8 +148,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     unwrap_script_result(result)
   end
 
+  def active_element
+    build_node(native_active_element)
+  end
+
   def send_keys(*args)
-    active_element.send_keys(*args)
+    # Should this call the specialized nodes rather than native???
+    native_active_element.send_keys(*args)
   end
 
   def save_screenshot(path, **_options)
@@ -249,7 +254,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def open_new_window(kind = :tab)
-    browser.manage.new_window(kind)
+    if browser.switch_to.respond_to?(:new_window)
+      handle = current_window_handle
+      browser.switch_to.new_window(kind)
+      switch_to_window(handle)
+    else
+      browser.manage.new_window(kind)
+    end
   rescue NoMethodError, Selenium::WebDriver::Error::WebDriverError
     # If not supported by the driver or browser default to using JS
     browser.execute_script('window.open();')
@@ -293,7 +304,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    @invalid_element_errors ||= begin
+    @invalid_element_errors ||=
       [
         ::Selenium::WebDriver::Error::StaleElementReferenceError,
         ::Selenium::WebDriver::Error::ElementNotInteractableError,
@@ -313,7 +324,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
           end
         end
       end
-    end
   end
 
   def no_such_window_error
@@ -330,6 +340,10 @@ private
     args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg }
   end
 
+  def native_active_element
+    browser.switch_to.active_element
+  end
+
   def clear_browser_state
     delete_all_cookies
     clear_storage
@@ -475,10 +489,6 @@ private
     browser
   end
 
-  def active_element
-    browser.switch_to.active_element
-  end
-
   def build_node(native_node, initial_cache = {})
     ::Capybara::Selenium::Node.new(self, native_node, initial_cache)
   end

data/lib/capybara/selenium/driver_specializations/chrome_driver.rb

@@ -38,7 +38,7 @@ module Capybara::Selenium::Driver::ChromeDriver
     return unless @browser
 
     switch_to_window(window_handles.first)
-    window_handles.slice(1..-1).each { |win| close_window(win) }
+    window_handles.slice(1..).each { |win| close_window(win) }
     return super if chromedriver_version < 73
 
     timer = Capybara::Helpers.timer(expire_in: 10)

data/lib/capybara/selenium/driver_specializations/edge_driver.rb

@@ -39,7 +39,7 @@ module Capybara::Selenium::Driver::EdgeDriver
     return unless @browser
 
     switch_to_window(window_handles.first)
-    window_handles.slice(1..-1).each { |win| close_window(win) }
+    window_handles.slice(1..).each { |win| close_window(win) }
 
     timer = Capybara::Helpers.timer(expire_in: 10)
     begin

data/lib/capybara/selenium/driver_specializations/firefox_driver.rb

@@ -52,7 +52,7 @@ module Capybara::Selenium::Driver::W3CFirefoxDriver
     end
 
     switch_to_window(window_handles.first)
-    window_handles.slice(1..-1).each { |win| close_window(win) }
+    window_handles.slice(1..).each { |win| close_window(win) }
     super
   end
 

data/lib/capybara/selenium/node.rb

@@ -14,7 +14,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def all_text
-    text = driver.evaluate_script('arguments[0].textContent', self)
+    text = driver.evaluate_script('arguments[0].textContent', self) || ''
     text.gsub(/[\u200b\u200e\u200f]/, '')
         .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
         .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
@@ -199,10 +199,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.attribute('isContentEditable') == 'true'
   end
 
-  def ==(other)
-    native == other.native
-  end
-
   def path
     driver.evaluate_script GET_XPATH_SCRIPT, self
   end
@@ -274,7 +270,7 @@ private
     elsif clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      send_keys(*([:end] + backspaces + [value]))
+      send_keys(:end, *backspaces, value)
     elsif clear.is_a? Array
       send_keys(*clear, value)
     else
@@ -282,7 +278,7 @@ private
       if rapid == true || ((value.length > auto_rapid_set_length) && rapid != false)
         send_keys(value[0..3])
         driver.execute_script RAPID_APPEND_TEXT, self, value[4...-3]
-        send_keys(value[-3..-1])
+        send_keys(value[-3..])
       else
         send_keys(value)
       end
@@ -298,7 +294,7 @@ private
 
     scroll_if_needed do
       action_with_modifiers(click_options) do |action|
-        if block_given?
+        if block
           yield action
         else
           click_options.coords? ? action.click : action.click(native)
@@ -488,6 +484,12 @@ private
     JS
   end
 
+  def native_id
+    # Selenium 3 -> 4 changed the return of ref
+    type_or_id, id = native.ref
+    id || type_or_id
+  end
+
   GET_XPATH_SCRIPT = <<~'JS'
     (function(el, xml){
       var xpath = '';

data/lib/capybara/selenium/nodes/chrome_node.rb

@@ -65,7 +65,7 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     return super unless native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

data/lib/capybara/selenium/nodes/edge_node.rb

@@ -69,7 +69,7 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
     return super unless chrome_edge? && native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

data/lib/capybara/selenium/nodes/firefox_node.rb

@@ -76,7 +76,7 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     return super unless native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

data/lib/capybara/selenium/nodes/safari_node.rb

@@ -14,7 +14,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
       warn 'You are attempting to click a table row which has issues in safaridriver - '\
            'Your test should probably be clicking on a table cell like a user would. '\
            'Clicking the first cell in the row instead.'
-      return find_css('th:first-child,td:first-child')[0].click(keys, options)
+      return find_css('th:first-child,td:first-child')[0].click(keys, **options)
     end
     raise
   rescue ::Selenium::WebDriver::Error::WebDriverError => e
@@ -74,7 +74,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
     if clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      send_keys(*([[:control, 'e']] + backspaces + [value]))
+      send_keys([:control, 'e'], *backspaces, value)
     else
       super.tap do
         # React doesn't see the safaridriver element clear

data/lib/capybara/server/animation_disabler.rb

@@ -16,7 +16,10 @@ module Capybara
 
       def initialize(app)
         @app = app
-        @disable_markup = format(DISABLE_MARKUP_TEMPLATE, selector: self.class.selector_for(Capybara.disable_animation))
+        @disable_css_markup = format(DISABLE_CSS_MARKUP_TEMPLATE,
+                                     selector: self.class.selector_for(Capybara.disable_animation))
+        @disable_js_markup = format(DISABLE_JS_MARKUP_TEMPLATE,
+                                    selector: self.class.selector_for(Capybara.disable_animation))
       end
 
       def call(env)
@@ -33,22 +36,17 @@ module Capybara
 
     private
 
-      attr_reader :disable_markup
+      attr_reader :disable_css_markup, :disable_js_markup
 
       def html_content?
         /html/.match?(@headers['Content-Type'])
       end
 
       def insert_disable(html)
-        html.sub(%r{(</body>)}, "#{disable_markup}\\1")
+        html.sub(%r{(</head>)}, "#{disable_css_markup}\\1").sub(%r{(</body>)}, "#{disable_js_markup}\\1")
       end
 
-      DISABLE_MARKUP_TEMPLATE = <<~HTML
-        <script>
-        //<![CDATA[
-          (typeof jQuery !== 'undefined') && (jQuery.fx.off = true);
-        //]]>
-        </script>
+      DISABLE_CSS_MARKUP_TEMPLATE = <<~HTML
         <style>
           %<selector>s, %<selector>s::before, %<selector>s::after {
              transition: none !important;
@@ -58,6 +56,14 @@ module Capybara
           }
         </style>
       HTML
+
+      DISABLE_JS_MARKUP_TEMPLATE = <<~HTML
+        <script>
+        //<![CDATA[
+          (typeof jQuery !== 'undefined') && (jQuery.fx.off = true);
+        //]]>
+        </script>
+      HTML
     end
   end
 end

data/lib/capybara/session.rb

@@ -311,6 +311,16 @@ module Capybara
       driver.send_keys(*args, **kw_args)
     end
 
+    ##
+    #
+    # Returns the element with focus.
+    #
+    # Not supported by Rack Test
+    #
+    def active_element
+      Capybara::Queries::ActiveElementQuery.new.resolve_for(self)[0].tap(&:allow_reload!)
+    end
+
     ##
     #
     # Executes the given block within the context of a node. {#within} takes the
@@ -408,11 +418,11 @@ module Capybara
         idx = scopes.index(:frame)
         top_level_scopes = [:frame, nil]
         if idx
-          if scopes.slice(idx..-1).any? { |scope| !top_level_scopes.include?(scope) }
+          if scopes.slice(idx..).any? { |scope| !top_level_scopes.include?(scope) }
             raise Capybara::ScopeError, "`switch_to_frame(:top)` cannot be called from inside a descendant frame's "\
                                         '`within` block.'
           end
-          scopes.slice!(idx..-1)
+          scopes.slice!(idx..)
           driver.switch_to_frame(:top)
         end
       else

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#active_element', requires: [:active_element] do
+  it 'should return the active element' do
+    @session.visit('/form')
+    @session.send_keys(:tab)
+
+    expect(@session.active_element).to match_selector(:css, '[tabindex="1"]')
+
+    @session.send_keys(:tab)
+
+    expect(@session.active_element).to match_selector(:css, '[tabindex="2"]')
+  end
+
+  it 'should support reloading' do
+    @session.visit('/form')
+    expect(@session.active_element).to match_selector(:css, 'body')
+    @session.execute_script <<-JS
+      window.setTimeout(() => {
+        document.querySelector('#form_title').focus();
+      }, 1000)
+    JS
+    expect(@session.active_element).to match_selector(:css, 'body', wait: false)
+    expect(@session.active_element).to match_selector(:css, '#form_title', wait: 2)
+  end
+
+  it 'should return a Capybara::Element' do
+    @session.visit('/form')
+    expect(@session.active_element).to be_a Capybara::Node::Element
+  end
+end

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

@@ -203,12 +203,10 @@ Capybara::SpecHelper.spec '#all' do
         expect { @session.all(:css, 'h1, p', between: 0..3) }.to raise_error(Capybara::ExpectationNotMet)
       end
 
-      eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
-        it'treats an endless range as minimum' do
-          expect { @session.all(:css, 'h1, p', between: 2..) }.not_to raise_error
-          expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
-        end
-      TEST
+      it 'treats an endless range as minimum' do
+        expect { @session.all(:css, 'h1, p', between: 2..) }.not_to raise_error
+        expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
+      end
 
       eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
         it'treats a beginless range as maximum' do

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

@@ -236,6 +236,15 @@ Capybara::SpecHelper.spec '#check' do
           expect(@session).to have_field('multi_label_checkbox', checked: true, visible: :hidden)
         end
       end
+
+      context 'with allow_label_click options', requires: [:js] do
+        it 'should allow offsets to click location on label' do
+          expect(@session.find(:checkbox, 'form_cars_lotus', unchecked: true, visible: :hidden)).to be_truthy
+          @session.check('form_cars_lotus', allow_label_click: { x: 90, y: 10 })
+          @session.click_button('awesome')
+          expect(extract_results(@session)['cars']).to include('lotus')
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,12 @@ Capybara::SpecHelper.spec '#choose' do
     expect(extract_results(@session)['gender']).to eq('male')
   end
 
+  it 'ignores readonly attribute on radio buttons' do
+    @session.choose('gender_both')
+    @session.click_button('awesome')
+    expect(extract_results(@session)['gender']).to eq('both')
+  end
+
   it 'should choose a radio button by label' do
     @session.choose('Both')
     @session.click_button('awesome')

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

@@ -22,4 +22,8 @@ Capybara::SpecHelper.spec '#have_any_of_selectors' do
       expect(@session).to have_any_of_selectors('p a#blah', 'h2#h2three')
     end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
   end
+
+  it 'should be negateable' do
+    expect(@session).not_to have_any_of_selectors(:css, 'span a#foo', 'h2#h2nope', 'h2#h2one_no')
+  end
 end

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

@@ -65,6 +65,18 @@ Capybara::SpecHelper.spec '#has_button?' do
   it 'should not affect other selectors when enable_aria_role: false' do
     expect(@session).to have_button('Click me!', enable_aria_role: false)
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a field has focus when focused: true' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_button('A Button', focused: true)
+    end
+
+    it 'should be true if a field does not have focus when focused: false' do
+      expect(@session).to have_button('A Button', focused: false)
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do
@@ -117,4 +129,16 @@ Capybara::SpecHelper.spec '#has_no_button?' do
   it 'should not affect other selectors when enable_aria_role: false' do
     expect(@session).to have_no_button('Junk button that does not exist', enable_aria_role: false)
   end
+
+  context 'with focused:', requires: [:active_element] do
+    it 'should be true if a button does not have focus when focused: true' do
+      expect(@session).to have_no_button('A Button', focused: true)
+    end
+
+    it 'should be false if a button has focus when focused: false' do
+      @session.send_keys(:tab)
+
+      expect(@session).to have_no_button('A Button', focused: false)
+    end
+  end
 end

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

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

@@ -18,6 +18,18 @@ Capybara::SpecHelper.spec '#has_link?' do
     expect(@session).not_to have_link('A link', href: '/nonexistent-href')
     expect(@session).not_to have_link('A link', href: /nonexistent/)
   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
 end
 
 Capybara::SpecHelper.spec '#has_no_link?' do
@@ -36,4 +48,16 @@ Capybara::SpecHelper.spec '#has_no_link?' do
     expect(@session).to have_no_link('A link', href: '/nonexistent-href')
     expect(@session).to have_no_link('A link', href: %r{/nonexistent-href})
   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_text_spec.rb

@@ -356,7 +356,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/node_spec.rb

@@ -1115,7 +1115,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')

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,13 @@ 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')
+    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]
   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/spec_helper.rb

@@ -36,7 +36,7 @@ module Capybara
         Capybara.test_id = nil
         Capybara.predicates_wait = true
         Capybara.default_normalize_ws = false
-        Capybara.allow_gumbo = true
+        Capybara.use_html5_parsing = !ENV['HTML5_PARSING'].nil?
         Capybara.w3c_click_offset = false
         reset_threadsafe
       end
@@ -117,8 +117,9 @@ 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 be_an_invalid_element_error(session)

data/lib/capybara/spec/test_app.rb

@@ -53,8 +53,8 @@ class TestApp < Sinatra::Base
 
   get '/referer_base' do
     '<a href="/get_referer">direct link</a>' \
-    '<a href="/redirect_to_get_referer">link via redirect</a>' \
-    '<form action="/get_referer" method="get"><input type="submit"></form>'
+      '<a href="/redirect_to_get_referer">link via redirect</a>' \
+      '<form action="/get_referer" method="get"><input type="submit"></form>'
   end
 
   get '/redirect_to_get_referer' do
@@ -163,21 +163,30 @@ class TestApp < Sinatra::Base
 
   get '/with_title' do
     <<-HTML
-      <title>#{params[:title] || 'Test Title'}</title>
-      <body>
-        <svg><title>abcdefg</title></svg>
-      </body>
+      <!DOCTYPE html>
+      <html lang="en">
+        <head>
+          <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+          <title>#{params[:title] || 'Test Title'}</title>
+        </head>
+
+        <body>
+          <svg><title>abcdefg</title></svg>
+        </body>
+      </html>
     HTML
   end
 
   get '/download.csv' do
     content_type 'text/csv'
     'This, is, comma, separated' \
-    'Thomas, Walpole, was , here'
+      'Thomas, Walpole, was , here'
   end
 
   get '/:view' do |view|
-    erb view.to_sym, locals: { referrer: request.referrer }
+    view_template = "#{__dir__}/views/#{view}.erb"
+    has_layout = File.exist?(view_template) && File.open(view_template) { |f| f.first.downcase.include?('doctype') }
+    erb view.to_sym, locals: { referrer: request.referrer }, layout: !has_layout
   end
 
   post '/form' do

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -46,4 +47,3 @@
 
   <iframe id="frameOne" src="/frame_one"></iframe>
 </html>
-