Allow Capybara 2.6 - drop 2.4 from travis testing

This commit is contained in:
Thomas Walpole 2016-01-21 10:50:40 -08:00
parent 90e372cbf3
commit 806a9c90f4
6 changed files with 94 additions and 3 deletions

View File

@ -22,7 +22,7 @@ addons:
matrix:
include:
- rvm: 1.9.3
gemfile: gemfiles/2.4.gemfile
gemfile: gemfiles/2.6.gemfile
env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
- rvm: 1.9.3
gemfile: gemfiles/2.5.gemfile
@ -33,7 +33,7 @@ matrix:
allow_failures:
- gemfile: gemfiles/master.gemfile
gemfile:
- gemfiles/2.4.gemfile
- gemfiles/2.6.gemfile
- gemfiles/2.5.gemfile
before_install:
- gem install bundler

View File

@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 1.9.0"
s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.6.0")
s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.7.0")
s.add_runtime_dependency("json")
s.add_development_dependency("rspec", "~> 2.14.0")

View File

@ -3,5 +3,6 @@
source "https://rubygems.org"
gem "capybara", "~> 2.4.0"
gem "mime-types", "<3.0", platforms: [:ruby_19]
gemspec :path=>"../"

View File

@ -3,5 +3,6 @@
source "https://rubygems.org"
gem "capybara", "~> 2.5.0"
gem "mime-types", "<3.0", platforms: [:ruby_19]
gemspec :path=>"../"

8
gemfiles/2.6.gemfile Normal file
View File

@ -0,0 +1,8 @@
# This file was generated by Appraisal
source "https://rubygems.org"
gem "capybara", "~> 2.6.0"
gem "mime-types", "<3.0", platforms: [:ruby_19]
gemspec :path=>"../"

81
gemfiles/2.6.gemfile.lock Normal file
View File

@ -0,0 +1,81 @@
PATH
remote: ../
specs:
capybara-webkit (1.7.1)
capybara (>= 2.3.0, < 2.7.0)
json
GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
appraisal (0.4.1)
bundler
rake
capybara (2.6.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
diff-lcs (1.2.5)
ffi (1.9.10)
json (1.8.3)
launchy (2.4.3)
addressable (~> 2.3)
mime-types (2.99)
mime-types-data (3.2015.1120)
mini_magick (4.3.6)
mini_portile2 (2.0.0)
multi_json (1.11.2)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
rack (1.6.4)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
rake (10.5.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
rubyzip (1.1.7)
selenium-webdriver (2.49.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
tilt (2.0.2)
websocket (1.2.2)
xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
appraisal (~> 0.4.0)
capybara (~> 2.6.0)
capybara-webkit!
launchy
mime-types (< 3.0)
mini_magick
rake
rspec (~> 2.14.0)
selenium-webdriver
sinatra
BUNDLED WITH
1.11.2