capybara 2.8.0 → 2.9.0

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

@@ -1,4 +1,4 @@
-Capybara::SpecHelper.spec '#match_xpath?' do
+Capybara::SpecHelper.spec '#match_selector?' do
   before do
     @session.visit('/with_html')
     @element = @session.find('//span', text: '42')
@@ -28,6 +28,20 @@ Capybara::SpecHelper.spec '#match_xpath?' do
       expect(@element).not_to match_selector("//span", :text => "Doesnotexist")
     end
   end
+
+  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
+  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
+  end
 end
 
 Capybara::SpecHelper.spec '#not_matches_selector?' do
@@ -60,4 +74,18 @@ Capybara::SpecHelper.spec '#not_matches_selector?' do
       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
+  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
+  end
 end if Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.1')

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

@@ -235,6 +235,12 @@ Capybara::SpecHelper.spec '#find' do
       Capybara.exact = false
       @session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")])
     end
+
+    it "warns when the option has no effect" do
+      expect_any_instance_of(Kernel).to receive(:warn).
+        with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
+      @session.find(:css, '#test_field', exact: true)
+    end
   end
 
   context "with :match option" do
@@ -292,7 +298,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :smart, :exact => false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :smart, :exact => false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -319,7 +325,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :smart, :exact => true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :smart, :exact => true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -345,7 +351,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :prefer_exact, :exact => false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :prefer_exact, :exact => false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -371,7 +377,7 @@ Capybara::SpecHelper.spec '#find' do
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:css, ".does-not-exist", :match => :prefer_exact, :exact => true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], :match => :prefer_exact, :exact => true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end

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

@@ -45,5 +45,17 @@ Capybara::SpecHelper.spec Capybara::Selector do
     it "can find specifically by placeholder" do
       expect(@session.find(:field, placeholder: 'FirstName')['id']).to eq "form_first_name"
     end
+
+    it "can find by type" do
+      expect(@session.find(:field, 'Confusion', type: 'checkbox')['id']).to eq 'confusion_checkbox'
+      expect(@session.find(:field, 'Confusion', type: 'text')['id']).to eq 'confusion_text'
+      expect(@session.find(:field, 'Confusion', type: 'textarea')['id']).to eq 'confusion_textarea'
+    end
+
+    it "can find by class" do
+      expect(@session.find(:field, class: 'confusion-checkbox')['id']).to eq 'confusion_checkbox'
+      expect(@session).to have_selector(:field, class: 'confusion', count: 3)
+      expect(@session.find(:field, class: ['confusion','confusion-textarea'])['id']).to eq 'confusion_textarea'
+    end
   end
 end

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

@@ -526,4 +526,15 @@ New line after and before textarea tag
   </p>
 </form>
 
+<label>Confusion
+  <input type="checkbox" id="confusion_checkbox" class="confusion-checkbox confusion"/>
+</label>
+
+<label>Confusion
+  <input type="text" id="confusion_text" class="confusion-text confusion"/>
+</label>
+
+<label>Confusion
+  <textarea id="confusion_textarea" class="confusion confusion-textarea"/>
+</label>
 

data/lib/capybara/version.rb

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

data/spec/fixtures/capybara.csv

@@ -0,0 +1 @@
+test, mime-type, file

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a non-zero exit status" do
-    browser = Capybara::Selenium::Driver.new(TestApp).browser
+    browser = Capybara::Selenium::Driver.new(TestApp, browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym).browser
     expect(true).to eq(false)
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a zero exit status" do
-    browser = Capybara::Selenium::Driver.new(TestApp).browser
+    browser = Capybara::Selenium::Driver.new(TestApp, browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym).browser
     expect(true).to eq(true)
   end
 end

data/spec/rack_test_spec.rb

@@ -79,6 +79,14 @@ RSpec.describe Capybara::Session do
           expect(@session.html).to include('Successfully ignored empty file field.')
         end
       end
+
+      it "should not submit an obsolete mime type" do
+        @test_jpg_file_path = File.expand_path('fixtures/capybara.csv', File.dirname(__FILE__))
+        @session.visit("/form")
+        @session.attach_file "form_document", @test_jpg_file_path
+        @session.click_button('Upload Single')
+        expect(@session).to have_content("Content-type: text/csv")
+      end
     end
 
     describe "#click" do

data/spec/result_spec.rb

@@ -81,6 +81,9 @@ RSpec.describe Capybara::Result do
     expect(result.instance_variable_get('@result_cache').size).to be 1
 
     #works for indexed access
+    result[0]
+    expect(result.instance_variable_get('@result_cache').size).to be 1
+
     result[2]
     expect(result.instance_variable_get('@result_cache').size).to be 3
 

data/spec/selenium_firefox_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+
+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)
+  Capybara::Selenium::Driver.new(app, browser: :firefox)
+end
+
+module TestSessions
+  Selenium = Capybara::Session.new(:selenium_focus, TestApp)
+end
+
+skipped_tests = [
+  :response_headers,
+  :status_code,
+  :trigger
+]
+skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => skipped_tests
+
+RSpec.describe "Capybara::Session with firefox" do
+  include_examples  "Capybara::Session", TestSessions::Selenium, :selenium_focus
+end
+
+RSpec.describe Capybara::Selenium::Driver do
+  before do
+    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
+  end
+
+  describe '#quit' do
+    it "should reset browser when quit" do
+      expect(@driver.browser).to be
+      @driver.quit
+      #access instance variable directly so we don't create a new browser instance
+      expect(@driver.instance_variable_get(:@browser)).to be_nil
+    end
+  end
+end
+

data/spec/selenium_spec_chrome.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 require 'selenium-webdriver'
-
-Selenium::WebDriver::Chrome.driver_path = '/home/travis/chromedriver' if ENV['TRAVIS']
+require 'shared_selenium_session'
 
 Capybara.register_driver :selenium_chrome do |app|
   args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
@@ -18,3 +17,7 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :capybar
   :status_code,
   :trigger
   ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')
+
+RSpec.describe "Capybara::Session with chrome" do
+  include_examples  "Capybara::Session", TestSessions::Chrome, :selenium_chrome
+end

data/spec/{selenium_spec.rb → shared_selenium_session.rb}

@@ -2,32 +2,12 @@
 require 'spec_helper'
 require "selenium-webdriver"
 
-Selenium::WebDriver::Firefox.driver_path = '/home/travis/geckodriver' if ENV['TRAVIS'] && ENV['GECKODRIVER']
+RSpec.shared_examples "Capybara::Session" do |session, mode|
+  let(:session) {session}
 
-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)
-  Capybara::Selenium::Driver.new(app, browser: :firefox)
-end
-
-module TestSessions
-  Selenium = Capybara::Session.new(:selenium_focus, TestApp)
-end
-
-skipped_tests = [
-  :response_headers,
-  :status_code,
-  :trigger
-]
-skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
-
-Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => skipped_tests
-
-RSpec.describe Capybara::Session do
   context 'with selenium driver' do
     before do
-      @session = TestSessions::Selenium
+      @session = session
     end
 
     describe '#driver' do
@@ -38,7 +18,7 @@ RSpec.describe Capybara::Session do
 
     describe '#mode' do
       it "should remember the mode" do
-        expect(@session.mode).to eq(:selenium_focus)
+        expect(@session.mode).to eq(mode)
       end
     end
 
@@ -61,13 +41,15 @@ RSpec.describe Capybara::Session do
       end
 
       it "should have return code 1 when running selenium_driver_rspec_failure.rb" do
+        ENV['SELENIUM_BROWSER'] = @session.driver.options[:browser].to_s
         `rspec spec/fixtures/selenium_driver_rspec_failure.rb`
-        expect($?.exitstatus).to be 1
+        expect($?.exitstatus).to eq(1)
       end
 
       it "should have return code 0 when running selenium_driver_rspec_success.rb" do
+        ENV['SELENIUM_BROWSER'] = @session.driver.options[:browser].to_s
         `rspec spec/fixtures/selenium_driver_rspec_success.rb`
-        expect($?.exitstatus).to be 0
+        expect($?.exitstatus).to eq(0)
       end
     end
 
@@ -76,7 +58,7 @@ RSpec.describe Capybara::Session do
         @session.visit('/with_js')
         @session.click_link('Open alert')
         @session.accept_alert
-        expect{@session.driver.browser.switch_to.alert}.to raise_error("No alert is present")
+        expect{@session.driver.browser.switch_to.alert}.to raise_error(Selenium::WebDriver::Error::NoAlertPresentError)
       end
     end
 
@@ -136,19 +118,3 @@ RSpec.describe Capybara::Session do
     end
   end
 end
-
-RSpec.describe Capybara::Selenium::Driver do
-  before do
-    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
-  end
-
-  describe '#quit' do
-    it "should reset browser when quit" do
-      expect(@driver.browser).to be
-      @driver.quit
-      #access instance variable directly so we don't create a new browser instance
-      expect(@driver.instance_variable_get(:@browser)).to be_nil
-    end
-  end
-end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -245,6 +245,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yard/templates_custom/default/class/html/selectors.erb"
+- ".yard/templates_custom/default/class/html/setup.rb"
+- ".yard/yard_extensions.rb"
+- ".yardopts"
 - History.md
 - License.txt
 - README.md
@@ -282,6 +286,7 @@ files:
 - lib/capybara/selector.rb
 - lib/capybara/selector/filter.rb
 - lib/capybara/selector/filter_set.rb
+- lib/capybara/selector/selector.rb
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
@@ -400,6 +405,7 @@ files:
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
 - spec/dsl_spec.rb
+- spec/fixtures/capybara.csv
 - spec/fixtures/selenium_driver_rspec_failure.rb
 - spec/fixtures/selenium_driver_rspec_success.rb
 - spec/rack_test_spec.rb
@@ -410,9 +416,10 @@ files:
 - spec/rspec/views_spec.rb
 - spec/rspec_spec.rb
 - spec/selector_spec.rb
-- spec/selenium_spec.rb
+- spec/selenium_firefox_spec.rb
 - spec/selenium_spec_chrome.rb
 - spec/server_spec.rb
+- spec/shared_selenium_session.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jnicklas/capybara
 licenses: