Browse files

revert to upstream webmock

setting expecataions on stubs has been merged to mainline
  • Loading branch information...
1 parent 940cf62 commit 5fae6794c85a9d0e4d4019a10843d6e7d6e1b551 @bronson bronson committed Mar 30, 2012
Showing with 11 additions and 18 deletions.
  1. +4 −5 Gemfile
  2. +7 −13 Gemfile.lock
View
9 Gemfile
@@ -19,7 +19,7 @@ gem 'octokit' ,'~> 0.5'
gem 'mimemagic', '= 0.1.7'
# scraper problems with 0.8.3, mad monkeypatching for 0.8.2. Only viable fix is to convert to Nokogiri.
-gem 'hpricot','= 0.8.2'
+gem 'hpricot', '= 0.8.2'
# we use some convenience features that other retryables don't support (yet?)
gem 'retryable', :git => 'git://github.com/bronson/retryable.git'
@@ -34,9 +34,8 @@ group :development do
end
group :test do
- gem 'rake' # needed by travis-ci
- gem 'rspec' ,'~> 2.5'
- # to mock github requests:
- gem 'webmock' , :git => 'https://github.com/afeld/webmock.git', :branch => "expectations_on_stubs"
+ gem 'rake' # needed by travis-ci
+ gem 'rspec', '~> 2.5'
+ gem 'webmock', '~> 1.8' # to mock github requests
end
View
20 Gemfile.lock
@@ -11,25 +11,16 @@ GIT
specs:
retryable (0.9.0)
-GIT
- remote: https://github.com/afeld/webmock.git
- revision: 76c01cf597a1a46e66513f5f3a2dd23e5c586711
- branch: expectations_on_stubs
- specs:
- webmock (1.6.4)
- addressable (~> 2.2, > 2.2.5)
- crack (>= 0.1.7)
-
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
activesupport (3.0.8)
- addressable (2.2.6)
+ addressable (2.2.7)
builder (3.0.0)
bzip2-ruby (0.2.7)
- crack (0.1.8)
- curb (0.7.15)
+ crack (0.3.1)
+ curb (0.8.0)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
@@ -92,6 +83,9 @@ GEM
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
+ webmock (1.8.5)
+ addressable (>= 2.2.7)
+ crack (>= 0.1.7)
PLATFORMS
ruby
@@ -114,4 +108,4 @@ DEPENDENCIES
rake
retryable!
rspec (~> 2.5)
- webmock!
+ webmock (~> 1.8)

0 comments on commit 5fae679

Please sign in to comment.