capybara 3.3.1 → 3.4.0

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

@@ -5,14 +5,14 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
     @session.visit('/with_js')
   end
 
-  it "should dismiss the confirm" do
+  it 'should dismiss the confirm' do
     @session.dismiss_confirm do
       @session.click_link('Open confirm')
     end
     expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
   end
 
-  it "should dismiss the confirm if the message matches" do
+  it 'should dismiss the confirm if the message matches' do
     @session.dismiss_confirm 'Confirm opened' do
       @session.click_link('Open confirm')
     end
@@ -27,7 +27,7 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
     end.to raise_error(Capybara::ModalNotFound)
   end
 
-  it "should return the message presented" do
+  it 'should return the message presented' do
     message = @session.dismiss_confirm do
       @session.click_link('Open confirm')
     end

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

@@ -5,14 +5,14 @@ Capybara::SpecHelper.spec '#dismiss_prompt', requires: [:modals] do
     @session.visit('/with_js')
   end
 
-  it "should dismiss the prompt" do
+  it 'should dismiss the prompt' do
     @session.dismiss_prompt do
       @session.click_link('Open prompt')
     end
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='dismissed']")
   end
 
-  it "should return the message presented" do
+  it 'should return the message presented' do
     message = @session.dismiss_prompt do
       @session.click_link('Open prompt')
     end

data/lib/capybara/spec/session/element/assert_match_selector_spec.rb

@@ -6,19 +6,19 @@ Capybara::SpecHelper.spec '#assert_matches_selector' do
     @element = @session.find(:css, 'span', text: '42')
   end
 
-  it "should be true if the given selector matches the element" do
+  it 'should be true if the given selector matches the element' do
     expect(@element.assert_matches_selector(:css, '.number')).to be true
   end
 
-  it "should be false if the given selector does not match the element" do
+  it 'should be false if the given selector does not match the element' do
     expect { @element.assert_matches_selector(:css, '.not_number') }.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should not be callable on the session" do
+  it 'should not be callable on the session' do
     expect { @session.assert_matches_selector(:css, '.number') }.to raise_error(NoMethodError)
   end
 
-  it "should wait for match to occur", requires: [:js] do
+  it 'should wait for match to occur', requires: [:js] do
     @session.visit('/with_js')
     input = @session.find(:css, '#disable-on-click')
 
@@ -27,12 +27,12 @@ Capybara::SpecHelper.spec '#assert_matches_selector' do
     expect(input.assert_matches_selector(:css, 'input:disabled')).to be true
   end
 
-  it "should not accept count options" do
+  it 'should not accept count options' do
     expect { @element.assert_matches_selector(:css, '.number', count: 1) }.to raise_error(ArgumentError, /count/)
   end
 
-  it "should accept a filter block" do
-    @element.assert_matches_selector(:css, 'span') { |el| el[:class] == "number" }
-    @element.assert_not_matches_selector(:css, 'span') { |el| el[:class] == "not_number" }
+  it 'should accept a filter block' do
+    @element.assert_matches_selector(:css, 'span') { |el| el[:class] == 'number' }
+    @element.assert_not_matches_selector(:css, 'span') { |el| el[:class] == 'not_number' }
   end
 end

data/lib/capybara/spec/session/element/match_css_spec.rb

@@ -6,20 +6,20 @@ Capybara::SpecHelper.spec '#match_css?' do
     @element = @session.find(:css, 'span', text: '42')
   end
 
-  it "should be true if the given selector matches the element" do
-    expect(@element).to match_css("span")
-    expect(@element).to match_css("span.number")
+  it 'should be true if the given selector matches the element' do
+    expect(@element).to match_css('span')
+    expect(@element).to match_css('span.number')
   end
 
-  it "should be false if the given selector does not match" do
-    expect(@element).not_to match_css("div")
-    expect(@element).not_to match_css("p a#doesnotexist")
-    expect(@element).not_to match_css("p.nosuchclass")
+  it 'should be false if the given selector does not match' do
+    expect(@element).not_to match_css('div')
+    expect(@element).not_to match_css('p a#doesnotexist')
+    expect(@element).not_to match_css('p.nosuchclass')
   end
 
-  it "should accept an optional filter block" do
+  it 'should accept an optional filter block' do
     # This would be better done with
-    expect(@element).to match_css('span') { |el| el[:class] == "number" }
-    expect(@element).not_to match_css('span') { |el| el[:class] == "not_number" }
+    expect(@element).to match_css('span') { |el| el[:class] == 'number' }
+    expect(@element).not_to match_css('span') { |el| el[:class] == 'not_number' }
   end
 end

data/lib/capybara/spec/session/element/match_xpath_spec.rb

@@ -6,18 +6,18 @@ Capybara::SpecHelper.spec '#match_xpath?' do
     @element = @session.find(:css, 'span.number')
   end
 
-  it "should be true if the given selector is on the page" do
-    expect(@element).to match_xpath("//span")
+  it 'should be true if the given selector is on the page' do
+    expect(@element).to match_xpath('//span')
     expect(@element).to match_xpath("//span[@class='number']")
   end
 
-  it "should be false if the given selector is not on the page" do
-    expect(@element).not_to match_xpath("//abbr")
-    expect(@element).not_to match_xpath("//div")
+  it 'should be false if the given selector is not on the page' do
+    expect(@element).not_to match_xpath('//abbr')
+    expect(@element).not_to match_xpath('//div')
     expect(@element).not_to match_xpath("//span[@class='not_a_number']")
   end
 
-  it "should use xpath even if default selector is CSS" do
+  it 'should use xpath even if default selector is CSS' do
     Capybara.default_selector = :css
     expect(@element).not_to have_xpath("//span[@class='not_a_number']")
     expect(@element).not_to have_xpath("//div[@class='number']")

data/lib/capybara/spec/session/element/matches_selector_spec.rb

@@ -6,43 +6,43 @@ Capybara::SpecHelper.spec '#match_selector?' do
     @element = @session.find('//span', text: '42')
   end
 
-  it "should be true if the element matches the given selector" do
-    expect(@element).to match_selector(:xpath, "//span")
+  it 'should be true if the element matches the given selector' do
+    expect(@element).to match_selector(:xpath, '//span')
     expect(@element).to match_selector(:css, 'span.number')
     expect(@element.matches_selector?(:css, 'span.number')).to be true
   end
 
-  it "should be false if the element does not match the given selector" do
-    expect(@element).not_to match_selector(:xpath, "//div")
-    expect(@element).not_to match_selector(:css, "span.not_a_number")
-    expect(@element.matches_selector?(:css, "span.not_a_number")).to be false
+  it 'should be false if the element does not match the given selector' do
+    expect(@element).not_to match_selector(:xpath, '//div')
+    expect(@element).not_to match_selector(:css, 'span.not_a_number')
+    expect(@element.matches_selector?(:css, 'span.not_a_number')).to be false
   end
 
-  it "should use default selector" do
+  it 'should use default selector' do
     Capybara.default_selector = :css
-    expect(@element).not_to match_selector("span.not_a_number")
-    expect(@element).to match_selector("span.number")
+    expect(@element).not_to match_selector('span.not_a_number')
+    expect(@element).to match_selector('span.number')
   end
 
-  context "with text" do
-    it "should discard all matches where the given string is not contained" do
-      expect(@element).to match_selector("//span", text: "42")
-      expect(@element).not_to match_selector("//span", text: "Doesnotexist")
+  context 'with text' do
+    it 'should discard all matches where the given string is not contained' do
+      expect(@element).to match_selector('//span', text: '42')
+      expect(@element).not_to match_selector('//span', text: 'Doesnotexist')
     end
   end
 
-  it "should have css sugar" do
+  it 'should have css sugar' do
     expect(@element.matches_css?('span.number')).to be true
     expect(@element.matches_css?('span.not_a_number')).to be false
-    expect(@element.matches_css?('span.number', text: "42")).to be true
-    expect(@element.matches_css?('span.number', text: "Nope")).to be false
+    expect(@element.matches_css?('span.number', text: '42')).to be true
+    expect(@element.matches_css?('span.number', text: 'Nope')).to be false
   end
 
-  it "should have xpath sugar" do
-    expect(@element.matches_xpath?("//span")).to be true
-    expect(@element.matches_xpath?("//div")).to be false
-    expect(@element.matches_xpath?("//span", text: '42')).to be true
-    expect(@element.matches_xpath?("//span", text: 'Nope')).to be false
+  it 'should have xpath sugar' do
+    expect(@element.matches_xpath?('//span')).to be true
+    expect(@element.matches_xpath?('//div')).to be false
+    expect(@element.matches_xpath?('//span', text: '42')).to be true
+    expect(@element.matches_xpath?('//span', text: 'Nope')).to be false
   end
 
   it 'should accept selector filters' do
@@ -54,55 +54,55 @@ Capybara::SpecHelper.spec '#match_selector?' do
   it 'should accept a custom filter block' do
     @session.visit('/form')
     cbox = @session.find(:css, '#form_pets_dog')
-    expect(cbox).to match_selector(:checkbox) { |node| node[:id] == "form_pets_dog" }
-    expect(cbox).not_to match_selector(:checkbox) { |node| node[:id] != "form_pets_dog" }
-    expect(cbox.matches_selector?(:checkbox) { |node| node[:id] == "form_pets_dog" }).to be true
-    expect(cbox.matches_selector?(:checkbox) { |node| node[:id] != "form_pets_dog" }).to be false
+    expect(cbox).to match_selector(:checkbox) { |node| node[:id] == 'form_pets_dog' }
+    expect(cbox).not_to match_selector(:checkbox) { |node| node[:id] != 'form_pets_dog' }
+    expect(cbox.matches_selector?(:checkbox) { |node| node[:id] == 'form_pets_dog' }).to be true
+    expect(cbox.matches_selector?(:checkbox) { |node| node[:id] != 'form_pets_dog' }).to be false
   end
 end
 
 Capybara::SpecHelper.spec '#not_matches_selector?' do
   before do
     @session.visit('/with_html')
-    @element = @session.find(:css, "span", text: 42)
+    @element = @session.find(:css, 'span', text: 42)
   end
 
-  it "should be false if the given selector matches the element" do
-    expect(@element).not_to not_match_selector(:xpath, "//span")
-    expect(@element).not_to not_match_selector(:css, "span.number")
-    expect(@element.not_matches_selector?(:css, "span.number")).to be false
+  it 'should be false if the given selector matches the element' do
+    expect(@element).not_to not_match_selector(:xpath, '//span')
+    expect(@element).not_to not_match_selector(:css, 'span.number')
+    expect(@element.not_matches_selector?(:css, 'span.number')).to be false
   end
 
-  it "should be true if the given selector does not match the element" do
-    expect(@element).to not_match_selector(:xpath, "//abbr")
-    expect(@element).to not_match_selector(:css, "p a#doesnotexist")
-    expect(@element.not_matches_selector?(:css, "p a#doesnotexist")).to be true
+  it 'should be true if the given selector does not match the element' do
+    expect(@element).to not_match_selector(:xpath, '//abbr')
+    expect(@element).to not_match_selector(:css, 'p a#doesnotexist')
+    expect(@element.not_matches_selector?(:css, 'p a#doesnotexist')).to be true
   end
 
-  it "should use default selector" do
+  it 'should use default selector' do
     Capybara.default_selector = :css
-    expect(@element).to not_match_selector("p a#doesnotexist")
-    expect(@element).not_to not_match_selector("span.number")
+    expect(@element).to not_match_selector('p a#doesnotexist')
+    expect(@element).not_to not_match_selector('span.number')
   end
 
-  context "with text" do
-    it "should discard all matches where the given string is contained" do
-      expect(@element).not_to not_match_selector(:css, "span.number", text: "42")
-      expect(@element).to not_match_selector(:css, "span.number", text: "Doesnotexist")
+  context 'with text' do
+    it 'should discard all matches where the given string is contained' do
+      expect(@element).not_to not_match_selector(:css, 'span.number', text: '42')
+      expect(@element).to not_match_selector(:css, 'span.number', text: 'Doesnotexist')
     end
   end
 
-  it "should have CSS sugar" do
-    expect(@element.not_matches_css?("span.number")).to be false
-    expect(@element.not_matches_css?("p a#doesnotexist")).to be true
-    expect(@element.not_matches_css?("span.number", text: "42")).to be false
-    expect(@element.not_matches_css?("span.number", text: "Doesnotexist")).to be true
+  it 'should have CSS sugar' do
+    expect(@element.not_matches_css?('span.number')).to be false
+    expect(@element.not_matches_css?('p a#doesnotexist')).to be true
+    expect(@element.not_matches_css?('span.number', text: '42')).to be false
+    expect(@element.not_matches_css?('span.number', text: 'Doesnotexist')).to be true
   end
 
-  it "should have xpath sugar" do
-    expect(@element.not_matches_xpath?("//span")).to be false
-    expect(@element.not_matches_xpath?("//div")).to be true
-    expect(@element.not_matches_xpath?("//span", text: "42")).to be false
-    expect(@element.not_matches_xpath?("//span", text: "Doesnotexist")).to be true
+  it 'should have xpath sugar' do
+    expect(@element.not_matches_xpath?('//span')).to be false
+    expect(@element.not_matches_xpath?('//div')).to be true
+    expect(@element.not_matches_xpath?('//span', text: '42')).to be false
+    expect(@element.not_matches_xpath?('//span', text: 'Doesnotexist')).to be true
   end
 end

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

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec "#evaluate_async_script", requires: [:js] do
-  it "should evaluate the given script and return whatever it produces" do
+Capybara::SpecHelper.spec '#evaluate_async_script', requires: [:js] do
+  it 'should evaluate the given script and return whatever it produces' do
     @session.visit('/with_js')
-    expect(@session.evaluate_async_script("arguments[0](4)")).to eq(4)
+    expect(@session.evaluate_async_script('arguments[0](4)')).to eq(4)
   end
 
-  it "should support passing elements as arguments to the script", requires: %i[js es_args] do
+  it 'should support passing elements as arguments to the script', requires: %i[js es_args] do
     @session.visit('/with_js')
     el = @session.find(:css, '#drag p')
-    result = @session.evaluate_async_script("arguments[2]([arguments[0].innerText, arguments[1]])", el, "Doodle Funk")
-    expect(result).to eq ["This is a draggable element.", "Doodle Funk"]
+    result = @session.evaluate_async_script('arguments[2]([arguments[0].innerText, arguments[1]])', el, 'Doodle Funk')
+    expect(result).to eq ['This is a draggable element.', 'Doodle Funk']
   end
 
-  it "should support returning elements after asynchronous operation", requires: %i[js es_args] do
+  it 'should support returning elements after asynchronous operation', requires: %i[js es_args] do
     @session.visit('/with_js')
     @session.find(:css, '#change') # ensure page has loaded and element is available
     el = @session.evaluate_async_script("var cb = arguments[0]; setTimeout(function(){ cb(document.getElementById('change')) }, 100)")

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

@@ -1,25 +1,32 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec "#evaluate_script", requires: [:js] do
-  it "should evaluate the given script and return whatever it produces" do
+Capybara::SpecHelper.spec '#evaluate_script', requires: [:js] do
+  it 'should evaluate the given script and return whatever it produces' do
     @session.visit('/with_js')
-    expect(@session.evaluate_script("1+3")).to eq(4)
+    expect(@session.evaluate_script('1+3')).to eq(4)
   end
 
-  it "should pass arguments to the script", requires: %i[js es_args] do
+  it 'should ignore leading whitespace' do
     @session.visit('/with_js')
