610974 - Ensure places is enabled for places related tests

Status: RESOLVED FIXED

(Toolkit :: Places, defect)

Description

[Mark Banner (:standard8)]

Attachment: The fix

In bug 608981 we want to enable building of places for Thunderbird for several reasons - to bring it closer to core and cut down on the differences, and to enable extensions to be able to try out different things.

However, at least for the moment, we want to disable places by default, so that we're not going to affect users by default, but we can try out different things.

As we're disabling places, all the places related tests will then fail, so this bug is requesting that we put in additional enabling of places where appropriate.

Basically, the attached patch does the enabling in the head_*.js files where places is used more than once in a directory, otherwise, just in the test file itself.

Comment 1

[Shawn Wilsher :sdwilsh]

Comment on attachment 489470 [details] [diff] [review]
The fix

>+++ b/toolkit/components/places/tests/unit/test_doSetAndLoadFaviconForPage.js
>@@ -110,7 +110,7 @@ var tests = [
>       iconsvc.setAndLoadFaviconForPage(this.pageURI, this.favicon.uri, true);
> 
>       try {
>-        prefs.clearUserPref("places.history.enabled");
>+        prefs.setBoolPref("places.history.enabled", true);
>       } catch (ex) {}
Lose the try-catch

>+++ b/toolkit/components/places/tests/unit/test_doSetAndLoadFaviconForPage_failures.js
>@@ -86,7 +86,7 @@ let tests = [
>     },
>     clean: function clean2() {
>       try {
>-        Services.prefs.clearUserPref("places.history.enabled");
>+        Services.prefs.setBoolPref("places.history.enabled", true);
>       } catch (ex) {}
ditto

r=sdwilsh

Comment 2

[Mark Banner (:standard8)]

Checked in: http://hg.mozilla.org/mozilla-central/rev/8ec78ba9e09c