reset history when resetting session

spraints · Feb 17, 2012 · eaec979 · eaec979
1 parent 5eacd08
commit eaec979
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/spec/driver_spec.rb b/spec/driver_spec.rb
@@ -211,6 +211,11 @@
       subject.find("//*[contains(., 'hello')]").should be_empty
     end
 
+    it "has a location of 'about:blank' after reseting" do
+      subject.reset!
+      subject.current_url.should == "about:blank"
+    end
+
     it "raises an error for an invalid xpath query" do
       expect { subject.find("totally invalid salad") }.
         to raise_error(Capybara::Driver::Webkit::WebkitInvalidResponseError, /xpath/i)

diff --git a/src/Reset.cpp b/src/Reset.cpp
@@ -16,6 +16,13 @@ void Reset::start(QStringList &arguments) {
   page()->setUserAgent(NULL);
   page()->resetResponseHeaders();
   page()->resetConsoleMessages();
+  resetHistory();
   emit finished(new Response(true));
 }
 
+void Reset::resetHistory() {
+  // Clearing the history preserves the current history item, so set it to blank first.
+  page()->currentFrame()->setUrl(QUrl("about:blank"));
+  page()->history()->clear();
+}
+
diff --git a/src/Reset.h b/src/Reset.h
@@ -8,5 +8,8 @@ class Reset : public Command {
   public:
     Reset(WebPage *page, QObject *parent = 0);
     virtual void start(QStringList &arguments);
+
+  private:
+    void resetHistory();
 };