webmock 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.md +4 -0
- data/VERSION +1 -1
- data/lib/webmock/rspec.rb +3 -2
- data/webmock.gemspec +2 -2
- metadata +4 -4
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
#Changelog
|
|
2
2
|
|
|
3
|
+
## 1.6.1
|
|
4
|
+
|
|
5
|
+
* Fixed issue with `webmock/rspec` which didn't load correctly if `rspec/core` was already required but `rspec/expectations` not.
|
|
6
|
+
|
|
3
7
|
## 1.6.0
|
|
4
8
|
|
|
5
9
|
* Simplified integration with Test::Unit, RSpec and Cucumber. Now only a single file has to be required i.e.
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.6.
|
|
1
|
+
1.6.1
|
data/lib/webmock/rspec.rb
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
require 'webmock'
|
|
2
2
|
|
|
3
3
|
# RSpec 1.x and 2.x compatibility
|
|
4
|
-
if defined?(RSpec)
|
|
4
|
+
if defined?(RSpec) && defined?(RSpec::Expectations)
|
|
5
5
|
RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
|
|
6
6
|
elsif defined?(Spec)
|
|
7
7
|
RSPEC_NAMESPACE = Spec
|
|
8
8
|
RSPEC_CONFIGURER = Spec::Runner
|
|
9
9
|
else
|
|
10
10
|
begin
|
|
11
|
-
require 'rspec'
|
|
11
|
+
require 'rspec/core'
|
|
12
|
+
require 'rspec/expectations'
|
|
12
13
|
RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
|
|
13
14
|
rescue LoadError
|
|
14
15
|
require 'spec'
|
data/webmock.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{webmock}
|
|
8
|
-
s.version = "1.6.
|
|
8
|
+
s.version = "1.6.1"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Bartosz Blimke"]
|
|
12
|
-
s.date = %q{2010-11-
|
|
12
|
+
s.date = %q{2010-11-13}
|
|
13
13
|
s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
|
|
14
14
|
s.email = %q{bartosz.blimke@gmail.com}
|
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: webmock
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 13
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 1
|
|
8
8
|
- 6
|
|
9
|
-
-
|
|
10
|
-
version: 1.6.
|
|
9
|
+
- 1
|
|
10
|
+
version: 1.6.1
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Bartosz Blimke
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2010-11-
|
|
18
|
+
date: 2010-11-13 00:00:00 +00:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|