From 33ab233a42aa0ecb88a0eda74e60e3f3c05eb7b7 Mon Sep 17 00:00:00 2001 From: "zandobersek@gmail.com" Date: Wed, 27 Nov 2013 13:04:26 +0000 Subject: [PATCH] [GTK] Programs/WebKit2APITests/TestWebKitSettings unit test is failing https://bugs.webkit.org/show_bug.cgi?id=124924 Reviewed by Carlos Garcia Campos. 'Chrome'/'Chromium' substrings were removed from the user agent string in r159572, meaning the unit test shouldn't check for those two substrings anymore. Instead, 'Safari' (as until now) and 'AppleWebKit' substrings should be checked for. * UIProcess/API/gtk/tests/TestWebKitSettings.cpp: (testWebKitSettingsUserAgent): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159811 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 14 ++++++++++++++ .../WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 015aaf7..d86e476 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,17 @@ +2013-11-27 Zan Dobersek + + [GTK] Programs/WebKit2APITests/TestWebKitSettings unit test is failing + https://bugs.webkit.org/show_bug.cgi?id=124924 + + Reviewed by Carlos Garcia Campos. + + 'Chrome'/'Chromium' substrings were removed from the user agent string in r159572, meaning the unit + test shouldn't check for those two substrings anymore. Instead, 'Safari' (as until now) and 'AppleWebKit' + substrings should be checked for. + + * UIProcess/API/gtk/tests/TestWebKitSettings.cpp: + (testWebKitSettingsUserAgent): + 2013-11-26 Nick Diego Yamane [MediaStream API] HTMLMediaElement should be able to use MediaStream as source diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp index 6e53476..37bf8f9 100644 --- a/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp @@ -303,9 +303,8 @@ static void testWebKitSettingsUserAgent(WebViewTest* test, gconstpointer) CString defaultUserAgent = webkit_settings_get_user_agent(settings.get()); webkit_web_view_set_settings(test->m_webView, settings.get()); + g_assert(g_strstr_len(defaultUserAgent.data(), -1, "AppleWebKit")); g_assert(g_strstr_len(defaultUserAgent.data(), -1, "Safari")); - g_assert(g_strstr_len(defaultUserAgent.data(), -1, "Chromium")); - g_assert(g_strstr_len(defaultUserAgent.data(), -1, "Chrome")); webkit_settings_set_user_agent(settings.get(), 0); g_assert_cmpstr(defaultUserAgent.data(), ==, webkit_settings_get_user_agent(settings.get())); -- 1.8.3.1