Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 2740b698c..eb0c5910e 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -237,6 +237,7 @@ private Q_SLOTS:
     void restoreHistory();
     void toPlainTextLoadFinishedRace_data();
     void toPlainTextLoadFinishedRace();
+    void setZoomFactor();
 
     void printToPdf();
 
@@ -4983,6 +4984,31 @@ void tst_QWebEnginePage::toPlainTextLoadFinishedRace()
     QVERIFY(spy.count() == 3);
 }
 
+void tst_QWebEnginePage::setZoomFactor()
+{
+    QWebEnginePage *page = new QWebEnginePage;
+
+    QVERIFY(qFuzzyCompare(page->zoomFactor(), 1.0));
+    page->setZoomFactor(2.5);
+    QVERIFY(qFuzzyCompare(page->zoomFactor(), 2.5));
+
+    const QUrl urlToLoad("qrc:/resources/test1.html");
+
+    QSignalSpy finishedSpy(m_page, SIGNAL(loadFinished(bool)));
+    m_page->setUrl(urlToLoad);
+    QTRY_COMPARE(finishedSpy.count(), 1);
+    QVERIFY(finishedSpy.at(0).first().toBool());
+    QVERIFY(qFuzzyCompare(page->zoomFactor(), 2.5));
+
+    page->setZoomFactor(5.5);
+    QVERIFY(qFuzzyCompare(page->zoomFactor(), 2.5));
+
+    page->setZoomFactor(0.1);
+    QVERIFY(qFuzzyCompare(page->zoomFactor(), 2.5));
+
+    delete page;
+}
+
 void tst_QWebEnginePage::printToPdf()
 {
     QTemporaryDir tempDir(QDir::tempPath() + "/tst_qwebengineview-XXXXXX");