Render a mouse pointer when saving screenshots

* Helpful for ClickFailed errors
youpy · Jul 22, 2014 · c1b7700 · c1b7700
1 parent 9c11c8b
commit c1b7700
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 18 deletions.
diff --git a/src/JavascriptInvocation.cpp b/src/JavascriptInvocation.cpp
@@ -39,40 +39,31 @@ InvocationResult JavascriptInvocation::invoke(QWebFrame *frame) {
 void JavascriptInvocation::leftClick(int x, int y) {
   QPoint mousePos(x, y);
 
-  hover(mousePos);
-  JavascriptInvocation::mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::LeftButton);
-  JavascriptInvocation::mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton);
+  m_page->mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::LeftButton);
+  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton);
 }
 
 void JavascriptInvocation::rightClick(int x, int y) {
   QPoint mousePos(x, y);
 
-  hover(mousePos);
-  JavascriptInvocation::mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::RightButton);
+  m_page->mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::RightButton);
 
   // swallowContextMenuEvent tries to fire contextmenu event in html page
   QContextMenuEvent *event = new QContextMenuEvent(QContextMenuEvent::Mouse, mousePos);
   m_page->swallowContextMenuEvent(event);
 
-  JavascriptInvocation::mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::RightButton);
+  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::RightButton);
 }
 
 void JavascriptInvocation::doubleClick(int x, int y) {
   QPoint mousePos(x, y);
 
-  JavascriptInvocation::mouseEvent(QEvent::MouseButtonDblClick, mousePos, Qt::LeftButton);
-  JavascriptInvocation::mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton);
-}
-
-void JavascriptInvocation::mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button) {
-  QMouseEvent event(type, position, button, button, Qt::NoModifier);
-  QApplication::sendEvent(m_page, &event);
+  m_page->mouseEvent(QEvent::MouseButtonDblClick, mousePos, Qt::LeftButton);
+  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton);
 }
 
 bool JavascriptInvocation::clickTest(QWebElement element, int absoluteX, int absoluteY) {
-  QPoint mousePos(absoluteX, absoluteY);
-  QWebHitTestResult res = m_page->mainFrame()->hitTestContent(mousePos);
-  return res.frame() == element.webFrame();
+  return m_page->clickTest(element, absoluteX, absoluteY);
 }
 
 QVariantMap JavascriptInvocation::clickPosition(QWebElement element, int left, int top, int width, int height) {
@@ -106,7 +97,7 @@ void JavascriptInvocation::hover(int absoluteX, int absoluteY) {
 }
 
 void JavascriptInvocation::hover(const QPoint &mousePos) {
-  mouseEvent(QEvent::MouseMove, mousePos, Qt::NoButton);
+  m_page->mouseEvent(QEvent::MouseMove, mousePos, Qt::NoButton);
 }
 
 int JavascriptInvocation::keyCodeFor(const QChar &key) {

diff --git a/src/JavascriptInvocation.h b/src/JavascriptInvocation.h
@@ -34,7 +34,6 @@ class JavascriptInvocation : public QObject {
     QStringList m_arguments;
     WebPage *m_page;
     QVariant m_error;
-    void mouseEvent(QEvent::Type type, const QPoint & position, Qt::MouseButton button);
     void hover(const QPoint &);
     int keyCodeFor(const QChar &);
 };

diff --git a/src/WebPage.cpp b/src/WebPage.cpp
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <QWebSettings>
 #include <QUuid>
+#include <QApplication>
 
 WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   m_loading = false;
@@ -214,6 +215,19 @@ QString WebPage::failureString() {
     return message + m_errorPageMessage;
 }
 
+void WebPage::mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button) {
+  m_mousePosition = position;
+  QMouseEvent event(type, position, button, button, Qt::NoModifier);
+  QApplication::sendEvent(this, &event);
+}
+
+bool WebPage::clickTest(QWebElement element, int absoluteX, int absoluteY) {
+  QPoint mousePos(absoluteX, absoluteY);
+  m_mousePosition = mousePos;
+  QWebHitTestResult res = mainFrame()->hitTestContent(mousePos);
+  return res.frame() == element.webFrame();
+}
+
 bool WebPage::render(const QString &fileName, const QSize &minimumSize) {
   QFileInfo fileInfo(fileName);
   QDir dir;
@@ -236,6 +250,10 @@ bool WebPage::render(const QString &fileName, const QSize &minimumSize) {
 
   this->setViewportSize(pageSize);
   this->mainFrame()->render(&p);
+
+  QImage pointer = QImage(":/pointer.png");
+  p.drawImage(m_mousePosition, pointer);
+
   p.end();
   this->setViewportSize(viewportSize);
 

diff --git a/src/WebPage.h b/src/WebPage.h
@@ -44,6 +44,8 @@ class WebPage : public QWebPage {
     QStringList pageHeaders();
     QByteArray body();
     QString contentType();
+    void mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button);
+    bool clickTest(QWebElement element, int absoluteX, int absoluteY);
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -88,6 +90,7 @@ class WebPage : public QWebPage {
     WebPageManager *m_manager;
     QString m_errorPageMessage;
     void setFrameProperties(QWebFrame *, QUrl &, NetworkReplyProxy *);
+    QPoint m_mousePosition;
 };
 
 #endif //_WEBPAGE_H

diff --git a/src/capybara.js b/src/capybara.js
@@ -189,6 +189,7 @@ Capybara = {
     var node = this.nodes[index];
     node.scrollIntoViewIfNeeded();
     var pos = this.clickPosition(node);
+    CapybaraInvocation.hover(pos.relativeX, pos.relativeY);
     this.expectNodeAtPosition(node, pos);
     action(pos.absoluteX, pos.absoluteY);
   },

diff --git a/src/pointer.png b/src/pointer.png
diff --git a/src/webkit_server.qrc b/src/webkit_server.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/">
     <file>capybara.js</file>
+    <file>pointer.png</file>
   </qresource>
 </RCC>