capybara 3.3.1 → 3.4.0

data/lib/capybara/spec/test_app.rb

@@ -57,7 +57,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/get_referer' do
-    request.referer.nil? ? "No referer" : "Got referer: #{request.referer}"
+    request.referer.nil? ? 'No referer' : "Got referer: #{request.referer}"
   end
 
   get '/host' do
@@ -67,14 +67,14 @@ class TestApp < Sinatra::Base
   get '/redirect/:times/times' do
     times = params[:times].to_i
     if times.zero?
-      "redirection complete"
+      'redirection complete'
     else
       redirect "/redirect/#{times - 1}/times"
     end
   end
 
   get '/landed' do
-    "You landed"
+    'You landed'
   end
 
   post '/landed' do
@@ -101,12 +101,12 @@ class TestApp < Sinatra::Base
     redirect '/redirect_again'
   end
 
-  delete "/delete" do
-    "The requested object was deleted"
+  delete '/delete' do
+    'The requested object was deleted'
   end
 
-  get "/delete" do
-    "Not deleted"
+  get '/delete' do
+    'Not deleted'
   end
 
   get '/redirect_back' do
@@ -141,11 +141,11 @@ class TestApp < Sinatra::Base
   end
 
   get '/error' do
-    raise TestAppError, "some error"
+    raise TestAppError, 'some error'
   end
 
   get '/other_error' do
-    raise TestAppOtherError.new("something", "other error")
+    raise TestAppOtherError.new('something', 'other error')
   end
 
   get '/load_error' do
@@ -166,7 +166,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/download.csv' do
-    content_type "text/csv"
+    content_type 'text/csv'
     'This, is, comma, separated' \
     'Thomas, Walpole, was , here'
   end
@@ -177,7 +177,7 @@ class TestApp < Sinatra::Base
 
   post '/form' do
     @@form_post_count += 1
-    '<pre id="results">' + params[:form].merge("post_count" => @@form_post_count).to_yaml + '</pre>'
+    '<pre id="results">' + params[:form].merge('post_count' => @@form_post_count).to_yaml + '</pre>'
   end
 
   post '/upload_empty' do
@@ -191,23 +191,24 @@ class TestApp < Sinatra::Base
   post '/upload' do
     begin
       buffer = []
-      buffer << "Content-type: #{params[:form][:document][:type]}"
-      buffer << "File content: #{params[:form][:document][:tempfile].read}"
+      buffer << "Content-type: #{params.dig(:form, :document, :type)}"
+      buffer << "File content: #{params.dig(:form, :document, :tempfile).read}"
       buffer.join(' | ')
-    rescue
+    rescue StandardError
       'No file uploaded'
     end
   end
 
   post '/upload_multiple' do
     begin
-      buffer = [params[:form][:multiple_documents].size.to_s]
-      params[:form][:multiple_documents].each do |doc|
+      docs = params.dig(:form, :multiple_documents)
+      buffer = [docs.size.to_s]
+      docs.each do |doc|
         buffer << "Content-type: #{doc[:type]}"
         buffer << "File content: #{doc[:tempfile].read}"
       end
       buffer.join(' | ')
-    rescue
+    rescue StandardError
       'No files uploaded'
     end
   end

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

@@ -195,6 +195,8 @@ New line after and before textarea tag
       Koenigsegg
       <input type="checkbox" value="koenigsegg" name="form[cars][]" id="form_cars_koenigsegg" checked="checked" style="display: none"/>
     </label>
+    <input type="checkbox" value="maserati" name="form[cars][]" id="form_cars_maserati" disabled="disabled"/>
+    <label for="form_cars_maserati">Maserati</label>
   </p>
 
   <p>
@@ -370,7 +372,6 @@ New line after and before textarea tag
     </label>
   </p>
 
-
   <p>
     <label for="form_disabled_file">
       Disabled File
@@ -378,41 +379,38 @@ New line after and before textarea tag
     </label>
   </p>
 
-  <p>
-    <fieldset>
-        <input name="form[enabled_fieldset_child]" id="form_enabled_fieldset_child"/>
-    </fieldset>
-  </p>
+  <fieldset>
+    <input name="form[enabled_fieldset_child]" id="form_enabled_fieldset_child"/>
+  </fieldset>
 
