capybara 2.7.1 → 2.8.0

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

@@ -9,32 +9,38 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
     end
   end
+
   it "should find the div in FrameTwo" do
     @session.within_frame("frameTwo") do
       expect(@session.find("//*[@id='divInFrameTwo']").text).to eql 'This is the text of divInFrameTwo'
     end
   end
+
   it "should find the text div in the main window after finding text in frameOne" do
     @session.within_frame("frameOne") do
       expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
     end
     expect(@session.find("//*[@id='divInMainWindow']").text).to eql 'This is the text for divInMainWindow'
   end
+
   it "should find the text div in the main window after finding text in frameTwo" do
     @session.within_frame("frameTwo") do
       expect(@session.find("//*[@id='divInFrameTwo']").text).to eql 'This is the text of divInFrameTwo'
     end
     expect(@session.find("//*[@id='divInMainWindow']").text).to eql 'This is the text for divInMainWindow'
   end
+
   it "should return the result of executing the block" do
     expect(@session.within_frame("frameOne") { "return value" }).to eql "return value"
   end
+
   it "should find the div given Element" do
     element = @session.find(:id, 'frameOne')
     @session.within_frame element do
       expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
     end
   end
+
   it "should find multiple nested frames" do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
@@ -43,6 +49,7 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       end
     end
   end
+
   it "should reset scope when changing frames" do
     @session.within(:css, '#divInMainWindow') do
       @session.within_frame 'parentFrame' do
@@ -60,4 +67,16 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       expect(@session).not_to have_selector(:css, '#childFrame')
     end
   end
+
+  it "should support the driver #switch_to_frame api" do
+    # This test is purely to notify driver authors to update their API.
+    # The #switch_to_frame API will be required in the next version (> 2.8) of Capybara for frames support.
+    # It should not be used as an example of code for users.
+    frame = @session.find(:frame, "frameOne")
+    expect {
+      @session.driver.switch_to_frame(frame)
+      sleep 0.5
+      @session.driver.switch_to_frame(:parent)
+    }.not_to raise_error
+  end
 end

data/lib/capybara/spec/spec_helper.rb

@@ -22,6 +22,8 @@ module Capybara
         config.filter_run_excluding :requires => method(:filter).to_proc
         config.before { Capybara::SpecHelper.reset! }
         config.after { Capybara::SpecHelper.reset! }
+        # Test in 3.5+ where metadata doesn't autotrigger shared context inclusion - will be only behavior in RSpec 4
+        config.shared_context_metadata_behavior = :apply_to_host_groups if RSpec::Core::Version::STRING.to_f >= 3.5
       end
 
       def reset!
@@ -36,6 +38,7 @@ module Capybara
         Capybara.visible_text_only = false
         Capybara.match = :smart
         Capybara.wait_on_first_by_default = false
+        Capybara.enable_aria_label = false
       end
 
       def filter(requires, metadata)

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

@@ -37,7 +37,7 @@
   <p>
     <label for="form_first_name">
       First Name
-      <input type="text" name="form[first_name]" value="John" id="form_first_name"/>
+      <input type="text" name="form[first_name]" value="John" id="form_first_name" placeholder="FirstName"/>
     </label>
   </p>
 
@@ -154,6 +154,15 @@ New line after and before textarea tag
     <label for="gender_both">Both</label>
   </p>
 
+  <p>
+    <input type="radio" name="form[party]" value="democrat" id="party_democrat" style="display:none"/>
+    <label for="party_democrat">Democrat</label>
+    <input type="radio" name="form[party]" value="republican" id="party_republican" style="display:none"/>
+    <label for="party_republican">Republican</label>
+    <input type="radio" name="form[party]" value="independent" id="party_independent" checked="checked" style="display:none"/>
+    <label for="party_independent">Independent</label>
+  </p>
+
   <p>
     <input type="checkbox" id="no_attr_value_checked" value="1" checked/>
   </p>
@@ -167,6 +176,24 @@ New line after and before textarea tag
     <label for="form_pets_hamster">Hamster</label>
   </p>
 
+  <p>
+    <input type="checkbox" value="jaguar" name="form[cars][]" id="form_cars_jaguar" checked="checked" style="display: none"/>
+    <label for="form_cars_jaguar">Jaguar</label>
+    <input type="checkbox" value="tesla" name="form[cars][]" id="form_cars_tesla" style="display: none"/>
+    <label for="form_cars_tesla">Tesla</label>
+    <input type="checkbox" value="ferrari" name="form[cars][]" id="form_cars_ferrari" checked="checked" style="display: none"/>
+    <label for="form_cars_ferrari">Ferrari</label>
+    <input type="checkbox" value="ariel" name="form[cars][]" id="form_cars_ariel" style="display: none"/>
+    <label>
+      McLaren
+      <input type="checkbox" value="mclaren" name="form[cars][]" id="form_cars_mclaren" style="display: none"/>
+    </label>
+    <label>
+      Koenigsegg
+      <input type="checkbox" value="koenigsegg" name="form[cars][]" id="form_cars_koenigsegg" checked="checked" style="display: none"/>
+    </label>
+  </p>
+
   <p>
     <input type="checkbox" name="form[valueless_checkbox]" id="valueless_checkbox" checked="checked"/>
     <label for="valueless_checkbox">Valueless Checkbox</label>
@@ -226,7 +253,7 @@ New line after and before textarea tag
 
     <label for='address1_country'>Country</label>
     <select name="form[addresses][][country]" id="address1_country">
-      <option>France</option>
+      <option selected>France</option>
       <option>Ukraine</option>
     </select>
   </p>
@@ -242,7 +269,7 @@ New line after and before textarea tag
     <label for='address2_country'>Country</label>
     <select name="form[addresses][][country]" id="address2_country">
       <option>France</option>
-      <option>Ukraine</option>
+      <option selected>Ukraine</option>
     </select>
   </p>
 
@@ -370,7 +397,7 @@ New line after and before textarea tag
   </p>
 
   <p>
-    <input type="submit" name="form[mediocre]" id="mediocre" value="med"/>
+    <input type="submit" name="form[mediocre]" id="mediocre" value="med" aria-label="Mediocre Button"/>
   <p>
 </form>
 
@@ -455,9 +482,10 @@ New line after and before textarea tag
     <label for="html5_search">Html5 Search</label>
     <input type="search" name="form[html5_search]" value="what are you looking for" id="html5_search"/>
   </p>
+  <p id="emergency">Emergency Number</p>
   <p>
     <label for="html5_tel">Html5 Tel</label>
-    <input type="tel" name="form[html5_tel]" value="911" id="html5_tel"/>
+    <input type="tel" aria-labelledby="emergency" name="form[html5_tel]" value="911" id="html5_tel"/>
   </p>
   <p>
     <label for="html5_color">Html5 Color</label>
@@ -480,7 +508,7 @@ New line after and before textarea tag
 
 <form action="/other_form" method="post">
   <p>
-    <input type="text" name="form[which_form]" value="formaction form"/>
+    <input type="text" name="form[which_form]" value="formaction form" aria-label="Unlabelled Input"/>
   </p>
   <input type="submit" name="form[button]" formaction="/form" value="Formaction button"/>
   <input type="submit" name="form[button]" formaction="/form/get" formmethod="get" value="Formmethod button"/>

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

@@ -19,7 +19,7 @@
   et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation <a href="/foo" id="foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.
-  <a href="/with_simple_html"><img width="20" height="20" alt="awesome image" /></a>
+  <a href="/with_simple_html" aria-label="Go to simple"><img width="20" height="20" alt="awesome image" /></a>
 </p>
 
 <p class="para" id="second">
@@ -79,6 +79,10 @@ banana</textarea>
   Some of this text is <em style="display:none">hidden!</em>
 </div>
 
+<div id="some-hidden-text">
+  Some of this text is not hidden <em style="display:none">and some is hidden</em>
+</div>
+
 <div style="display: none;">
   <a id="first_invisble" class="hidden">first hidden link</a>
 </div>

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

@@ -8,5 +8,7 @@
 </head>
 <body>
   <div>This triggers an alert on unload</div>
+
+  <a href="/">Go away</a>
 </body>
-</html>
+</html>

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

@@ -29,6 +29,8 @@
         window.open('/popup_two', 'secondPopup');
         return false;
       });
+
+      $('body').addClass('loaded');
     });
     </script>
   </head>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.7.1'
+  VERSION = '2.8.0'
 end

data/spec/capybara_spec.rb

@@ -77,6 +77,40 @@ RSpec.describe Capybara do
       expect(Capybara.server).to eq(server)
     end
   end
+
+  describe 'app_host' do
+    after 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/)
+    end
+
+    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
+      expect { Capybara.app_host = nil }.not_to raise_error
+    end
+  end
+
+  describe 'default_host' do
+    around do |test|
+      old_default = Capybara.default_host
+      test.run
+      Capybara.default_host = old_default
+    end
+
+    it "should warn 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
+    end
+  end
 end
 
 RSpec.describe Capybara::Session do

data/spec/rack_test_spec.rb

@@ -80,6 +80,30 @@ RSpec.describe Capybara::Session do
         end
       end
     end
