Fix bug 1159447 - TEST-UNEXPECTED-FAIL | xpcshell-icaljs.ini:calendar/test/unit/test_extract.js (regression). r=redDragon

calendar/base/content/calendar-extract.js

@@ -92,7 +92,7 @@ let calendarExtract = {
         let time = (new Date()).getTime();
 
         let locale = Preferences.get("general.useragent.locale", "en-US");
-        let baseUrl = "jar:resource://calendar/chrome/calendar-LOCALE.jar!/locale/LOCALE/calendar/calendar-extract.properties";
+        let baseUrl = "resource://calendar/chrome/calendar-LOCALE/locale/LOCALE/calendar/calendar-extract.properties";
         let dayStart = Preferences.get("calendar.view.daystarthour", 6);
         let extractor;
 

calendar/test/unit/test_extract.js

@@ -5,10 +5,14 @@
 Components.utils.import("resource://calendar/modules/calExtract.jsm");
 Components.utils.import("resource://gre/modules/Preferences.jsm");
 
-var baseUrl = "jar:resource://calendar/chrome/calendar-LOCALE.jar!/locale/LOCALE/calendar/calendar-extract.properties";
-var extractor = new Extractor(baseUrl, "en-US", 8);
+let baseUrl = "resource://calendar/chrome/calendar-LOCALE/locale/LOCALE/calendar/calendar-extract.properties";
+let extractor = new Extractor(baseUrl, "en-US", 8);
 
 function run_test() {
+    // Sanity check to make sure the base url is still right. If this fails,
+    // don't forget to also fix the url in base/content/calendar-extract.js.
+    ok(extractor.checkBundle("en-US"));
+
     test_event_start_end();
     test_event_start_duration();
     test_event_start_end_whitespace();