Changeset 117812 in webkit

Timestamp:

May 21, 2012, 1:48:22 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][WK2] REGRESSION, fix a failing API test in qmltests
​https://bugs.webkit.org/show_bug.cgi?id=82700

Patch by Marcelo Lira <​marcelo.lira@openbossa.org> on 2012-05-21
Reviewed by Alexis Menard.

The value of a CSS font-family property is expected to have single
quotes when white space is present in its name, and no quotes otherwise.
Font family names returned by WebView.experimental.preferences never add quotes.

Since what matter to the test is only the identity of the font, an auxiliar
method to remove single quotes was added.

• UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-21  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [Qt][WK2] REGRESSION, fix a failing API test in qmltests
+        https://bugs.webkit.org/show_bug.cgi?id=82700
+
+        Reviewed by Alexis Menard.
+
+        The value of a CSS font-family property is expected to have single
+        quotes when white space is present in its name, and no quotes otherwise.
+        Font family names returned by WebView.experimental.preferences never add quotes.
+
+        Since what matter to the test is only the identity of the font, an auxiliar
+        method to remove single quotes was added.
+
+        * UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:
+
 2012-05-21  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml

@@ -196 +196 @@
             }
 
+            function unquote(text) {
+                return text[0] === "'" ? text.slice(1, -1) : text
+            }
+
             function test_standardFontFamilyChanged() {
                 var url = Qt.resolvedUrl("../common/font-preferences.html?standard#font-family")
@@ -204 +208 @@
 
                 titleSpy.wait()
-                compare(webView.title, defaultStandardFontFamily)
+                compare(unquote(webView.title), defaultStandardFontFamily)
 
                 webView.experimental.preferences.standardFontFamily = "foobar"