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

Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
author: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> 2016-04-25 11:47:47 +0200
committer: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> 2016-04-25 12:40:00 +0200
commit: 658a964cf2593e6da3b1a822124e796bbe354d36 (patch)
tree: 8c35a964023069a974f1c54cd679490593e485f2 /tests
parent: 63cf26268996ae5580c77095a252696fa549b593 (diff)
parent: a3318c84b022282a5a4a2babc51d1e3ca634e25b (diff)
6 files changed, 234 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/data/localStorage.html b/tests/auto/quick/qmltests/data/localStorage.html
new file mode 100644
index 000000000..a4e395f48
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/localStorage.html
@@ -0,0 +1,9 @@
+<html>
+<head><title>Original Title</title></head>
+<body>
+<script type="text/javascript">
+document.title = localStorage.getItem('title');
+localStorage.setItem('title', 'New Title');
+</script>
+</body>
+</html>
diff --git a/tests/auto/quick/qmltests/data/tst_settings.qml b/tests/auto/quick/qmltests/data/tst_settings.qml
new file mode 100644
index 000000000..aa3a6dc60
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_settings.qml
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebEngine 1.2
+
+TestWebEngineView {
+    id: webEngineView
+    width: 400
+    height: 300
+
+    TestCase {
+        name: "WebEngineViewSettings"
+
+        function test_javascriptEnabled() {
+            webEngineView.settings.javascriptEnabled = true;
+
+            webEngineView.url = Qt.resolvedUrl("javascript.html");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(webEngineView.title, "New Title");
+        }
+
+        function test_javascriptDisabled() {
+            webEngineView.settings.javascriptEnabled = false;
+
+            webEngineView.url = Qt.resolvedUrl("javascript.html");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(webEngineView.title, "Original Title");
+        }
+
+        function test_localStorageDisabled() {
+            webEngineView.settings.javascriptEnabled = true;
+            webEngineView.settings.localStorageEnabled = false;
+
+            webEngineView.url = Qt.resolvedUrl("localStorage.html");
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(webEngineView.title, "Original Title");
+        }
+
+        function test_localStorageEnabled() {
+            webEngineView.settings.localStorageEnabled = true;
+            webEngineView.settings.javascriptEnabled = true;
+
+            webEngineView.url = Qt.resolvedUrl("localStorage.html");
+            verify(webEngineView.waitForLoadSucceeded());
+            webEngineView.reload();
+            verify(webEngineView.waitForLoadSucceeded());
+            compare(webEngineView.title, "New Title");
+        }
+
+        function test_settingsAffectCurrentViewOnly()  {
+            var webEngineView2 = Qt.createQmlObject('TestWebEngineView {width: 400; height: 300;}', webEngineView);
+
+            webEngineView.settings.javascriptEnabled = true;
+            webEngineView2.settings.javascriptEnabled = true;
+
+            var testUrl = Qt.resolvedUrl("javascript.html");
+
+            webEngineView.url = testUrl;
+            verify(webEngineView.waitForLoadSucceeded());
+            webEngineView2.url = testUrl;
+            verify(webEngineView2.waitForLoadSucceeded());
+
+            compare(webEngineView.title, "New Title");
+            compare(webEngineView2.title, "New Title");
+
+            webEngineView.settings.javascriptEnabled = false;
+
+            webEngineView.url = testUrl;
+            verify(webEngineView.waitForLoadSucceeded());
+            webEngineView2.url = testUrl;
+            verify(webEngineView2.waitForLoadSucceeded());
+
+            compare(webEngineView.title, "Original Title");
+            compare(webEngineView2.title, "New Title");
+
+            webEngineView2.destroy();
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index af6e14c33..b8f0f7df1 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -27,6 +27,7 @@ OTHER_FILES += \
     $$PWD/data/geolocation.html \
     $$PWD/data/javascript.html \
     $$PWD/data/link.html \
+    $$PWD/data/localStorage.html \
     $$PWD/data/prompt.html \
     $$PWD/data/multifileupload.html \
     $$PWD/data/redirect.html \
@@ -61,6 +62,7 @@ OTHER_FILES += \
     $$PWD/data/tst_unhandledKeyEventPropagation.qml \
     $$PWD/data/tst_userScripts.qml \
     $$PWD/data/tst_webchannel.qml \
+    $$PWD/data/tst_settings.qml \
     $$PWD/data/tst_keyboardModifierMapping.qml \
     $$PWD/data/icons/favicon.png \
     $$PWD/data/icons/grayicons.ico \
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index f2f5b31f9..f6968acf5 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -60,6 +60,7 @@ private Q_SLOTS:
     void inputMethod();
     void inputMethodHints();
     void basicRenderingSanity();
+    void setZoomFactor();
     void printToPdf();
 
 private:
@@ -462,6 +463,25 @@ void tst_QQuickWebEngineView::inputMethodHints()
 #endif
 }
 
+void tst_QQuickWebEngineView::setZoomFactor()
+{
+    QQuickWebEngineView *view = webEngineView();
+
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 1.0));
+    view->setZoomFactor(2.5);
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+
+    view->setUrl(urlFromTestPath("html/basic_page.html"));
+    QVERIFY(waitForLoadSucceeded(view));
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+
+    view->setZoomFactor(0.1);
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+
+    view->setZoomFactor(5.5);
+    QVERIFY(qFuzzyCompare(view->zoomFactor(), 2.5));
+}
+
 void tst_QQuickWebEngineView::printToPdf()
 {
     QTemporaryDir tempDir(QDir::tempPath() + "/tst_qwebengineview-XXXXXX");
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");
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index e73ab637b..95d5cf16a 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -47,6 +47,8 @@ private Q_SLOTS:
     void disableCache();
     void urlSchemeHandlers();
     void urlSchemeHandlerFailRequest();
+    void customUserAgent();
+    void httpAcceptLanguage();
 };
 
 void tst_QWebEngineProfile::defaultProfile()
@@ -253,5 +255,60 @@ void tst_QWebEngineProfile::urlSchemeHandlerFailRequest()
     QCOMPARE(toPlainTextSync(view.page()), QString());
 }
 
+void tst_QWebEngineProfile::customUserAgent()
+{
+    QString defaultUserAgent = QWebEngineProfile::defaultProfile()->httpUserAgent();
+    QWebEnginePage page;
+    QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
+    page.setHtml(QStringLiteral("<html><body>Hello world!</body></html>"));
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+
+    // First test the user-agent is default
+    QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), defaultUserAgent);
+
+    const QString testUserAgent = QStringLiteral("tst_QWebEngineProfile 1.0");
+    QWebEngineProfile testProfile;
+    testProfile.setHttpUserAgent(testUserAgent);
+
+    // Test a new profile with custom user-agent works
+    QWebEnginePage page2(&testProfile);
+    QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
+    page2.setHtml(QStringLiteral("<html><body>Hello again!</body></html>"));
+    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QCOMPARE(evaluateJavaScriptSync(&page2, QStringLiteral("navigator.userAgent")).toString(), testUserAgent);
+    QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), defaultUserAgent);
+
+    // Test an existing page and profile with custom user-agent works
+    QWebEngineProfile::defaultProfile()->setHttpUserAgent(testUserAgent);
+    QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), testUserAgent);
+}
+
+void tst_QWebEngineProfile::httpAcceptLanguage()
+{
+    QWebEnginePage page;
+    QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
+    page.setHtml(QStringLiteral("<html><body>Hello world!</body></html>"));
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+
+    QStringList defaultLanguages = evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList();
+
+    const QString testLang = QStringLiteral("xx-YY");
+    QWebEngineProfile testProfile;
+    testProfile.setHttpAcceptLanguage(testLang);
+
+    // Test a completely new profile
+    QWebEnginePage page2(&testProfile);
+    QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
+    page2.setHtml(QStringLiteral("<html><body>Hello again!</body></html>"));
+    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QCOMPARE(evaluateJavaScriptSync(&page2, QStringLiteral("navigator.languages")).toStringList(), QStringList(testLang));
+    // Test the old one wasn't affected
+    QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList(), defaultLanguages);
+
+    // Test changing an existing page and profile
+    QWebEngineProfile::defaultProfile()->setHttpAcceptLanguage(testLang);
+    QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList(), QStringList(testLang));
+}
+
 QTEST_MAIN(tst_QWebEngineProfile)
 #include "tst_qwebengineprofile.moc"
author	Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>	2016-04-25 11:47:47 +0200
committer	Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>	2016-04-25 12:40:00 +0200
commit	658a964cf2593e6da3b1a822124e796bbe354d36 (patch)
tree	8c35a964023069a974f1c54cd679490593e485f2 /tests
parent	63cf26268996ae5580c77095a252696fa549b593 (diff)
parent	a3318c84b022282a5a4a2babc51d1e3ca634e25b (diff)