Merge default to mozilla-aurora for Firefox 39 mozilla-aurora FIREFOX_AURORA_39
authorSyd Polk <spolk@mozilla.com>
Mon, 30 Mar 2015 17:00:44 -0500
branchmozilla-aurora
changeset 4740 b5432675d2132fe4061a807351b75417da7bb5a6
parent 4736 7e671ca7560d83387b67e749819e7879eee7b2d1 (current diff)
parent 4739 3072c641bf21dbbff0e01549fc97a30008143f18 (diff)
child 4741 2ade9642c3d7ba794db508559ae1883ab592a544
push id4251
push userspolk@mozilla.com
push dateMon, 30 Mar 2015 22:01:07 +0000
Merge default to mozilla-aurora for Firefox 39
.hgtags
firefox/tests/functional/testAddons/manifest.ini
firefox/tests/functional/testAwesomeBar/manifest.ini
firefox/tests/functional/testPasswordManager/testPreferencesMasterPassword.js
firefox/tests/functional/testPreferences/testPasswordSavedAndDeleted.js
firefox/tests/remote/testAddons/manifest.ini
firefox/tests/remote/testSecurity/manifest.ini
--- a/.hgtags
+++ b/.hgtags
@@ -92,8 +92,9 @@ 518364725ce56aeb17277cff1191616431d7558a
 6b6eb2a62a7d9ca94830833dfa1a7a9c0674e407 AURORA_BASE_20141128
 ce1dd09d8465bbae719e3d90e5c956fb3df8148f AURORA_BASE_20150112
 eef67639dcb6f3bec9b5da5b32fc242c52d604ff BETA_BASE_20150112
 679e18a64e080343d8a9ad29fe1f1b96dd93baa9 FIREFOX_AURORA_37.0
 0a3a2abc4804fb13f96ecd835d6fb8bea2ccff4d BETA_BASE_20150223
 cb2ed4f8c2fab7e1afa1099894b5d59c5356bf9e AURORA_BASE_20150223
 710100fa271885f2ff56c7c1a17fa6ac2e49cb42 FIREFOX_AURORA_38.0
 9faa708fc6103bedaaaf284f0eef5f07e5860020 BETA_BASE_20150330
+4f00c3e262488e54c131dfaaaa412481107a65b0 AURORA_BASE_20150330
--- a/firefox/tests/functional/testAddons/manifest.ini
+++ b/firefox/tests/functional/testAddons/manifest.ini
@@ -7,10 +7,11 @@
 [testInstallUninstallSoftBlocklistedExtension.js]
 disabled = Bug 1133248 - Disabled because lots of test failures
 [testInstallUninstallTheme.js]
 [testManagerKeyboardShortcut.js]
 [testPluginDisableAffectsAboutPlugins.js]
 [testPluginInDifferentStates.js]
 disabled = Bug 1136031 - Test failure 'persisted.plugin is undefined'
 [testServiceInstallDisableEnableRemove.js]
+disabled = Bug 1141946 - Not able to install due to HTTPS only
 [testUninstallExtension.js]
 disabled = Bug 1133248 - Disabled because lots of test failures
--- a/firefox/tests/functional/testPasswordManager/testPreferencesMasterPassword.js
+++ b/firefox/tests/functional/testPasswordManager/testPreferencesMasterPassword.js
@@ -76,17 +76,17 @@ function testSetMasterPassword() {
   var loginButton = findElement.ID(controller.tabs.activeTab, "LogIn");
 
   // Wait for the notification to load
   locationBar.waitForNotificationPanel(() => {
     loginButton.click();
   }, {type: "notification"});
 
   // After logging in, remember the login information
-  var button = locationBar.getNotificationElement("password-save-notification",
+  var button = locationBar.getNotificationElement("password-notification",
                                                   {type: "anonid",
                                                    value: "button"});
 
   expect.ok(utils.isDisplayed(controller, button),
             "Remember password button is visible");
 
   // Wait for the notification to unload
   locationBar.waitForNotificationPanel(() => {
--- a/firefox/tests/functional/testPreferences/testPasswordSavedAndDeleted.js
+++ b/firefox/tests/functional/testPreferences/testPasswordSavedAndDeleted.js
@@ -62,17 +62,17 @@ function testSaveAndDeletePassword() {
     logInButton.click();
     controller.waitForPageLoad();
   }, {type: "notification"});
 
   // Wait for the notification to unload
   locationBar.waitForNotificationPanel(() => {
     // After logging in, remember the login information
     var button = locationBar.getNotificationElement(
-                   "password-save-notification",
+                   "password-notification",
                    {type: "anonid", value: "button"}
                  );
     button.click();
   }, {type: "notification", open: false});
 
   // Go back to the login page and verify the password has been saved
   controller.open(TEST_DATA);
   controller.waitForPageLoad();
--- a/readme.txt
+++ b/readme.txt
@@ -1,12 +1,12 @@
 # Mozmill Tests #
 
 Mozmill tests are written in JavaScript. They can be run using the Mozmill
 command line client. Once you have Mozmill installed, you can contribute by
 running the tests, raising any issues you find, and writing new tests!
 
 See the 'Mozmill' page on MDN for instructions on installing and running
-Mozmill Tests - https://developer.mozilla.org/en-US/docs/Mozmill
+Mozmill Tests - https://developer.mozilla.org/en-US/docs/Mozmill_Tests
 
 If you have questions, feel free to join us in #automation on irc.mozilla.org
 or use our Mozmill developer mailing list:
 http://groups.google.com/group/mozmill-dev