-    @session.evaluate_script("document.getElementById('change').textContent = arguments[0]", "Doodle Funk")
+    expect(@session.evaluate_script('
+      1 + 3
+    ')).to eq(4)
+  end
+
+  it 'should pass arguments to the script', requires: %i[js es_args] do
+    @session.visit('/with_js')
+    @session.evaluate_script("document.getElementById('change').textContent = arguments[0]", 'Doodle Funk')
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support passing elements as arguments to the script", requires: %i[js es_args] do
+  it 'should support passing elements as arguments to the script', requires: %i[js es_args] do
     @session.visit('/with_js')
     el = @session.find(:css, '#change')
-    @session.evaluate_script("arguments[0].textContent = arguments[1]", el, "Doodle Funk")
+    @session.evaluate_script('arguments[0].textContent = arguments[1]', el, 'Doodle Funk')
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support returning elements", requires: %i[js es_args] do
+  it 'should support returning elements', requires: %i[js es_args] do
     @session.visit('/with_js')
     @session.find(:css, '#change') # ensure page has loaded and element is available
     el = @session.evaluate_script("document.getElementById('change')")

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

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec "#execute_script", requires: [:js] do
-  it "should execute the given script and return nothing" do
+Capybara::SpecHelper.spec '#execute_script', requires: [:js] do
+  it 'should execute the given script and return nothing' do
     @session.visit('/with_js')
     expect(@session.execute_script("document.getElementById('change').textContent = 'Funky Doodle'")).to be_nil
     expect(@session).to have_css('#change', text: 'Funky Doodle')
   end
 
-  it "should be able to call functions defined in the page" do
+  it 'should be able to call functions defined in the page' do
     @session.visit('/with_js')
     expect { @session.execute_script("$('#change').text('Funky Doodle')") }.not_to raise_error
   end
 
-  it "should pass arguments to the script", requires: %i[js es_args] do
+  it 'should pass arguments to the script', requires: %i[js es_args] do
     @session.visit('/with_js')
-    @session.execute_script("document.getElementById('change').textContent = arguments[0]", "Doodle Funk")
+    @session.execute_script("document.getElementById('change').textContent = arguments[0]", 'Doodle Funk')
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support passing elements as arguments to the script", requires: %i[js es_args] do
+  it 'should support passing elements as arguments to the script', requires: %i[js es_args] do
     @session.visit('/with_js')
     el = @session.find(:css, '#change')
-    @session.execute_script("arguments[1].textContent = arguments[0]", "Doodle Funk", el)
+    @session.execute_script('arguments[1].textContent = arguments[0]', 'Doodle Funk', el)
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 end

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

@@ -1,67 +1,67 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec "#fill_in" do
+Capybara::SpecHelper.spec '#fill_in' do
   before do
     @session.visit('/form')
   end
 
-  it "should fill in a text field by id" do
+  it 'should fill in a text field by id' do
     @session.fill_in('form_first_name', with: 'Harry')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
-  it "should fill in a text field by name" do
+  it 'should fill in a text field by name' do
     @session.fill_in('form[last_name]', with: 'Green')
     @session.click_button('awesome')
     expect(extract_results(@session)['last_name']).to eq('Green')
   end
 
-  it "should fill in a text field by label without for" do
+  it 'should fill in a text field by label without for' do
     @session.fill_in('First Name', with: 'Harry')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
-  it "should fill in a url field by label without for" do
+  it 'should fill in a url field by label without for' do
     @session.fill_in('Html5 Url', with: 'http://www.avenueq.com')
     @session.click_button('html5_submit')
     expect(extract_results(@session)['html5_url']).to eq('http://www.avenueq.com')
   end
 
-  it "should fill in a textarea by id" do
+  it 'should fill in a textarea by id' do
     @session.fill_in('form_description', with: 'Texty text')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
-  it "should fill in a textarea by label" do
+  it 'should fill in a textarea by label' do
     @session.fill_in('Description', with: 'Texty text')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
-  it "should fill in a textarea by name" do
+  it 'should fill in a textarea by name' do
     @session.fill_in('form[description]', with: 'Texty text')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
-  it "should fill in a password field by id" do
+  it 'should fill in a password field by id' do
     @session.fill_in('form_password', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
-  context "Date/Time" do
-    it "should fill in a date input" do
+  context 'Date/Time' do
+    it 'should fill in a date input' do
       date = Date.today
       @session.fill_in('form_date', with: date)
       @session.click_button('awesome')
       expect(Date.parse(extract_results(@session)['date'])).to eq date
     end
 
-    it "should fill in a time input" do
+    it 'should fill in a time input' do
       time = Time.new(2018, 3, 9, 15, 26)
       @session.fill_in('form_time', with: time)
       @session.click_button('awesome')
@@ -69,7 +69,7 @@ Capybara::SpecHelper.spec "#fill_in" do
       expect(Time.parse(results).strftime('%r')).to eq time.strftime('%r')
     end
 
-    it "should fill in a datetime input" do
+    it 'should fill in a datetime input' do
       dt = Time.new(2018, 3, 13, 9, 53)
       @session.fill_in('form_datetime', with: dt)
       @session.click_button('awesome')
@@ -77,61 +77,61 @@ Capybara::SpecHelper.spec "#fill_in" do
     end
   end
 
-  it "should handle HTML in a textarea" do
+  it 'should handle HTML in a textarea' do
     @session.fill_in('form_description', with: 'is <strong>very</strong> secret!')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('is <strong>very</strong> secret!')
   end
 
-  it "should handle newlines in a textarea" do
+  it 'should handle newlines in a textarea' do
     @session.fill_in('form_description', with: "\nSome text\n")
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
-  it "should fill in a field with a custom type" do
+  it 'should fill in a field with a custom type' do
     @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @session.click_button('awesome')
     expect(extract_results(@session)['schmooo']).to eq('Schmooo is the game')
   end
 
-  it "should fill in a field without a type" do
+  it 'should fill in a field without a type' do
     @session.fill_in('Phone', with: '+1 555 7022')
     @session.click_button('awesome')
     expect(extract_results(@session)['phone']).to eq('+1 555 7022')
   end
 
-  it "should fill in a text field respecting its maxlength attribute" do
+  it 'should fill in a text field respecting its maxlength attribute' do
     @session.fill_in('Zipcode', with: '52071350')
     @session.click_button('awesome')
     expect(extract_results(@session)['zipcode']).to eq('52071')
   end
 
-  it "should fill in a password field by name" do
+  it 'should fill in a password field by name' do
     @session.fill_in('form[password]', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
-  it "should fill in a password field by label" do
+  it 'should fill in a password field by label' do
     @session.fill_in('Password', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
-  it "should fill in a password field by name" do
+  it 'should fill in a password field by name' do
     @session.fill_in('form[password]', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
-  it "should fill in a field based on current value" do
+  it 'should fill in a field based on current value' do
     @session.fill_in(currently_with: 'John', with: 'Thomas')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Thomas')
   end
 
-  it "should fill in a field based on type" do
+  it 'should fill in a field based on type' do
     @session.fill_in(type: 'schmooo', with: 'Schmooo for all')
     @session.click_button('awesome')
     expect(extract_results(@session)['schmooo']).to eq('Schmooo for all')
@@ -141,25 +141,26 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect { @session.fill_in 'Name' }.to raise_error(ArgumentError, /with/)
   end
 
-  it "should wait for asynchronous load", requires: [:js] do
+  it 'should wait for asynchronous load', requires: [:js] do
+    Capybara.default_max_wait_time = 2
     @session.visit('/with_js')
     @session.click_link('Click me')
     @session.fill_in('new_field', with: 'Testing...')
   end
 
-  it "casts to string" do
+  it 'casts to string' do
     @session.fill_in(:form_first_name, with: :Harry)
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
-  it "casts to string if field has maxlength" do
+  it 'casts to string if field has maxlength' do
     @session.fill_in(:form_zipcode, with: 1234567)
     @session.click_button('awesome')
     expect(extract_results(@session)['zipcode']).to eq('12345')
   end
 
-  it "fills in a field if default_set_options is nil" do
+  it 'fills in a field if default_set_options is nil' do
     Capybara.default_set_options = nil
     @session.fill_in(:form_first_name, with: 'Thomas')
     @session.click_button('awesome')
@@ -186,13 +187,13 @@ Capybara::SpecHelper.spec "#fill_in" do
     end
   end
 
-  context "with ignore_hidden_fields" do
+  context 'with ignore_hidden_fields' do
     before { Capybara.ignore_hidden_elements = true }
 
     after  { Capybara.ignore_hidden_elements = false }
 
-    it "should not find a hidden field" do
-      msg = "Unable to find visible field \"Super Secret\" that is not disabled"
+    it 'should not find a hidden field' do
+      msg = 'Unable to find visible field "Super Secret"'
       expect do
         @session.fill_in('Super Secret', with: '777')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -200,37 +201,37 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   context "with a locator that doesn't exist" do
-    it "should raise an error" do
-      msg = "Unable to find visible field \"does not exist\" that is not disabled"
+    it 'should raise an error' do
+      msg = 'Unable to find field "does not exist"'
       expect do
         @session.fill_in('does not exist', with: 'Blah blah')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 
-  context "on a disabled field" do
-    it "should raise an error" do
+  context 'on a disabled field' do
+    it 'should raise an error' do
       expect do
         @session.fill_in('Disabled Text Field', with: 'Blah blah')
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "with :exact option" do
-    it "should accept partial matches when false" do
-      @session.fill_in("Explanation", with: "Dude", exact: false)
-      @session.click_button("awesome")
-      expect(extract_results(@session)["name_explanation"]).to eq("Dude")
+  context 'with :exact option' do
+    it 'should accept partial matches when false' do
+      @session.fill_in('Explanation', with: 'Dude', exact: false)
+      @session.click_button('awesome')
+      expect(extract_results(@session)['name_explanation']).to eq('Dude')
     end
 
-    it "should not accept partial matches when true" do
+    it 'should not accept partial matches when true' do
       expect do
-        @session.fill_in("Explanation", with: "Dude", exact: true)
+        @session.fill_in('Explanation', with: 'Dude', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  it "should return the element filled in" do
+  it 'should return the element filled in' do
     el = @session.find(:fillable_field, 'form_first_name')
     expect(@session.fill_in('form_first_name', with: 'Harry')).to eq el
   end