-
-  <p>
-    <fieldset disabled="disabled" id="form_disabled_fieldset">
-      <legend>Disabled Child</legend>
-      <input name="form[disabled_fieldset_child]" id="form_disabled_fieldset_child"/>
-      <select>
-        <option>Disabled Child Option</option>
-      </select>
-    </fieldset>
-
-    <fieldset disabled="disabled">
-      <legend>
-        Nested Disabled
-        <input type="checkbox" name="form[disabled_fieldeset_legend_child]" id="form_disabled_fieldset_legend_child"/>
-      </legend>
+  <fieldset disabled="disabled" id="form_disabled_fieldset">
+    <legend>Disabled Child</legend>
+    <input name="form[disabled_fieldset_child]" id="form_disabled_fieldset_child"/>
+    <select>
+      <option>Disabled Child Option</option>
+    </select>
+  </fieldset>
+
+  <fieldset disabled="disabled">
+    <legend>
+      Nested Disabled
+      <input type="checkbox" name="form[disabled_fieldeset_legend_child]" id="form_disabled_fieldset_legend_child"/>
+    </legend>
+    <legend>
+      Another WLegend
+      <input type="checkbox" name="form[disabled_fieldeset_second_legend_child]" id="form_disabled_fieldset_second_legend_child"/>
+    </legend>
+    <fieldset>
       <legend>
-        Another Legend
-        <input type="checkbox" name="form[disabled_fieldeset_second_legend_child]" id="form_disabled_fieldset_second_legend_child"/>
+        Disabled?
+        <input id="form_disabled_fieldset_descendant_legend_child">
       </legend>
-      <p>
-        <fieldset>
-          <input name="form[disabled_fieldset_descendant]" id="form_disabled_fieldset_descendant"/>
-        </fieldset>
-      </p>
+      <input name="form[disabled_fieldset_descendant]" id="form_disabled_fieldset_descendant"/>
     </fieldset>
-  </p>
+  </fieldset>
 
   <p>
-    <select>
+    <select data-test-id="my_test_id">
       <optgroup label="Level One">
        <option> A.1 </option>
       </optgroup>
@@ -461,7 +459,7 @@ New line after and before textarea tag
 </form>
 
 <form id="form2" action="/form" method="post">
-  <input type="text" name="form[which_form]" value="form2" id="form_which_form"/>
+  <input type="text" name="form[which_form]" value="form2" id="form_which_form2"/>
   <input type="submit" name="form[unused]" value="unused"/>
   <button type="submit" name="form[other_form_button]" value="other_form_button" form="form1">Form1</button>
 </form>

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

@@ -36,9 +36,9 @@
 </p>
 
 <p>
-  <input type="text" id="test_field" value="monkey"/>
+  <input type="text" id="test_field" data-test-id="test_id" value="monkey"/>
   <input type="text" readonly="readonly" value="should not change" />
-  <textarea id="normal">
+  <textarea id="normal" data-other-test-id="test_id">
 banana</textarea>
   <textarea id="additional_newline">
 

data/lib/capybara/version.rb

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

data/spec/basic_node_spec.rb

@@ -46,19 +46,19 @@ RSpec.describe Capybara do
       STRING
     end
 
-    it "allows using matchers" do
+    it 'allows using matchers' do
       expect(string).to have_css('#page')
       expect(string).not_to have_css('#does-not-exist')
     end
 
-    it "allows using custom matchers" do
+    it 'allows using custom matchers' do
       Capybara.add_selector :lifeform do
         xpath { |name| ".//option[contains(.,'#{name}')]" }
       end
-      expect(string).to have_selector(:id, "page")
+      expect(string).to have_selector(:id, 'page')
       expect(string).not_to have_selector(:id, 'does-not-exist')
-      expect(string).to have_selector(:lifeform, "Monkey")
-      expect(string).not_to have_selector(:lifeform, "Gorilla")
+      expect(string).to have_selector(:lifeform, 'Monkey')
+      expect(string).not_to have_selector(:lifeform, 'Gorilla')
     end
 
     it 'allows custom matcher using css' do
@@ -69,72 +69,72 @@ RSpec.describe Capybara do
       expect(string).not_to have_selector(:section, 'section_8')
     end
 
-    it "allows using matchers with text option" do
+    it 'allows using matchers with text option' do
       expect(string).to have_css('h1', text: 'Totally awesome')
       expect(string).not_to have_css('h1', text: 'Not so awesome')
     end
 
