From a916a90b21ec9008f341e12b63cb8aa6e0572b74 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Tue, 17 Oct 2017 15:23:16 -0700 Subject: [PATCH] Loosen Capybara restriction and test with 2.15 --- .travis.yml | 4 ++-- capybara-webkit.gemspec | 2 +- gemfiles/{2.13.gemfile => 2.15.gemfile} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename gemfiles/{2.13.gemfile => 2.15.gemfile} (86%) diff --git a/.travis.yml b/.travis.yml index 27a9837..55ce427 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: gemfile: gemfiles/2.7.gemfile env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake - rvm: 1.9.3 - gemfile: gemfiles/2.13.gemfile + gemfile: gemfiles/2.15.gemfile env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake - rvm: 2.3.3 gemfile: gemfiles/master.gemfile @@ -36,7 +36,7 @@ matrix: - gemfile: gemfiles/master.gemfile gemfile: - gemfiles/2.7.gemfile - - gemfiles/2.13.gemfile + - gemfiles/2.15.gemfile before_install: - gem install bundler install: bundle diff --git a/capybara-webkit.gemspec b/capybara-webkit.gemspec index f1d7eb2..56c91b8 100644 --- a/capybara-webkit.gemspec +++ b/capybara-webkit.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.requirements << "Qt >= 4.8" - s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.15.0") + s.add_runtime_dependency("capybara", "~>2.3") s.add_runtime_dependency("json") s.add_development_dependency("rspec", "~> 3.5") diff --git a/gemfiles/2.13.gemfile b/gemfiles/2.15.gemfile similarity index 86% rename from gemfiles/2.13.gemfile rename to gemfiles/2.15.gemfile index c5e14be..41fe5c9 100644 --- a/gemfiles/2.13.gemfile +++ b/gemfiles/2.15.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19] gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19] -gem "capybara", "~> 2.13.0" +gem "capybara", "~> 2.15.0" gem "addressable", "< 2.5.0", :platforms=>[:ruby_19, :jruby_19] gem "nokogiri", "< 1.7.0", :platforms=>[:ruby_19, :jruby_19]