capybara 2.8.1 → 2.9.0

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.1
+  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-25 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: