kotovalexarian-likes-github
/
capybara-webkit
mirror of https://github.com/thoughtbot/capybara-webkit
1
0
Fork 0
Code Releases Activity

Raise errors with the requested URL and not the last loaded URL

This commit is contained in:
Joe Ferris 2011-05-05 10:30:43 -04:00
parent 85ac9c17d5
commit 7a8cd4cc2f
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spec/driver_spec.rb
View File

@ -546,17 +546,42 @@ describe Capybara::Driver::Webkit do
end
end
context "error app" do
before(:all) do
@app = lambda do |env|
if env['PATH_INFO'] == "/error"
body = "error"
[404, {}, []]
else
body = <<-HTML
<html><body>
<form action="/error"><input type="submit"/></form>
</body></html>
HTML
[200,
{ 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
[body]]
end
end
end
it "raises a webkit error for the requested url" do
expect {
subject.find("//input").first.click
subject.find("//p")
}.
to raise_error(Capybara::Driver::Webkit::WebkitError, %r{/error})
end
end
context "slow error app" do
before(:all) do
@app = lambda do |env|
if env['PATH_INFO'] == "/error"
puts "time for an error"
body = "error"
sleep(1)
puts "done with error"
[304, {}, []]
else
puts "time for great success"
body = <<-HTML
<html><body>
<form action="/error"><input type="submit"/></form>

2
src/WebPage.cpp
View File

@ -87,6 +87,6 @@ bool WebPage::isLoading() const {
}
QString WebPage::failureString() {
return QString("Unable to load URL: ") + currentFrame()->url().toString();
return QString("Unable to load URL: ") + currentFrame()->requestedUrl().toString();
}