[epiphany] Fix tests if search engine is changed
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Fix tests if search engine is changed
- Date: Tue, 7 Jan 2014 15:54:37 +0000 (UTC)
commit 7f5f8cd524f7061cda7b1a439ac891f1e20521bc
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Jan 3 16:12:26 2014 -0600
Fix tests if search engine is changed
test_ephy_web_view_normalize_or_autosearch(): don't assume the default
search engine has never been changed.
https://bugzilla.gnome.org/show_bug.cgi?id=721348
tests/ephy-web-view-test.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/tests/ephy-web-view-test.c b/tests/ephy-web-view-test.c
index a01990b..08d21a8 100644
--- a/tests/ephy-web-view-test.c
+++ b/tests/ephy-web-view-test.c
@@ -29,6 +29,7 @@
#include "ephy-file-helpers.h"
#include "ephy-history-service.h"
#include "ephy-private.h"
+#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-web-view.h"
@@ -244,8 +245,6 @@ test_ephy_web_view_non_search_regex (void)
g_regex_unref (regex_domain);
}
-/* FIXME: we hardcode the ddg search for now, since it's the
- * default. */
static struct {
char *url;
char *expected;
@@ -269,9 +268,16 @@ static void
test_ephy_web_view_normalize_or_autosearch (void)
{
int i;
+ char *default_engine_url;
EphyWebView *view;
view = EPHY_WEB_VIEW (ephy_web_view_new ());
+ default_engine_url = g_settings_get_string (EPHY_SETTINGS_MAIN,
+ EPHY_PREFS_KEYWORD_SEARCH_URL);
+
+ g_settings_set_string (EPHY_SETTINGS_MAIN,
+ EPHY_PREFS_KEYWORD_SEARCH_URL,
+ "http://duckduckgo.com/?q=%s&t=epiphany");
for (i = 0; i < G_N_ELEMENTS (normalize_or_autosearch); i++) {
char *url, *result;
@@ -284,6 +290,11 @@ test_ephy_web_view_normalize_or_autosearch (void)
g_free (result);
}
+ g_settings_set_string (EPHY_SETTINGS_MAIN,
+ EPHY_PREFS_KEYWORD_SEARCH_URL,
+ default_engine_url);
+
+ g_free (default_engine_url);
g_object_unref (g_object_ref_sink (view));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]