Bug 578675 Adapt MozMill test harness and tests to work with the upgraded MozMill 1.4.2b1. r=bienvenu,a=Standard8 CLOSED TREE

mail/build.mk

@@ -108,12 +108,10 @@ APP_NAME = $(MOZ_APP_DISPLAYNAME)
 ifdef MOZ_DEBUG
 APP_NAME := $(APP_NAME)Debug
 endif
-PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
-PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
+PROGRAM = ../../../$(DIST)/$(APP_NAME).app/
 else
 # Non-mac options
-PROGRAM_LOCATION = ../../../$(DIST)/bin/
-PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
+PROGRAM = ../../../$(DIST)/bin/thunderbird$(BIN_SUFFIX)
 endif
 
 mozmill::

mail/test/mozmill/attachment/test-attachment.js

@@ -49,7 +49,7 @@ Components.utils.import("resource://mozmill/modules/jum.js", jumlib);
 var elib = {};
 Components.utils.import('resource://mozmill/modules/elementslib.js', elib);
 var EventUtils = {};
-Cu.import('resource://mozmill/modules/EventUtils.js', EventUtils);
+Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
 
 var folder = null;
 var composeHelper = null;

mail/test/mozmill/migration-from-tb2/prefs.js

@@ -12,6 +12,7 @@
 user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1273257684);
 user_pref("app.update.lastUpdateTime.background-update-timer", 1273257684);
 user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1273257684);
+user_pref("extensions.checkCompatibility.3.2a", false);
 user_pref("extensions.lastAppVersion", "2.0.0.24");
 user_pref("intl.charsetmenu.mailview.cache", "windows-1252, ISO-8859-1, UTF-8");
 user_pref("ldap_2.prefs_migrated", true);

mail/test/mozmill/shared-modules/test-folder-display-helpers.js

@@ -41,7 +41,7 @@ var Cu = Components.utils;
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
 var EventUtils = {};
-Cu.import('resource://mozmill/modules/EventUtils.js', EventUtils);
+Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
 var mozmill = {};
 Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var controller = {};