diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_autofill_related_realms_no_dupes.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_autofill_related_realms_no_dupes.html --- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_autofill_related_realms_no_dupes.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_autofill_related_realms_no_dupes.html @@ -10,31 +10,20 @@ Login Manager test: no duplicate logins when using autofill and autocomplete with related realms

-
-
- - - -
- -
- +
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form.html --- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form.html @@ -10,132 +10,25 @@ Login Manager test: multiple login autocomplete -

-
- - - -
- - - -
- -
+
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_insecure.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_insecure.html --- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_insecure.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_insecure.html @@ -8,111 +8,27 @@ - -

-
- - -
- - - -
- -
+
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_related_realms.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_related_realms.html --- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_related_realms.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_related_realms.html @@ -29,11 +29,11 @@ return !popupState.open; }, "Wait for AC popup to be closed"); } add_setup(async () => { - await addLoginsInParent( + await setStoredLoginsAsync( // Simple related domain relationship where example.com and other-example.com are in the related domains list ["https://other-example.com", "https://other-example.com", null, "relatedUser1", "relatedPass1", "uname", "pword"], // Example.com and example.co.uk are related, so sub.example.co.uk should appear on example.com's autocomplete dropdown // The intent is to cover the ebay.com/ebay.co.uk and all other country TLD cases @@ -44,19 +44,21 @@ listenForUnexpectedPopupShown(); }); add_task(async function test_form1_initial_empty() { const form = createLoginForm(); + await promiseFormsProcessedInSameProcess(); // Make sure initial form is empty. checkLoginForm(form.uname, "", form.pword, ""); const popupState = await getPopupState(); is(popupState.open, false, "Check popup is initially closed"); }); add_task(async function test_form_related_domain_menuitems() { const form = createLoginForm(); + await promiseFormsProcessedInSameProcess(); form.uname.focus(); const autocompleteItems = await popupByArrowDown(); const popupState = await getPopupState(); diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_hasBeenTypePassword.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_hasBeenTypePassword.html --- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_hasBeenTypePassword.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_hasBeenTypePassword.html @@ -12,30 +12,19 @@ Login Manager test: Test that passwords are autocompleted into fields that were previously type=password

-
- - -
- - - -
-
+
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_highlight.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_highlight.html --- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_highlight.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_highlight.html @@ -9,16 +9,11 @@

-
-
- - - -
+
 
 
 
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
@@ -11,58 +11,14 @@
   
 
 
 Login Manager test: autofill with autocomplete=new-password fields
 
-
 

 
 
-

-
-  
-  

-    
-    
-    
-  

-
-  
-  

-    
-    
-    
-  

-
-  
-  

-    
-    
-    
-  

-

+

 
 
 
 

 
 
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html
--- a/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html
@@ -8,65 +8,65 @@
   
   
   
 
 
-
-
 

 
-

-  
Sign in

-  
-  
-

+

 
 
 
 

 
 
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_autofill_sandboxed.html b/toolkit/components/passwordmgr/test/mochitest/test_autofill_sandboxed.html
--- a/toolkit/components/passwordmgr/test/mochitest/test_autofill_sandboxed.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_autofill_sandboxed.html
@@ -8,28 +8,10 @@
 
   
   
 
 
-
-
 

 
 

   
@@ -46,10 +28,14 @@
 
 function promiseExecuteSoon() {
   return new Promise(SimpleTest.executeSoon);
 }
 
+add_setup(async () => {
+  await setStoredLoginsAsync(["https://example.com", "", null, "tempuser1", "temppass1", "uname", "pword"]);
+});
+
 add_task(async function test_no_autofill_in_form() {
   sandboxed.src = "form_basic.html";
   const frameWindow = SpecialPowers.wrap(sandboxed).contentWindow;
   const DOMFormHasPasswordPromise = new Promise(resolve => {
     SpecialPowers.addChromeEventListener("DOMFormHasPassword", function onDFHP() {
diff --git a/toolkit/components/passwordmgr/test/mochitest/test_basic_form_honor_autocomplete_off.html b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_honor_autocomplete_off.html
--- a/toolkit/components/passwordmgr/test/mochitest/test_basic_form_honor_autocomplete_off.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_honor_autocomplete_off.html
@@ -9,73 +9,22 @@
   
   
 
 
 Login Manager test: autofilling when autocomplete=off
-
-
 

 
 
-

-  
-  

-    
-    
-    
-  

-
-  

-    
-    
-    
-  

-
-  

-    
-    
-    
-  

-
-  

-    
-    
-    
-  

-
-  
-  

-    
-    
-    
-  

-
-  
-  

-    
-    
-  

-
+