diff --git a/.travis.yml b/.travis.yml index 44b90fb..9acf46d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ rvm: matrix: allow_failures: - rvm: rbx-19mode - - gemfile: gemfiles/2.1.gemfile exclude: - rvm: 1.9.3 gemfile: gemfiles/2.0.gemfile diff --git a/Appraisals b/Appraisals index ba1db2a..38c83cd 100644 --- a/Appraisals +++ b/Appraisals @@ -3,5 +3,5 @@ appraise "2.0" do end appraise "2.1" do - gem "capybara", github: "jnicklas/capybara", submodules: true + gem "capybara", "~> 2.1.0.beta1" end diff --git a/gemfiles/2.0.gemfile b/gemfiles/2.0.gemfile index 39fb0b8..04d4e85 100644 --- a/gemfiles/2.0.gemfile +++ b/gemfiles/2.0.gemfile @@ -1,6 +1,6 @@ # This file was generated by Appraisal -source "http://rubygems.org" +source "https://rubygems.org" gem "capybara", "~> 2.0.2" diff --git a/gemfiles/2.0.gemfile.lock b/gemfiles/2.0.gemfile.lock index e7dbf42..35316ff 100644 --- a/gemfiles/2.0.gemfile.lock +++ b/gemfiles/2.0.gemfile.lock @@ -6,7 +6,7 @@ PATH json GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: appraisal (0.4.1) bundler diff --git a/gemfiles/2.1.gemfile b/gemfiles/2.1.gemfile index 3039cc7..4262572 100644 --- a/gemfiles/2.1.gemfile +++ b/gemfiles/2.1.gemfile @@ -1,7 +1,7 @@ # This file was generated by Appraisal -source "http://rubygems.org" +source "https://rubygems.org" -gem "capybara", :github=>"jnicklas/capybara", :submodules=>true +gem "capybara", "~> 2.1.0.beta1" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/2.1.gemfile.lock b/gemfiles/2.1.gemfile.lock index 56b8f46..f755a92 100644 --- a/gemfiles/2.1.gemfile.lock +++ b/gemfiles/2.1.gemfile.lock @@ -1,17 +1,3 @@ -GIT - remote: git://github.com/jnicklas/capybara.git - revision: 458bb23a5cc17199aa0989fb0a0b6fb2617be74e - submodules: true - specs: - capybara (2.0.2) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 1.0.0) - xpath (1.0.0) - nokogiri (~> 1.3) - PATH remote: /home/mhoran/capybara-webkit specs: @@ -20,11 +6,17 @@ PATH json GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: appraisal (0.4.1) bundler rake + capybara (2.1.0.beta1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (>= 2.0.0.beta1) childprocess (0.3.8) ffi (~> 1.0, >= 1.0.11) diff-lcs (1.1.3) @@ -34,7 +26,7 @@ GEM mini_magick (3.5.0) subexec (~> 0.2.1) multi_json (1.6.1) - nokogiri (1.5.6) + nokogiri (1.5.7) rack (1.5.2) rack-protection (1.3.2) rack @@ -62,13 +54,15 @@ GEM subexec (0.2.2) tilt (1.3.3) websocket (1.0.7) + xpath (2.0.0.beta1) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES appraisal (~> 0.4.0) - capybara! + capybara (~> 2.1.0.beta1) capybara-webkit! mini_magick rake