+
+    describe "#click" do
+      context "on a label" do
+        it "should toggle the associated checkbox" do
+          @session.visit("/form")
+          expect(@session).to have_unchecked_field('form_pets_cat')
+          @session.find(:label, 'Cat').click
+          expect(@session).to have_checked_field('form_pets_cat')
+          @session.find(:label, 'Cat').click
+          expect(@session).to have_unchecked_field('form_pets_cat')
+          @session.find(:label, 'McLaren').click
+          expect(@session).to have_checked_field('form_cars_mclaren', visible: :hidden)
+        end
+
+        it "should toggle the associated radio" do
+          @session.visit("/form")
+          expect(@session).to have_unchecked_field('gender_male')
+          @session.find(:label, 'Male').click
+          expect(@session).to have_checked_field('gender_male')
+          @session.find(:label, 'Female').click
+          expect(@session).to have_unchecked_field('gender_male')
+        end
+      end
+    end
   end
 end
 

data/spec/result_spec.rb

@@ -63,4 +63,29 @@ RSpec.describe Capybara::Result do
       el.text == 'Gamma'
     end).to eq(2)
   end
+
+  it 'supports all modes of []' do
+    expect(result[1].text).to eq 'Beta'
+    expect(result[0,2].map &:text).to eq ['Alpha', 'Beta']
+    expect(result[1..3].map &:text).to eq ['Beta', 'Gamma', 'Delta']
+    expect(result[-1].text).to eq 'Delta'
+  end
+
+  #Not a great test but it indirectly tests what is needed
+  it "should evaluate filters lazily" do
+    #Not processed until accessed
+    expect(result.instance_variable_get('@result_cache').size).to be 0
+
+    #Only one retrieved when needed
+    result.first
+    expect(result.instance_variable_get('@result_cache').size).to be 1
+
+    #works for indexed access
+    result[2]
+    expect(result.instance_variable_get('@result_cache').size).to be 3
+
+    #All cached when converted to array
+    result.to_a
+    expect(result.instance_variable_get('@result_cache').size).to eq 4
+  end
 end

data/spec/rspec/features_spec.rb

@@ -6,11 +6,11 @@ RSpec.configuration.before(:each, { file_path: "./spec/rspec/features_spec.rb" }
   @in_filtered_hook = true
 end
 
-feature "Capybara's feature DSL" do    
+feature "Capybara's feature DSL" do
   background do
     @in_background = true
   end
-  
+
   def current_example(context)
     RSpec.respond_to?(:current_example) ? RSpec.current_example : context.example
   end
@@ -20,7 +20,7 @@ feature "Capybara's feature DSL" do
     expect(page).to have_content('Hello world!')
   end
 
-  scenario "preserves description" do 
+  scenario "preserves description" do
     expect(current_example(self).metadata[:full_description])
       .to eq("Capybara's feature DSL preserves description")
   end

data/spec/selenium_spec.rb

@@ -2,10 +2,13 @@
 require 'spec_helper'
 require "selenium-webdriver"
 
+Selenium::WebDriver::Firefox.driver_path = '/home/travis/geckodriver' if ENV['TRAVIS'] && ENV['GECKODRIVER']
+
 Capybara.register_driver :selenium_focus do |app|
-  profile = Selenium::WebDriver::Firefox::Profile.new
-  profile["focusmanager.testmode"] = true
-  Capybara::Selenium::Driver.new(app, browser: :firefox, profile: profile)
+  # profile = Selenium::WebDriver::Firefox::Profile.new
+  # profile["focusmanager.testmode"] = true
+  # Capybara::Selenium::Driver.new(app, browser: :firefox, profile: profile)
+  Capybara::Selenium::Driver.new(app, browser: :firefox)
 end
 
 module TestSessions

data/spec/server_spec.rb

@@ -116,7 +116,7 @@ RSpec.describe Capybara::Server do
       expect {
         server1.wait_for_pending_requests
       }.to change{done}.from(false).to(true)
-      expect(server2.instance_variable_get('@middleware').pending_requests?).to eq(false)
+      expect(server2.send(:pending_requests?)).to eq(false)
     end
 
   end
@@ -165,7 +165,7 @@ RSpec.describe Capybara::Server do
       expect {
         server1.wait_for_pending_requests
       }.to change{done}.from(false).to(true)
-      expect(server2.instance_variable_get('@middleware').pending_requests?).to eq(true)
+      expect(server2.send(:pending_requests?)).to eq(true)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -222,6 +222,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capybara is an integration testing tool for rack based web applications.
   It simulates how a user would interact with a website
 email:
@@ -267,6 +281,7 @@ files:
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
 - lib/capybara/selector/filter.rb
+- lib/capybara/selector/filter_set.rb
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
@@ -419,10 +434,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,
   such as Rails, Sinatra or Merb
 test_files: []
-has_rdoc: