Setup travis to test selenium-webdriver HEAD with Chrome too

.travis.yml

@@ -30,16 +30,23 @@ matrix:
     - gemfile: gemfiles/Gemfile.beta-versions
       rvm: 2.4.0-preview1
     - gemfile: gemfiles/Gemfile.beta-marionette
-      env:
+      env: GECKODRIVER=true
-        - GECKODRIVER=true
-          SELENIUM_BETA=true
-
       rvm: 2.3.1
       addons:
         firefox: latest-beta
         apt:
           packages:
             - awesome
+    - gemfile: gemfiles/Gemfile.beta-marionette
+      env: CAPYBARA_CHROME=true
+      rvm: 2.3.1
+      addons:
+        apt:
+          sources:
+            - google-chrome
+          packages:
+            - google-chrome-stable
+            - awesome
   allow_failures:
     - gemfile: gemfiles/Gemfile.beta-versions
     - gemfile: gemfiles/Gemfile.beta-marionette
@@ -56,20 +63,24 @@ addons:
       - awesome
 
 before_install:
+  - mkdir -p ~/drivers; export PATH=~/drivers:$PATH;
   - if [ $CAPYBARA_CHROME ]; then
       CHROMEDRIVER_VERSION=$(wget -q -O - http://chromedriver.storage.googleapis.com/LATEST_RELEASE);
       CHROMEDRIVER_URL="http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip";
-      FILE=`mktemp`; wget "$CHROMEDRIVER_URL" -qO $FILE && unzip $FILE chromedriver -d ~; rm $FILE; chmod 777 ~/chromedriver;
+      FILE=`mktemp`; wget "$CHROMEDRIVER_URL" -qO $FILE && unzip $FILE chromedriver -d ~/drivers; rm $FILE; chmod 777 ~/drivers/chromedriver;
+      ~/drivers/chromedriver --version;
     fi
   - if [ $GECKODRIVER ]; then
       GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/v0.10.0/geckodriver-v0.10.0-linux64.tar.gz";
-      FILE=`mktemp`; wget "$GECKODRIVER_URL" -qO $FILE && tar xz -C ~ -f $FILE geckodriver; rm $FILE; chmod 777 ~/geckodriver;
+      FILE=`mktemp`; wget "$GECKODRIVER_URL" -qO $FILE && tar xz -C ~/drivers -f $FILE geckodriver; rm $FILE; chmod 777 ~/drivers/geckodriver;
+      ~/drivers/geckodriver --version;
     fi
-  - if [ $SELENIUM_BETA ]; then
+  - if [[ $BUNDLE_GEMFILE =~ Gemfile.beta-marionette$ ]]; then
-      cd ..; git clone --depth 1 https://github.com/SeleniumHQ/selenium.git;
+      pushd ..;
+      git clone --depth 1 https://github.com/SeleniumHQ/selenium.git;
       cd selenium; ./go //rb:gem:build;
-      cd ../capybara;
+      popd;
-      bundle config local.selenium-webdriver $HOME/selenium/build/rb;
+      bundle config local.selenium-webdriver ../selenium/build/rb;
     fi
 before_script:
   - export DISPLAY=:99.0

Rakefile

@@ -6,9 +6,11 @@ require 'yard'
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w[--color]
+  # When we drop RSpec 2.x support we can rename spec_chrome.rb and implement this properly
+  # t.exclude_pattern = './spec/*{_chrome_spec.rb}'
 end
 
-RSpec::Core::RakeTask.new(:spec_with_chrome) do |t|
+RSpec::Core::RakeTask.new(:all) do |t|
   t.rspec_opts = %w[--color]
   # jruby buffers the progress formatter so travis doesn't see output often enough
   t.rspec_opts << '--format documentation' if RUBY_PLATFORM=='java'

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

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

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
+

spec/selenium_spec_chrome.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 require 'selenium-webdriver'
-
+require 'shared_selenium_session'
-Selenium::WebDriver::Chrome.driver_path = '/home/travis/chromedriver' if ENV['TRAVIS']
 
 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

spec/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,11 +41,13 @@ 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 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 eq(0)
       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
-