src/WebPage.h in capybara-webkit-1.2.0 vs src/WebPage.h in capybara-webkit-1.3.0

@@ -21,12 +21,16 @@
     InvocationResult invokeCapybaraFunction(QString &name, bool allowUnattached, const QStringList &arguments);
     QString failureString();
     QString userAgentForUrl(const QUrl &url ) const;
     void setUserAgent(QString userAgent);
     void setConfirmAction(QString action);
+    QString setConfirmAction(QString action, QString message);
+    QString setPromptAction(QString action, QString message, QString response);
+    QString setPromptAction(QString action, QString message);
     void setPromptAction(QString action);
     void setPromptText(QString action);
+    QString acceptAlert(QString);
     int getLastStatus();
     void setCustomNetworkAccessManager();
     bool render(const QString &fileName, const QSize &minimumSize);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
     void setSkipImageLoading(bool skip);
@@ -46,10 +50,12 @@
     QByteArray body();
     QString contentType();
     void mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button);
     bool clickTest(QWebElement element, int absoluteX, int absoluteY);
     void resize(int, int);
+    int modalCount();
+    QString modalMessage(int);
 
   public slots:
     bool shouldInterruptJavaScript();
     void injectJavascriptHelpers();
     void loadStarted();
@@ -63,10 +69,11 @@
 
   signals:
     void pageFinished(bool);
     void requestCreated(QByteArray &url, QNetworkReply *reply);
     void replyFinished(QNetworkReply *reply);
+    void modalReady(int);
 
   protected:
     virtual void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID);
     virtual void javaScriptAlert(QWebFrame *frame, const QString &message);
     virtual bool javaScriptConfirm(QWebFrame *frame, const QString &message);
@@ -80,21 +87,24 @@
     bool m_loading;
     bool m_failed;
     QStringList getAttachedFileNames();
     void loadJavascript();
     void setUserStylesheet();
-    bool m_confirm;
-    bool m_prompt;
+    bool m_confirmAction;
+    bool m_promptAction;
     QVariantList m_consoleMessages;
     QVariantList m_alertMessages;
     QVariantList m_confirmMessages;
     QString m_prompt_text;
     QVariantList m_promptMessages;
     QString m_uuid;
     WebPageManager *m_manager;
     QString m_errorPageMessage;
     void setFrameProperties(QWebFrame *, QUrl &, NetworkReplyProxy *);
     QPoint m_mousePosition;
+    QList<QVariantMap> m_modalResponses;
+    QStringList m_modalMessages;
+    void addModalMessage(bool, const QString &, const QRegExp &);
 };
 
 #endif //_WEBPAGE_H