Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Bump Capybara 2.1 appraisal to beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
mhoran committed Mar 29, 2013
1 parent 136e0e2 commit 8be4f31
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 23 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -6,7 +6,6 @@ rvm:
matrix: matrix:
allow_failures: allow_failures:
- rvm: rbx-19mode - rvm: rbx-19mode
- gemfile: gemfiles/2.1.gemfile
exclude: exclude:
- rvm: 1.9.3 - rvm: 1.9.3
gemfile: gemfiles/2.0.gemfile gemfile: gemfiles/2.0.gemfile
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Expand Up @@ -3,5 +3,5 @@ appraise "2.0" do
end end


appraise "2.1" do appraise "2.1" do
gem "capybara", github: "jnicklas/capybara", submodules: true gem "capybara", "~> 2.1.0.beta1"
end end
2 changes: 1 addition & 1 deletion gemfiles/2.0.gemfile
@@ -1,6 +1,6 @@
# This file was generated by Appraisal # This file was generated by Appraisal


source "http://rubygems.org" source "https://rubygems.org"


gem "capybara", "~> 2.0.2" gem "capybara", "~> 2.0.2"


Expand Down
2 changes: 1 addition & 1 deletion gemfiles/2.0.gemfile.lock
Expand Up @@ -6,7 +6,7 @@ PATH
json json


GEM GEM
remote: http://rubygems.org/ remote: https://rubygems.org/
specs: specs:
appraisal (0.4.1) appraisal (0.4.1)
bundler bundler
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/2.1.gemfile
@@ -1,7 +1,7 @@
# This file was generated by Appraisal # 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=>"../" gemspec :path=>"../"
28 changes: 11 additions & 17 deletions 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 PATH
remote: /home/mhoran/capybara-webkit remote: /home/mhoran/capybara-webkit
specs: specs:
Expand All @@ -20,11 +6,17 @@ PATH
json json


GEM GEM
remote: http://rubygems.org/ remote: https://rubygems.org/
specs: specs:
appraisal (0.4.1) appraisal (0.4.1)
bundler bundler
rake 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) childprocess (0.3.8)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
diff-lcs (1.1.3) diff-lcs (1.1.3)
Expand All @@ -34,7 +26,7 @@ GEM
mini_magick (3.5.0) mini_magick (3.5.0)
subexec (~> 0.2.1) subexec (~> 0.2.1)
multi_json (1.6.1) multi_json (1.6.1)
nokogiri (1.5.6) nokogiri (1.5.7)
rack (1.5.2) rack (1.5.2)
rack-protection (1.3.2) rack-protection (1.3.2)
rack rack
Expand Down Expand Up @@ -62,13 +54,15 @@ GEM
subexec (0.2.2) subexec (0.2.2)
tilt (1.3.3) tilt (1.3.3)
websocket (1.0.7) websocket (1.0.7)
xpath (2.0.0.beta1)
nokogiri (~> 1.3)


PLATFORMS PLATFORMS
ruby ruby


DEPENDENCIES DEPENDENCIES
appraisal (~> 0.4.0) appraisal (~> 0.4.0)
capybara! capybara (~> 2.1.0.beta1)
capybara-webkit! capybara-webkit!
mini_magick mini_magick
rake rake
Expand Down

0 comments on commit 8be4f31

Please sign in to comment.