Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: thoughtbot/capybara-webkit
...
head fork: Fonsan/capybara-webkit
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 18 additions and 17 deletions.
  1. +1 −1  Gemfile
  2. +17 −16 Gemfile.lock
View
2  Gemfile
@@ -1,5 +1,5 @@
source "http://rubygems.org"
gem "rspec", :require => false
-gem "capybara"
+gem "capybara", :git => 'git://github.com/jnicklas/capybara.git'
gem "sinatra", :require => false
View
33 Gemfile.lock
@@ -1,21 +1,22 @@
-GEM
- remote: http://rubygems.org/
+GIT
+ remote: git://github.com/jnicklas/capybara.git
+ revision: aa5fefa385f3c0258c9271e29bda82b4a29d0b44
specs:
- capybara (0.4.1.2)
- celerity (>= 0.7.9)
- culerity (>= 0.2.4)
+ capybara (1.0.0.beta1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27)
- xpath (~> 0.1.3)
- celerity (0.8.8)
- childprocess (0.1.7)
- ffi (~> 0.6.3)
- culerity (0.2.15)
+ xpath (~> 0.1.4)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ childprocess (0.1.8)
+ ffi (~> 1.0.6)
diff-lcs (1.1.2)
- ffi (0.6.3)
+ ffi (1.0.7)
rake (>= 0.8.7)
json_pure (1.5.1)
mime-types (1.16)
@@ -33,22 +34,22 @@ GEM
diff-lcs (~> 1.1.2)
rspec-mocks (2.5.0)
rubyzip (0.9.4)
- selenium-webdriver (0.1.3)
- childprocess (~> 0.1.5)
- ffi (~> 0.6.3)
+ selenium-webdriver (0.2.0)
+ childprocess (>= 0.1.7)
+ ffi (>= 1.0.7)
json_pure
rubyzip
sinatra (1.1.2)
rack (~> 1.1)
tilt (~> 1.2)
tilt (1.2.2)
- xpath (0.1.3)
+ xpath (0.1.4)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
- capybara
+ capybara!
rspec
sinatra

No commit comments for this range

Something went wrong with that request. Please try again.