-    it "allows finding only visible nodes" do
+    it 'allows finding only visible nodes' do
       expect(string.all(:css, '#secret', visible: true)).to be_empty
       expect(string.all(:css, '#secret', visible: false).size).to eq(1)
     end
 
-    it "allows finding elements and extracting text from them" do
+    it 'allows finding elements and extracting text from them' do
       expect(string.find('//h1').text).to eq('Totally awesome')
     end
 
-    it "allows finding elements and extracting attributes from them" do
+    it 'allows finding elements and extracting attributes from them' do
       expect(string.find('//h1')[:data]).to eq('fantastic')
     end
 
-    it "allows finding elements and extracting the tag name from them" do
+    it 'allows finding elements and extracting the tag name from them' do
       expect(string.find('//h1').tag_name).to eq('h1')
     end
 
-    it "allows finding elements and extracting the path" do
+    it 'allows finding elements and extracting the path' do
       expect(string.find('//h1').path).to eq('/html/body/div/div[1]/h1')
     end
 
-    it "allows finding elements and extracting the value" do
+    it 'allows finding elements and extracting the value' do
       expect(string.find('//div/input').value).to eq('bar')
       expect(string.find('//select').value).to eq('Capybara')
     end
 
-    it "allows finding elements and checking if they are visible" do
+    it 'allows finding elements and checking if they are visible' do
       expect(string.find('//h1')).to be_visible
-      expect(string.find(:css, "#secret", visible: false)).not_to be_visible
+      expect(string.find(:css, '#secret', visible: false)).not_to be_visible
     end
 
-    it "allows finding elements and checking if they are disabled" do
+    it 'allows finding elements and checking if they are disabled' do
       expect(string.find('//form/input[@name="bleh"]')).to be_disabled
       expect(string.find('//form/input[@name="meh"]')).not_to be_disabled
     end
 
-    describe "#title" do
-      it "returns the page title" do
-        expect(string.title).to eq("simple_node")
+    describe '#title' do
+      it 'returns the page title' do
+        expect(string.title).to eq('simple_node')
       end
     end
 
-    describe "#has_title?" do
-      it "returns whether the page has the given title" do
+    describe '#has_title?' do
+      it 'returns whether the page has the given title' do
         expect(string.has_title?('simple_node')).to be_truthy
         expect(string.has_title?('monkey')).to be_falsey
       end
 
-      it "allows regexp matches" do
+      it 'allows regexp matches' do
         expect(string.has_title?(/s[a-z]+_node/)).to be_truthy
         expect(string.has_title?(/monkey/)).to be_falsey
       end
     end
 
     describe '#has_no_title?' do
-      it "returns whether the page does not have the given title" do
+      it 'returns whether the page does not have the given title' do
         expect(string.has_no_title?('simple_node')).to be_falsey
         expect(string.has_no_title?('monkey')).to be_truthy
       end
 
-      it "allows regexp matches" do
+      it 'allows regexp matches' do
         expect(string.has_no_title?(/s[a-z]+_node/)).to be_falsey
         expect(string.has_no_title?(/monkey/)).to be_truthy
       end

data/spec/capybara_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Capybara do
       Capybara.default_max_wait_time = @previous_default_time
     end
 
-    it "should be changeable" do
+    it 'should be changeable' do
       @previous_default_time = Capybara.default_max_wait_time
       Capybara.default_max_wait_time = 5
       expect(Capybara.default_max_wait_time).to eq(5)
@@ -16,18 +16,18 @@ RSpec.describe Capybara do
   end
 
   describe '.register_driver' do
-    it "should add a new driver" do
+    it 'should add a new driver' do
       Capybara.register_driver :schmoo do |app|
         Capybara::RackTest::Driver.new(app)
       end
       session = Capybara::Session.new(:schmoo, TestApp)
       session.visit('/')
-      expect(session.body).to include("Hello world!")
+      expect(session.body).to include('Hello world!')
     end
   end
 
   describe '.register_server' do
-    it "should add a new server" do
+    it 'should add a new server' do
       Capybara.register_server :blob do |_app, _port, _host|
         # do nothing
       end
@@ -36,40 +36,40 @@ RSpec.describe Capybara do
     end
   end
 
