mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-27 17:44:08 +01:00
Use Firefox 45 ESR for webdriver compatibility (#2079)
This commit is contained in:
parent
0d99c3df74
commit
a8e2978054
3 changed files with 9 additions and 16 deletions
10
.travis.yml
10
.travis.yml
|
|
@ -1,28 +1,22 @@
|
|||
language: ruby
|
||||
|
||||
sudo: false
|
||||
|
||||
cache: bundler
|
||||
|
||||
rvm:
|
||||
- 1.9.3
|
||||
- 2.0.0
|
||||
- 2.1
|
||||
- 2.2
|
||||
|
||||
addons:
|
||||
firefox: 45.8.0esr
|
||||
env:
|
||||
- DATABASE_URL=mysql2://localhost/tracks_test
|
||||
- DATABASE_URL=sqlite3:db/test.sqlite3
|
||||
|
||||
bundler_args: --without development --jobs=3 --retry=3
|
||||
|
||||
before_script:
|
||||
- "export DISPLAY=:99.0"
|
||||
- "sh -e /etc/init.d/xvfb start"
|
||||
- "cp config/site.yml.tmpl config/site.yml"
|
||||
|
||||
script: "if [[ $DATABASE_URL == mysql* ]]; then bundle exec rake ci:full; else bundle exec rake ci:lite; fi"
|
||||
|
||||
notifications:
|
||||
email: false
|
||||
irc:
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -79,7 +79,7 @@ group :test do
|
|||
|
||||
gem "aruba", ">=0.5.4", :require => false
|
||||
|
||||
gem "selenium-webdriver", '>= 2.50'
|
||||
gem "selenium-webdriver", "~> 2.53"
|
||||
|
||||
# uncomment to use the webkit option. This depends on Qt being installed
|
||||
# gem "capybara-webkit"
|
||||
|
|
|
|||
13
Gemfile.lock
13
Gemfile.lock
|
|
@ -75,7 +75,7 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.5.5)
|
||||
childprocess (0.6.2)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
climate_control (0.0.3)
|
||||
activesupport (>= 3.0)
|
||||
|
|
@ -117,7 +117,7 @@ GEM
|
|||
factory_girl_rails (4.5.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
railties (>= 3.0.0)
|
||||
ffi (1.9.6)
|
||||
ffi (1.9.18)
|
||||
font-awesome-sass (4.5.0)
|
||||
sass (>= 3.2)
|
||||
gherkin (2.12.2)
|
||||
|
|
@ -209,7 +209,7 @@ GEM
|
|||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
ruby-progressbar (1.8.1)
|
||||
rubyzip (1.1.7)
|
||||
rubyzip (1.2.1)
|
||||
safe_yaml (1.0.4)
|
||||
sanitize (3.0.3)
|
||||
crass (~> 0.2.0)
|
||||
|
|
@ -222,9 +222,8 @@ GEM
|
|||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
selenium-webdriver (2.50.0)
|
||||
selenium-webdriver (2.53.4)
|
||||
childprocess (~> 0.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
simplecov (0.9.1)
|
||||
|
|
@ -267,7 +266,7 @@ GEM
|
|||
json (>= 1.8.0)
|
||||
unicode-display_width (1.1.1)
|
||||
uniform_notifier (1.6.2)
|
||||
websocket (1.2.2)
|
||||
websocket (1.2.4)
|
||||
will_paginate (3.0.7)
|
||||
xpath (2.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
|
@ -309,7 +308,7 @@ DEPENDENCIES
|
|||
rubocop (~> 0.41.2)
|
||||
sanitize (>= 3.0.0)
|
||||
sass-rails (~> 5.0)
|
||||
selenium-webdriver (>= 2.50)
|
||||
selenium-webdriver (~> 2.53)
|
||||
simplecov
|
||||
spring
|
||||
spring-commands-cucumber
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue