From 243a2fef90dc3ac846a36738bfe97efba3050dc9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 8 Feb 2018 17:31:44 +0100 Subject: Adaptations to form validation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Form validations messages has moved entirely to being done by Blink. Change-Id: I6742c111fc59f0baba75b8b37f5d0ec9ae2fb920 Reviewed-by: Peter Varga Reviewed-by: Michael Brüning --- .../quick/qmltests/data/tst_formValidation.qml | 120 --------------------- tests/auto/quick/qmltests/qmltests.pro | 1 - 2 files changed, 121 deletions(-) delete mode 100644 tests/auto/quick/qmltests/data/tst_formValidation.qml (limited to 'tests') diff --git a/tests/auto/quick/qmltests/data/tst_formValidation.qml b/tests/auto/quick/qmltests/data/tst_formValidation.qml deleted file mode 100644 index 182a2eaa9..000000000 --- a/tests/auto/quick/qmltests/data/tst_formValidation.qml +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtTest 1.0 -import QtWebEngine 1.4 - -TestWebEngineView { - id: webEngineView - width: 400 - height: 300 - - SignalSpy { - id: formValidationMessageRequestSpy - target: webEngineView - signalName: "formValidationMessageRequested" - } - - TestCase { - name: "WebEngineViewFormValidation" - when: windowShown - - function init() { - webEngineView.url = Qt.resolvedUrl("about:blank"); - verify(webEngineView.waitForLoadSucceeded()); - formValidationMessageRequestSpy.clear(); - } - - function test_urlForm() { - webEngineView.url = Qt.resolvedUrl("forms.html#url_empty"); - verify(webEngineView.waitForLoadSucceeded()); - keyPress(Qt.Key_Enter); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[0][0].type, FormValidationMessageRequest.Show); - compare(formValidationMessageRequestSpy.signalArguments[0][0].text, "Please fill out this field."); - - webEngineView.url = Qt.resolvedUrl("about:blank"); - verify(webEngineView.waitForLoadSucceeded()); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[1][0].type, FormValidationMessageRequest.Hide); - - webEngineView.url = Qt.resolvedUrl("forms.html#url_invalid"); - verify(webEngineView.waitForLoadSucceeded()); - keyPress(Qt.Key_Enter); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[2][0].type, FormValidationMessageRequest.Show); - compare(formValidationMessageRequestSpy.signalArguments[2][0].text, "Please enter a URL."); - } - - function test_emailForm() { - webEngineView.url = Qt.resolvedUrl("forms.html#email_empty"); - verify(webEngineView.waitForLoadSucceeded()); - keyPress(Qt.Key_Enter); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[0][0].type, FormValidationMessageRequest.Show); - compare(formValidationMessageRequestSpy.signalArguments[0][0].text, "Please fill out this field."); - - webEngineView.url = Qt.resolvedUrl("about:blank"); - verify(webEngineView.waitForLoadSucceeded()); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[1][0].type, FormValidationMessageRequest.Hide); - - webEngineView.url = Qt.resolvedUrl("forms.html#email_invalid"); - verify(webEngineView.waitForLoadSucceeded()); - keyPress(Qt.Key_Enter); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[2][0].type, FormValidationMessageRequest.Show); - compare(formValidationMessageRequestSpy.signalArguments[2][0].text, "Please include an '@' in the email address. 'invalid' is missing an '@'."); - } - - function test_textForm() { - webEngineView.url = Qt.resolvedUrl("forms.html#input_empty"); - verify(webEngineView.waitForLoadSucceeded()); - keyPress(Qt.Key_Enter); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[0][0].type, FormValidationMessageRequest.Show); - compare(formValidationMessageRequestSpy.signalArguments[0][0].text, "Please fill out this field."); - // Title should be shown for pattern mismatch only - compare(formValidationMessageRequestSpy.signalArguments[0][0].subText, ""); - - webEngineView.url = Qt.resolvedUrl("about:blank"); - verify(webEngineView.waitForLoadSucceeded()); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[1][0].type, FormValidationMessageRequest.Hide); - - webEngineView.url = Qt.resolvedUrl("forms.html#lorem_ipsum"); - verify(webEngineView.waitForLoadSucceeded()); - keyPress(Qt.Key_Enter); - formValidationMessageRequestSpy.wait(); - compare(formValidationMessageRequestSpy.signalArguments[2][0].type, FormValidationMessageRequest.Show); - compare(formValidationMessageRequestSpy.signalArguments[2][0].text, "Please match the requested format."); - compare(formValidationMessageRequestSpy.signalArguments[2][0].subText, "Should type 'Lorem ipsum'"); - } - } -} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 16ecbc1bc..5395da0b5 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -51,7 +51,6 @@ OTHER_FILES += \ $$PWD/data/tst_filePicker.qml \ $$PWD/data/tst_findText.qml \ $$PWD/data/tst_focusOnNavigation.qml \ - $$PWD/data/tst_formValidation.qml \ $$PWD/data/tst_geopermission.qml \ $$PWD/data/tst_getUserMedia.qml \ $$PWD/data/tst_inputMethod.qml \ -- cgit v1.2.3