capybara 3.35.0 → 3.40.0

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
 
@@ -71,7 +72,7 @@ module Capybara
             session.reset_session!
           end
 
-          before :each, psc: true do
+          before :each, :psc do
             SpecHelper.reset_threadsafe(bool: true, session: session)
           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)

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,31 +163,112 @@ 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 '/with_iframe' do
+    <<-HTML
+      <!DOCTYPE html>
+      <html lang="en">
+        <head>
+          <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+          <title>Test with Iframe</title>
+        </head>
+
+        <body>
+          <iframe src="#{params[:url]}" id="#{params[:id]}"></iframe>
+        </body>
+      </html>
+    HTML
+  end
+
+  get '/base/with_base' do
+    <<-HTML
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <base href="/">
+          <title>Origin</title>
+        </head>
+        <body>
+          <a href="with_title">Title page</a>
+          <a href="?a=3">Bare query</a>
+        </body>
+      </html>
+    HTML
+  end
+
+  get '/base/with_other_base' do
+    <<-HTML
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <base href="/base/">
+          <title>Origin</title>
+        </head>
+        <body>
+          <a href="with_title">Title page</a>
+          <a href="?a=3">Bare query</a>
+        </body>
+      </html>
+    HTML
+  end
+
+  get '/csp' do
+    response.headers['Content-Security-Policy'] = "default-src 'none'; connect-src 'self'; base-uri 'none'; font-src 'self'; img-src 'self' data:; object-src 'none'; script-src 'self' 'nonce-jAviMuMisoTisVXjgLoWdA=='; style-src 'self' 'nonce-jAviMuMisoTisVXjgLoWdA=='; form-action 'self';"
+    <<-HTML
+      <!DOCTYPE html>
+      <html lang="en">
+        <head>
+          <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+          <title>CSP</title>
+        </head>
+
+        <body>
+          <div>CSP</div>
+        </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 %r{/apple-touch-.*\.png/} do
+    halt(404)
   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
     self.class.form_post_count += 1
-    %(<pre id="results">#{params[:form].merge('post_count' => self.class.form_post_count).to_yaml}</pre>)
+    %(
+      <pre id="content_type">#{request.content_type}</pre>
+      <pre id="results">#{params.fetch(:form, {}).merge('post_count' => self.class.form_post_count).to_yaml}</pre>
+    )
   end
 
   post '/upload_empty' do
     if params[:form][:file].nil?
-      'Successfully ignored empty file field.'
+      "Successfully ignored empty file field. Content type was #{request.content_type}"
     else
       'Something went wrong.'
     end
@@ -214,10 +295,6 @@ class TestApp < Sinatra::Base
     'No files uploaded'
   end
 
-  get '/apple-touch-icon-precomposed.png' do
-    halt(404)
-  end
-
   class << self
     attr_accessor :form_post_count
   end

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>
-

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

@@ -1,11 +1,17 @@
-
 <h1>Form</h1>
 
+<button type="button" tabindex="1">A Button</button>
+
+<label>
+  An Input
+  <input type="text" tabindex="2">
+</label>
+
 <form action="/form" method="post" novalidate>
 
   <p>
     <label for="form_title">Title</label>
-    <select name="form[title]" id="form_title" class="title">
+    <select name="form[title]" id="form_title" class="title" tabindex="3">
       <option class="title">Mrs</option>
       <option class="title">Mr</option>
       <option>Miss</option>
@@ -170,7 +176,7 @@ New line after and before textarea tag
     <label for="gender_male">Male</label>
     <input type="radio" name="form[gender]" value="female" id="gender_female" checked="checked"/>
     <label for="gender_female">Female</label>
-    <input type="radio" name="form[gender]" value="both" id="gender_both"/>
+    <input type="radio" name="form[gender]" value="both" id="gender_both" readonly="readonly"/>
     <label for="gender_both">Both</label>
   </p>
 
@@ -223,6 +229,8 @@ New line after and before textarea tag
     </label>
     <input type="checkbox" value="maserati" name="form[cars][]" id="form_cars_maserati" disabled="disabled"/>
     <label for="form_cars_maserati">Maserati</label>
+    <input type="checkbox" value="lotus" name="form[cars][]" id="form_cars_lotus" style="display: none"/>
+    <label for="form_cars_lotus"><a href="#" onclick="return false;">Link here</a>Lotus</label>
   </p>
 
   <p>
@@ -449,7 +457,7 @@ New line after and before textarea tag
 
   <p>
     <input type="button" aria-label="Aria button" name="form[fresh]" id="fresh_btn" value="i am fresh"/>
-    <input type="submit" name="form[awesome]" id="awe123" title="What an Awesome Button" value="awesome"/>
+    <input type="submit" name="form[awesome]" id="awe123" data-test-id="test_id_button" title="What an Awesome Button" value="awesome"/>
     <input type="submit" name="form[crappy]" id="crap321" value="crappy"/>
     <input type="image" name="form[okay]" id="okay556" title="Okay 556 Image" value="okay" alt="oh hai thar"/>
     <button type="submit" id="click_me_123" title="Click Title button" value="click_me">Click me!</button>
@@ -578,6 +586,19 @@ New line after and before textarea tag
   <p>
 </form>
 
+<form action="/form" method="post" enctype="multipart/form-data">
+  <input type="hidden" name="form[document2]" value="hidden_field"/>
+
+  <p>
+    <label for="form_document">Document with hidden</label>
+    <input type="file" name="form[document2]" id="form_document2"/>
+  </p>
+
+  <p>
+    <input type="submit" value="Upload Empty With Hidden"/>
+  <p>
+</form>
+
 <form action="/upload_multiple" method="post" enctype="multipart/form-data">
   <p>
     <label for="form_multiple_file_name">File Name</label>
@@ -674,6 +695,15 @@ New line after and before textarea tag
   </p>
 </form>
 
+<form id="single_input_form" action="/form" method="post">
+  <input type="text" name="form[single_input]" id="single_input"/>
+</form>
+
+<form id="two_input_form" action="/form" method="post">
+  <input type="text" name="form[two_input_1]" id="two_input_1"/>
+  <input type="text" name="form[two_input_2]" id="two_input_2"/>
+</form>
+
 <label>Confusion
   <input type="checkbox" id="confusion_checkbox" class="confusion-checkbox confusion"/>
 </label>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>This is the child frame title</title>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>This is the title of frame one</title>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>This is the parent frame title</title>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>This is the title of frame two</title>

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

@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <body>
     <div>
       Initial alert page

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

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -44,4 +45,3 @@
     </div>
   </body>
 </html>
-

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -29,4 +30,4 @@
       <div id="clicker"></div>
     </div>
   </body>
-  </html>
+  </html>

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

@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <body>
     <div>
       <a href="#">First Link</a>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>Title of the first popup</title>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
     <head>
         <title>Title of popup two</title>

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

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <script src="https://unpkg.com/react/umd/react.development.js"></script>
@@ -42,4 +42,4 @@
         document.getElementById('root'));
     </script>
   </body>
-</html>
+</html>

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html style="height: 250%; width: 150%">
   <head>
     <style>
@@ -17,4 +18,4 @@
     </div>
   </div>
   </body>
-</html>
+</html>

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
@@ -28,4 +29,3 @@
     <div class="footer distance">10</div>
   </body>
 </html>
-

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

@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_animation</title>
@@ -79,4 +79,3 @@
     </a>
   </body>
 </html>
-

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

@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <base href="http://example2.com" />

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

@@ -1,4 +1,5 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_dragula</title>
@@ -21,4 +22,3 @@
     </script>
   </body>
 </html>
-

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <style>
@@ -14,4 +15,4 @@
       <a href="/">Go to root</a>
     </div>
   <footer>My footer</footer>
-</body>
+</body>

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

@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_hover</title>

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

@@ -19,7 +19,7 @@
 
 <p class="para" id="first" data-random="abc\def" style="line-height: 25px;">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-  tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple">labore</a>
+  tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple" tabindex="1" target="_self">labore</a>
   et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation <a href="/foo" id="foo" data-test-id="test-foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.
@@ -88,7 +88,7 @@ banana</textarea>
 </div>
 
 <div style="display: none;">
-  <a id="first_invisble" class="hidden">first hidden link</a>
+  <a id="first_invisible" class="hidden">first hidden link</a>
 </div>
 
 <div style="display: none;">
@@ -138,7 +138,7 @@ banana</textarea>
       Ancestor
       <div id="child">Child</div>
     </div>
-    <div id="ancestor1_sibiling">
+    <div id="ancestor1_sibling">
       ASibling
     </div>
   </div>
@@ -200,6 +200,8 @@ banana</textarea>
   </div>
 </details>
 
+<div style='height: 1000px'>spacer</div>
+
 <template id="template">
   <input />
 </template>

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

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

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

@@ -1,5 +1,5 @@
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_js</title>
@@ -160,4 +160,3 @@
     </script>
   </body>
 </html>
-

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

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Namespace</title>

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

@@ -35,8 +35,8 @@
   </ul>
 </div>
 
-<div id="another_foo">
+<div id="another_foo" onclick="this.innerHTML = 'I was clicked';">
   <ul>
-    <li>With Simple HTML: <a href="/">Go</a>
+    <li>With Simple HTML: <a href="/">Go</a></li>
   </ul>
 </div>

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

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<%# Borrowed from Titus Fortner %>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Shadow DOM</title>
+  </head>
+  <body>
+    <div id="no_host"></div>
+    <div id="shadow_host"></div>
+    <a href="scroll.html">scroll.html</a>
+    <script>
+      let shadowRoot = document.getElementById('shadow_host').attachShadow({mode: 'open'});
+      shadowRoot.innerHTML = `
+              <span class="wrapper" id="shadow_content"><span class="info">some text</span></span>
+              <div id="nested_shadow_host"></div>
+              <a href="scroll.html">scroll.html</a>
+	  		  <div id="controls_wrapper">
+                <input type="text" />
+                <input type="checkbox" id="shadow_checkbox" />
+                <input type="file" />
+	 		  </div>
+            `;
+
+      let nestedShadowRoot = shadowRoot.getElementById('nested_shadow_host').attachShadow({mode: 'open'});
+      nestedShadowRoot.innerHTML = `
+              <div id="nested_shadow_content"><div>nested text</div></div>
+            `;
+    </script>
+  </body>
+</html>

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

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
   <script>
@@ -14,4 +15,4 @@
 <body>
   <div>This delays unload by 2 seconds</div>
 </body>
-</html>
+</html>