-  describe ".server" do
+  describe '.server' do
     after do
       Capybara.server = :default
     end
 
-    it "should default to a proc that calls run_default_server" do
+    it 'should default to a proc that calls run_default_server' do
       mock_app = Object.new
       allow(Capybara).to receive(:run_default_server).and_return(true)
       Capybara.server.call(mock_app, 8000)
       expect(Capybara).to have_received(:run_default_server).with(mock_app, 8000)
     end
 
-    it "should return a custom server proc" do
+    it 'should return a custom server proc' do
       server = ->(_app, _port) {}
       Capybara.register_server :custom, &server
       Capybara.server = :custom
       expect(Capybara.server).to eq(server)
     end
 
-    it "should have :webrick registered" do
+    it 'should have :webrick registered' do
       expect(Capybara.servers[:webrick]).not_to be_nil
     end
 
-    it "should have :puma registered" do
+    it 'should have :puma registered' do
       expect(Capybara.servers[:puma]).not_to be_nil
     end
   end
 
-  describe "server=" do
+  describe 'server=' do
     after do
       Capybara.server = :default
     end
 
-    it "accepts a proc" do
+    it 'accepts a proc' do
       server = ->(_app, _port) {}
       Capybara.server = server
       expect(Capybara.server).to eq server
@@ -81,15 +81,15 @@ RSpec.describe Capybara do
       Capybara.app_host = nil
     end
 
-    it "should warn if not a valid URL" do
-      expect { Capybara.app_host = "www.example.com" }.to raise_error(ArgumentError, /Capybara\.app_host should be set to a url/)
+    it 'should warn if not a valid URL' do
+      expect { Capybara.app_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.app_host should be set to a url/)
     end
 
-    it "should not warn if a valid URL" do
-      expect { Capybara.app_host = "http://www.example.com" }.not_to raise_error
+    it 'should not warn if a valid URL' do
+      expect { Capybara.app_host = 'http://www.example.com' }.not_to raise_error
     end
 
-    it "should not warn if nil" do
+    it 'should not warn if nil' do
       expect { Capybara.app_host = nil }.not_to raise_error
     end
   end
@@ -101,12 +101,12 @@ RSpec.describe Capybara do
       Capybara.default_host = old_default
     end
 
-    it "should raise if not a valid URL" do
-      expect { Capybara.default_host = "www.example.com" }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
+    it 'should raise if not a valid URL' do
+      expect { Capybara.default_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
     end
 
-    it "should not warn if a valid URL" do
-      expect { Capybara.default_host = "http://www.example.com" }.not_to raise_error
+    it 'should not warn if a valid URL' do
+      expect { Capybara.default_host = 'http://www.example.com' }.not_to raise_error
     end
   end
 end

data/spec/css_splitter_spec.rb

@@ -7,30 +7,30 @@ RSpec.describe Capybara::Selector::CSS::Splitter do
     ::Capybara::Selector::CSS::Splitter.new
   end
 
-  context "split not needed" do
-    it "normal CSS selector" do
+  context 'split not needed' do
+    it 'normal CSS selector' do
       css = 'div[id="abc"]'
       expect(splitter.split(css)).to eq [css]
     end
 
-    it "comma in strings" do
+    it 'comma in strings' do
       css = 'div[id="a,bc"]'
       expect(splitter.split(css)).to eq [css]
     end
 
-    it "comma in pseudo-selector" do
+    it 'comma in pseudo-selector' do
       css = 'div.class1:not(.class1, .class2)'
       expect(splitter.split(css)).to eq [css]
     end
   end
 
-  context "split needed" do
-    it "root level comma" do
+  context 'split needed' do
+    it 'root level comma' do
       css = 'div.class1, span, p.class2'
       expect(splitter.split(css)).to eq ['div.class1', 'span', 'p.class2']
     end
 
-    it "root level comma when quotes and pseudo selectors" do
+    it 'root level comma when quotes and pseudo selectors' do
       css = 'div.class1[id="abc\\"def,ghi"]:not(.class3, .class4), span[id=\'a"c\\\'de\'], section, #abc\\,def'
       expect(splitter.split(css)).to eq ['div.class1[id="abc\\"def,ghi"]:not(.class3, .class4)', 'span[id=\'a"c\\\'de\']', 'section', '#abc\\,def']
     end