capybara 2.18.0 → 3.0.0.rc1

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#click_link' do
   before do
     @session.visit('/with_html')
@@ -11,7 +12,7 @@ Capybara::SpecHelper.spec '#click_link' do
   end
 
   it "casts to string" do
-    @session.click_link(:'foo')
+    @session.click_link(:foo)
     expect(@session).to have_content('Another World')
   end
 
@@ -35,7 +36,7 @@ Capybara::SpecHelper.spec '#click_link' do
       expect(@session).to have_content('Bar')
     end
 
-    it "should accept partial matches" do
+    it "should accept partial matches", :exact_false do
       @session.click_link('abo')
       expect(@session).to have_content('Bar')
     end
@@ -47,7 +48,7 @@ Capybara::SpecHelper.spec '#click_link' do
       expect(@session).to have_content('Bar')
     end
 
-    it "should accept partial matches" do
+    it "should accept partial matches", :exact_false do
       @session.click_link('some titl')
       expect(@session).to have_content('Bar')
     end
@@ -59,7 +60,7 @@ Capybara::SpecHelper.spec '#click_link' do
       expect(@session).to have_content('Bar')
     end
 
-    it "should accept partial matches" do
+    it "should accept partial matches", :exact_false do
       @session.click_link('some imag')
       expect(@session).to have_content('Bar')
     end
@@ -85,7 +86,7 @@ Capybara::SpecHelper.spec '#click_link' do
     end
   end
 
-  context "with a regex :href option given"  do
+  context "with a regex :href option given" do
     it "should find a link matching an all-matching regex pattern" do
       @session.click_link('labore', href: /.+/)
       expect(@session).to have_content('Bar')
@@ -180,13 +181,13 @@ Capybara::SpecHelper.spec '#click_link' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.click_link('abo', exact:  false)
+      @session.click_link('abo', exact: false)
       expect(@session).to have_content('Bar')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.click_link('abo', exact:  true)
+        @session.click_link('abo', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#current_scope' do
   before do
     @session.visit('/with_scope')
   end
-  
+
   context "when not in a #within block" do
     it "should return the document" do
       expect(@session.current_scope).to be_kind_of Capybara::Node::Document
     end
   end
-  
+
   context "when in a #within block" do
     it "should return the element in scope" do
       @session.within(:css, "#simple_first_name") do
@@ -17,7 +18,7 @@ Capybara::SpecHelper.spec '#current_scope' do
       end
     end
   end
-  
+
   context "when in a nested #within block" do
     it "should return the element in scope" do
       @session.within("//div[@id='for_bar']") do

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

@@ -1,24 +1,25 @@
 # frozen_string_literal: true
+
 require "capybara/spec/test_app"
 
 Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   before :all do
-    @servers = 2.times.map { Capybara::Server.new(TestApp.new).boot }
+    @servers = Array.new(2) { Capybara::Server.new(TestApp.new).boot }
     # sanity check
     expect(@servers[0].port).not_to eq(@servers[1].port)
-    expect(@servers.map { |s| s.port }).not_to include 80
+    expect(@servers.map(&:port)).not_to include 80
   end
 
   def bases
     @servers.map { |s| "http://#{s.host}:#{s.port}" }
   end
 
-  def should_be_on server_index, path="/host", scheme="http"
-    #This delay is to give fully async drivers (selenium w/chromedriver) time for the browser
-    #to get to its destination - should be removed when we have a waiting current_url matcher
-    sleep 0.1  # remove and adjust tests when a waiting current_url/path matcher is implemented
+  def should_be_on(server_index, path = "/host", scheme = "http")
     # Check that we are on /host on the given server
     s = @servers[server_index]
+
+    expect(@session).to have_current_path("#{scheme}://#{s.host}:#{s.port}#{path}", url: true)
+
     expect(@session.current_url.chomp('?')).to eq("#{scheme}://#{s.host}:#{s.port}#{path}")
     expect(@session.current_host).to eq("#{scheme}://#{s.host}") # no port
     expect(@session.current_path).to eq(path)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
   before do
     @session.visit('/with_js')
@@ -26,7 +27,6 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
     end.to raise_error(Capybara::ModalNotFound)
   end
 
-
   it "should return the message presented" do
     message = @session.dismiss_confirm do
       @session.click_link('Open confirm')

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#dismiss_prompt', requires: [:modals] do
   before do
     @session.visit('/with_js')

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

@@ -31,6 +31,6 @@ Capybara::SpecHelper.spec '#assert_matches_selector' do
 
   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" }
+    @element.assert_not_matches_selector(:css, 'span') { |el| el[:class] == "not_number" }
   end
 end

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

@@ -20,4 +20,4 @@ Capybara::SpecHelper.spec '#match_xpath?' do
     expect(@element).not_to have_xpath("//span[@class='not_a_number']")
     expect(@element).not_to have_xpath("//div[@class='number']")
   end
-end
+end

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

@@ -52,10 +52,10 @@ 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
 
@@ -103,4 +103,4 @@ Capybara::SpecHelper.spec '#not_matches_selector?' do
     expect(@element.not_matches_xpath?("//span", text: "42")).to be false
     expect(@element.not_matches_xpath?("//span", text: "Doesnotexist")).to be true
   end
-end if Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.1')
+end

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

@@ -1,18 +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
     @session.visit('/with_js')
     expect(@session.evaluate_async_script("arguments[0](4)")).to eq(4)
   end
 
-  it "should support passing elements as arguments to the script", requires: [: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"]
   end
 
-  it "should support returning elements after asynchronous operation", requires: [: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,24 +1,25 @@
 # frozen_string_literal: true
+
 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)
   end
 
-  it "should pass arguments to the script", requires: [:js, :es_args] do
+  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: [: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")
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support returning elements", requires: [: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,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#execute_script", requires: [:js] do
   it "should execute the given script and return nothing" do
     @session.visit('/with_js')
@@ -8,16 +9,16 @@ Capybara::SpecHelper.spec "#execute_script", requires: [:js] 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
+    expect { @session.execute_script("$('#change').text('Funky Doodle')") }.not_to raise_error
   end
 
-  it "should pass arguments to the script", requires: [: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")
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support passing elements as arguments to the script", requires: [: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)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#fill_in" do
   before do
     @session.visit('/form')
@@ -113,7 +114,7 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   it "should throw an exception if a hash containing 'with' is not provided" do
-    expect {@session.fill_in 'Name', 'ignu'}.to raise_error(RuntimeError, /with/)
+    expect { @session.fill_in 'Name' }.to raise_error(ArgumentError, /with/)
   end
 
   it "should wait for asynchronous load", requires: [:js] do
@@ -123,13 +124,13 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   it "casts to string" do
-    @session.fill_in(:'form_first_name', with: :'Harry')
+    @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
-    @session.fill_in(:'form_zipcode', with: 1234567)
+    @session.fill_in(:form_zipcode, with: 1234567)
     @session.click_button('awesome')
     expect(extract_results(@session)['zipcode']).to eq('12345')
   end
@@ -182,14 +183,14 @@ Capybara::SpecHelper.spec "#fill_in" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.fill_in("Explanation", with: "Dude", exact:  false)
+      @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
       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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_button' do
   before do
     @session.visit('/form')
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec '#find_button' do
   end
 
   it "casts to string" do
-    expect(@session.find_button(:'med')[:id]).to eq("mediocre")
+    expect(@session.find_button(:med)[:id]).to eq("mediocre")
   end
 
   it "should raise error if the button doesn't exist" do
@@ -33,12 +34,12 @@ Capybara::SpecHelper.spec '#find_button' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_button('What an Awesome', exact:  false).value).to eq("awesome")
+      expect(@session.find_button('What an Awesome', exact: false).value).to eq("awesome")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_button('What an Awesome', exact:  true)
+        @session.find_button('What an Awesome', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_by_id' do
   before do
     @session.visit('/with_html')
@@ -9,7 +10,7 @@ Capybara::SpecHelper.spec '#find_by_id' do
   end
 
   it "casts to string" do
-    expect(@session.find_by_id(:'red').tag_name).to eq('a')
+    expect(@session.find_by_id(:red).tag_name).to eq('a')
   end
 
   it "should raise error if no element with id is found" do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_field' do
   before do
     @session.visit('/form')
@@ -26,7 +27,7 @@ Capybara::SpecHelper.spec '#find_field' do
   end
 
   it "casts to string" do
-    expect(@session.find_field(:'Dog').value).to eq('dog')
+    expect(@session.find_field(:Dog).value).to eq('dog')
   end
 
   it "should raise error if the field doesn't exist" do
@@ -35,27 +36,20 @@ Capybara::SpecHelper.spec '#find_field' do
     end.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should warn if filter option is invalid" do
-    expect_any_instance_of(Kernel).to receive(:warn).
-      with('Invalid value nil passed to filter disabled - defaulting to false')
-    @session.find_field('Dog', disabled: nil)
-  end
-
-  it "should be aliased as 'field_labeled' for webrat compatibility" do
-    expect(@session.field_labeled('Dog').value).to eq('dog')
+  it "should raise error if filter option is invalid" do
     expect do
-      @session.field_labeled('Does not exist')
-    end.to raise_error(Capybara::ElementNotFound)
+      @session.find_field('Dog', disabled: nil)
+    end.to raise_error ArgumentError, "Invalid value nil passed to filter disabled"
   end
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_field("Explanation", exact:  false)[:name]).to eq("form[name_explanation]")
+      expect(@session.find_field("Explanation", exact: false)[:name]).to eq("form[name_explanation]")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_field("Explanation", exact:  true)
+        @session.find_field("Explanation", exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
@@ -112,6 +106,6 @@ Capybara::SpecHelper.spec '#find_field' do
 
   it "should accept an optional filter block" do
     # this would be better done with the :with option but this is just a test
-    expect(@session.find_field('form[pets][]'){ |node| node.value == 'dog' }[:id]).to eq "form_pets_dog"
+    expect(@session.find_field('form[pets][]') { |node| node.value == 'dog' }[:id]).to eq "form_pets_dog"
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_link' do
   before do
     @session.visit('/with_html')
@@ -6,13 +7,13 @@ Capybara::SpecHelper.spec '#find_link' do
 
   it "should find any link" do
     expect(@session.find_link('foo').text).to eq("ullamco")
-    expect(@session.find_link('labore')[:href]).to match %r(/with_simple_html$)
+    expect(@session.find_link('labore')[:href]).to match %r{/with_simple_html$}
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do
     it "should find when true" do
       Capybara.enable_aria_label = true
-      expect(@session.find_link('Go to simple')[:href]).to match %r(/with_simple_html$)
+      expect(@session.find_link('Go to simple')[:href]).to match %r{/with_simple_html$}
     end
 
     it "should not find when false" do
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec '#find_link' do
   end
 
   it "casts to string" do
-    expect(@session.find_link(:'foo').text).to eq("ullamco")
+    expect(@session.find_link(:foo).text).to eq("ullamco")
   end
 
   it "should raise error if the field doesn't exist" do
@@ -33,12 +34,12 @@ Capybara::SpecHelper.spec '#find_link' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_link('abo', exact:  false).text).to eq("labore")
+      expect(@session.find_link('abo', exact: false).text).to eq("labore")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_link('abo', exact:  true)
+        @session.find_link('abo', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end