diff --git a/.travis.yml b/.travis.yml index 85b77b4d..c638d2de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ # - "sh -e /etc/init.d/xvfb start" before_install: - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start"# + - "sh -e /etc/init.d/xvfb start" + - "sh -e travis-chromium-script.sh" script: "DISPLAY=:99.0 bundle exec rake core_spec" rvm: @@ -11,5 +12,4 @@ rvm: env: - JASMINE_BROWSER=firefox - JASMINE_BROWSER=chrome - - JASMINE_BROWSER=safari - JASMINE_BROWSER=phantomjs diff --git a/spec/jasmine_self_test_spec.rb b/spec/jasmine_self_test_spec.rb index 4c1594da..f6fd6e94 100644 --- a/spec/jasmine_self_test_spec.rb +++ b/spec/jasmine_self_test_spec.rb @@ -5,7 +5,7 @@ require 'jasmine' Jasmine.load_configuration_from_yaml(File.join(Dir.pwd, 'spec', 'jasmine.yml')) config = Jasmine.config Jasmine.configure do |config| - config.browser = ENV.fetch('JASMINE_BROWSER', 'firefox') + config.browser = ENV['JASMINE_BROWSER'] || 'firefox' end server = Jasmine::Server.new(config.port, Jasmine::Application.app(config)) driver = Jasmine::SeleniumDriver.new(config.browser, "#{config.host}:#{config.port}/") diff --git a/travis-chromium-script.sh b/travis-chromium-script.sh new file mode 100644 index 00000000..3133aa07 --- /dev/null +++ b/travis-chromium-script.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e + +sudo apt-get update +sudo apt-get install chromium-browser +wget https://chromedriver.googlecode.com/files/chromedriver_linux64_2.1.zip +unzip chromedriver_linux64_2.1.zip +sudo mv chromedriver /usr/local/bin/ \ No newline at end of file