Permalink
Browse files

Upgrade to WebMock 1.4.0.

  • Loading branch information...
1 parent 8f369c1 commit 91d67adebf87412c5b39399bd3a120ba6b0b68b5 @myronmarston committed Oct 13, 2010
Showing with 11 additions and 16 deletions.
  1. +1 −0 CHANGELOG.md
  2. +0 −2 Gemfile
  3. +5 −10 Gemfile.lock
  4. +1 −1 lib/vcr/http_stubbing_adapters/webmock.rb
  5. +3 −3 spec/http_stubbing_adapters/webmock_spec.rb
  6. +1 −0 vcr.gemspec
View
@@ -17,6 +17,7 @@
* Added spec and feature coverage for Curb integration. Works out of the box with no changes required
to VCR due to [Pete Higgins'](http://github.com/phiggins) great work to add Curb support to WebMock.
* Got specs and features to pass on rubinius.
+* Changed WebMock version requirement to 1.4.0.
## 1.1.2 (September 9, 2010)
View
@@ -8,8 +8,6 @@ group :development do
gem 'em-http-request', '~> 0.2.7'
gem 'curb', '~> 0.7.8'
end
-
- gem 'webmock', :git => 'git://github.com/bblimke/webmock.git'
end
# Additional gems that are useful, but not required for development.
View
@@ -1,11 +1,3 @@
-GIT
- remote: git://github.com/bblimke/webmock.git
- revision: aaf774b6fe38f1516cddedd3df32f222eb3a1a45
- specs:
- webmock (1.3.5)
- addressable (>= 2.1.1)
- crack (>= 0.1.7)
-
PATH
remote: .
specs:
@@ -14,7 +6,7 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- addressable (2.2.1)
+ addressable (2.2.2)
archive-tar-minitar (0.5.2)
aruba (0.2.1)
builder (2.1.2)
@@ -74,6 +66,9 @@ GEM
term-ansicolor (1.0.5)
timecop (0.3.5)
trollop (1.16.2)
+ webmock (1.4.0)
+ addressable (>= 2.2.2)
+ crack (>= 0.1.7)
PLATFORMS
java
@@ -97,4 +92,4 @@ DEPENDENCIES
ruby-debug19
timecop (~> 0.3.5)
vcr!
- webmock!
+ webmock (~> 1.4.0)
@@ -6,7 +6,7 @@ module WebMock
include VCR::HttpStubbingAdapters::Common
extend self
- VERSION_REQUIREMENT = '1.3.3'
+ VERSION_REQUIREMENT = '1.4.0'
def http_connections_allowed?
::WebMock::Config.instance.allow_net_connect
@@ -10,23 +10,23 @@
describe '#check_version!' do
before(:each) { WebMock.should respond_to(:version) }
- %w( 0.9.9 0.9.10 0.1.30 1.0.30 1.2.9 1.3.2 ).each do |version|
+ %w( 0.9.9 0.9.10 0.1.30 1.0.30 1.2.9 1.3.9 ).each do |version|
it "raises an error when WebMock's version is #{version}" do
WebMock.stub!(:version).and_return(version)
described_class.should_not_receive(:warn)
expect { described_class.check_version! }.to raise_error(/You are using WebMock #{version}. VCR requires version .* or greater/)
end
end
- %w( 1.3.3 1.3.10 1.3.99 ).each do |version|
+ %w( 1.4.0 1.4.10 1.4.99 ).each do |version|
it "does nothing when WebMock's version is #{version}" do
WebMock.stub!(:version).and_return(version)
described_class.should_not_receive(:warn)
expect { described_class.check_version! }.to_not raise_error
end
end
- %w( 1.4.0 1.10.0 2.0.0 ).each do |version|
+ %w( 1.5.0 1.10.0 2.0.0 ).each do |version|
it "does nothing when WebMock's version is #{version}" do
WebMock.stub!(:version).and_return(version)
described_class.should_receive(:warn).with(/VCR is known to work with WebMock ~> .*\./)
View
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
'aruba' => '~> 0.2.1',
'fakeweb' => '~> 1.3.0',
+ 'webmock' => '~> 1.4.0',
'httpclient' => '~> 2.1.5.2',

0 comments on commit 91d67ad

Please sign in to comment.