Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typhoeus 0.4.0 issues. #189

Merged
merged 1 commit into from Jul 23, 2012
Merged

Fix typhoeus 0.4.0 issues. #189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions spec/acceptance/shared/request_expectations.rb
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down