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

ritxi · May 5, 2011 · 7a8cd4c · 7a8cd4c
1 parent 85ac9c1
commit 7a8cd4c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/spec/driver_spec.rb b/spec/driver_spec.rb
@@ -546,17 +546,42 @@
     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>

diff --git a/src/WebPage.cpp b/src/WebPage.cpp
@@ -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();
 }