Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix typhoeus 0.4.0 issues. #189

Merged
merged 1 commit into from

2 participants

@i0rek

Hi,

this PR fixes the issues with the lastest version of typhoeus. The issues are coming from this commit: typhoeus/typhoeus@ba96425. I'll add more fixes until the new version is released.

@i0rek

Typhoeus is released and webmock green with theses fixes.

@bblimke
Owner

Thank you for this patch.

@bblimke bblimke merged commit a240801 into bblimke:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 6, 2012
  1. @i0rek

    Fix typhoeus 0.4.0 issues.

    i0rek authored
This page is out of date. Refresh to see the latest.
Showing with 8 additions and 8 deletions.
  1. +8 −8 spec/acceptance/shared/request_expectations.rb
View
16 spec/acceptance/shared/request_expectations.rb
@@ -190,10 +190,10 @@
it "should fail if request was executed with different body" do
lambda {
- http_request(:get, "http://www.example.com/", :body => "abc")
- a_request(:get, "www.example.com").
+ http_request(:post, "http://www.example.com/", :body => "abc")
+ a_request(:post, "www.example.com").
with(:body => "def").should have_been_made
- }.should fail_with(%r(The request GET http://www.example.com/ with body "def" was expected to execute 1 time but it executed 0 times))
+ }.should fail_with(%r(The request POST http://www.example.com/ with body "def" was expected to execute 1 time but it executed 0 times))
end
describe "when expected request body is declared as a regexp" do
@@ -206,10 +206,10 @@
it "should fail if request was executed with body not matching regexp" do
lambda {
- http_request(:get, "http://www.example.com/", :body => "abc")
- a_request(:get, "www.example.com").
+ http_request(:post, "http://www.example.com/", :body => "abc")
+ a_request(:post, "www.example.com").
with(:body => /^xabc/).should have_been_made
- }.should fail_with(%r(The request GET http://www.example.com/ with body /\^xabc/ was expected to execute 1 time but it executed 0 times))
+ }.should fail_with(%r(The request POST http://www.example.com/ with body /\^xabc/ was expected to execute 1 time but it executed 0 times))
end
end
@@ -389,11 +389,11 @@
it "should satisfy expectation if request was executed with body and headers but they were not specified in expectantion" do
lambda {
- http_request(:get, "http://www.example.com/",
+ http_request(:post, "http://www.example.com/",
:body => "abc",
:headers => SAMPLE_HEADERS
)
- a_request(:get, "www.example.com").should have_been_made
+ a_request(:post, "www.example.com").should have_been_made
}.should_not raise_error
end
Something went wrong with that request. Please try again.