Bug 1789298 - Make removeValueAt and isRemovableAt return false for LoginAutoCompleteResult and remove associated tests. r=issammani

Differential Revision: https://phabricator.services.mozilla.com/D210223

Author: Ryan Safaeian

toolkit/components/passwordmgr/LoginAutoComplete.sys.mjs

@@ -452,21 +452,12 @@ export class LoginAutoCompleteResult {
     return this.getValueAt(index);
   }
 
-  isRemovableAt(index) {
-    this.#throwOnBadIndex(index);
-    return true;
+  isRemovableAt(_index) {
+    return false;
   }
 
-  removeValueAt(index) {
-    this.#throwOnBadIndex(index);
-
-    let [removedItem] = this.#rows.splice(index, 1);
-
-    if (this.defaultIndex > this.#rows.length) {
-      this.defaultIndex--;
-    }
-
-    removedItem.removeFromStorage();
+  removeValueAt(_index) {
+    return false;
   }
 }
 

toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form.html

@@ -297,7 +297,7 @@
     is(form.pword.value, "", "password is empty");
   });
 
-  add_named_task("delete", async () => {
+  add_named_task("do not delete last", async () => {
     await setStoredLoginsDuringTask(
       [location.origin, "https://autocomplete:8888", null, "user-1", "pass-1", "uname", "pword"],
       [location.origin, "https://autocomplete:8888", null, "user-2", "pass-2", "uname", "pword"],
@@ -309,91 +309,24 @@
     form.uname.focus();
     await popupByArrowDown();
 
-    // XXX tried sending character "t" before/during dropdown to test
-    // filtering, but had no luck. Seemed like the character was getting lost.
-    // Setting uname.value didn't seem to work either. This works with a human
-    // driver, so I'm not sure what's up.
-
-    // Delete the first entry (of 3), "user-1"
+    // Try and fail to delete the last entry (of 3), "user-3"
     synthesizeKey("KEY_ArrowDown");
-    const numLoginsBeforeDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
-    is(numLoginsBeforeDeletion, 3, "Correct number of logins before deleting one");
-
-    const countChangedPromise = notifyMenuChanged(3);
-    const deletionPromise = promiseStorageChanged(["removeLogin"]);
-    // On OS X, shift-backspace and shift-delete work, just delete does not.
-    // On Win/Linux, shift-backspace does not work, delete and shift-delete do.
-    synthesizeKey("KEY_Delete", {shiftKey: true});
-    await deletionPromise;
-
-    is(form.uname.value, "", "username is empty");
-    is(form.pword.value, "", "password is empty");
-    const numLoginsAfterDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
-    is(numLoginsAfterDeletion, 2, "Correct number of logins after deleting one");
-    await countChangedPromise;
-    synthesizeKey("KEY_Enter");
-    await untilAutocompletePopupClosed();
-    is(form.uname.value, "user-2", "username is set");
-    is(form.pword.value, "pass-2", "password is set");
-  });
-
-  add_named_task("delete second", async () => {
-    await setStoredLoginsDuringTask(
-      [location.origin, "https://autocomplete:8888", null, "user-1", "pass-1", "uname", "pword"],
-      [location.origin, "https://autocomplete:8888", null, "user-2", "pass-2", "uname", "pword"],
-      [location.origin, "https://autocomplete:8888", null, "user-3", "pass-3", "uname", "pword"]
-    );
-    const form = setContentForTask(formTemplate);
-    const autofillResult = await formAutofillResult(form.id);
-    is(autofillResult, "multiple_logins", "form has not been filled due to multiple logins");
-    form.uname.focus();
-    await popupByArrowDown();
-
-    // Delete the second entry (of 3), "user-2"
     synthesizeKey("KEY_ArrowDown");
     synthesizeKey("KEY_ArrowDown");
+    const numLoginsBeforeDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
+    is(numLoginsBeforeDeletion, 3, "Correct number of logins before trying to delete one using an autocomplete form");
+    // Pressing the delete key shouldn't remove a login.
     synthesizeKey("KEY_Delete", {shiftKey: true});
     is(form.uname.value, "", "username is empty");
     is(form.pword.value, "", "password is empty");
-    const numLoginsAfterDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
-    is(numLoginsAfterDeletion, 2, "Correct number of logins after deleting one");
+    const numLoginsAfterAttemptedDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
+    is(numLoginsAfterAttemptedDeletion, 3, "Correct number of logins after trying to delete one using an autocomplete form");
     synthesizeKey("KEY_Enter");
     await untilAutocompletePopupClosed();
     is(form.uname.value, "user-3", "username is set");
     is(form.pword.value, "pass-3", "password is set");
   });
 
-  add_named_task("delete last", async () => {
-    await setStoredLoginsDuringTask(
-      [location.origin, "https://autocomplete:8888", null, "user-1", "pass-1", "uname", "pword"],
-      [location.origin, "https://autocomplete:8888", null, "user-2", "pass-2", "uname", "pword"],
-      [location.origin, "https://autocomplete:8888", null, "user-3", "pass-3", "uname", "pword"]
-    );
-    const form = setContentForTask(formTemplate);
-    const autofillResult = await formAutofillResult(form.id);
-    is(autofillResult, "multiple_logins", "form has not been filled due to multiple logins");
-    form.uname.focus();
-    await popupByArrowDown();
-
-    /* test 54 */
-    // Delete the last entry (of 3), "user-3"
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_ArrowDown");
-    const numLoginsBeforeDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
-    is(numLoginsBeforeDeletion, 3, "Correct number of logins before deleting one");
-    synthesizeKey("KEY_Delete", {shiftKey: true});
-    is(form.uname.value, "", "username is empty");
-    is(form.pword.value, "", "password is empty");
-    const numLoginsAfterDeletion = await LoginManager.countLogins(location.origin, "https://autocomplete:8888", null);
-    is(numLoginsAfterDeletion, 2, "Correct number of logins after deleting one");
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_Enter");
-    await untilAutocompletePopupClosed();
-    is(form.uname.value, "user-1", "username is set");
-    is(form.pword.value, "pass-1", "password is set");
-  });
-
   // Tests for single-user forms for ignoring autocomplete=off */
 
   add_named_task("default", async () => {

toolkit/components/passwordmgr/test/mochitest/test_autocomplete_basic_form_insecure.html

@@ -299,108 +299,6 @@
     is(form.pword.value, "", "password is empty");
   });
 
-  add_named_task("delete", async () => {
-    await setStoredLoginsDuringTask(
-      [location.origin, "http://autocomplete:8888", null, "user-1", "pass-1", "uname", "pword"],
-      [location.origin, "http://autocomplete:8888", null, "user-2", "pass-2", "uname", "pword"],
-      [location.origin, "http://autocomplete:8888", null, "user-3", "pass-3", "uname", "pword"]
-    );
-    const form = setContentForTask(formTemplate);
-    const autofillResult = await formAutofillResult(form.id);
-    is(autofillResult, "multiple_logins", "form has not been filled due to multiple logins");
-    form.uname.focus();
-    await popupByArrowDown();
-
-    // XXX tried sending character "t" before/during dropdown to test
-    // filtering, but had no luck. Seemed like the character was getting lost.
-    // Setting uname.value didn't seem to work either. This works with a human
-    // driver, so I'm not sure what's up.
-
-    // Delete the first entry (of 3), "user-1"
-    synthesizeKey("KEY_ArrowDown"); // skip insecure warning
-    synthesizeKey("KEY_ArrowDown");
-    const numLoginsBeforeDeletion = await LoginManager.countLogins(location.origin, "http://autocomplete:8888", null);
-    is(numLoginsBeforeDeletion, 3, "Correct number of logins before deleting one");
-
-    const countChangedPromise = notifyMenuChanged(4);
-    const deletionPromise = promiseStorageChanged(["removeLogin"]);
-    // On OS X, shift-backspace and shift-delete work, just delete does not.
-    // On Win/Linux, shift-backspace does not work, delete and shift-delete do.
-    synthesizeKey("KEY_Delete", {shiftKey: true});
-    await deletionPromise;
-
-    is(form.uname.value, "", "username is empty");
-    is(form.pword.value, "", "password is empty");
-    const numLoginsAfterDeletion = await LoginManager.countLogins(location.origin, "http://autocomplete:8888", null);
-    is(numLoginsAfterDeletion, 2, "Correct number of logins after deleting one");
-    await countChangedPromise;
-    synthesizeKey("KEY_Enter");
-    await untilAutocompletePopupClosed();
-    is(form.uname.value, "user-2", "username is set");
-    is(form.pword.value, "pass-2", "password is set");
-  });
-
-  add_named_task("delete second", async () => {
-    await setStoredLoginsDuringTask(
-      [location.origin, "http://autocomplete:8888", null, "user-1", "pass-1", "uname", "pword"],
-      [location.origin, "http://autocomplete:8888", null, "user-2", "pass-2", "uname", "pword"],
-      [location.origin, "http://autocomplete:8888", null, "user-3", "pass-3", "uname", "pword"]
-    );
-    const form = setContentForTask(formTemplate);
-    const autofillResult = await formAutofillResult(form.id);
-    is(autofillResult, "multiple_logins", "form has not been filled due to multiple logins");
-    form.uname.focus();
-    await popupByArrowDown();
-
-    synthesizeKey("KEY_ArrowDown"); // skip insecure warning
-    // Delete the second entry (of 3), "user-2"
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_Delete", {shiftKey: true});
-    is(form.uname.value, "", "username is empty");
-    is(form.pword.value, "", "password is empty");
-    const numLoginsAfterDeletion = await LoginManager.countLogins(location.origin, "http://autocomplete:8888", null);
-    is(numLoginsAfterDeletion, 2, "Correct number of logins after deleting one");
-    synthesizeKey("KEY_Enter");
-    await untilAutocompletePopupClosed();
-    is(form.uname.value, "user-3", "username is set");
-    is(form.pword.value, "pass-3", "password is set");
-  });
-
-  add_named_task("delete last", async () => {
-    await setStoredLoginsDuringTask(
-      [location.origin, "http://autocomplete:8888", null, "user-1", "pass-1", "uname", "pword"],
-      [location.origin, "http://autocomplete:8888", null, "user-2", "pass-2", "uname", "pword"],
-      [location.origin, "http://autocomplete:8888", null, "user-3", "pass-3", "uname", "pword"]
-    );
-    const form = setContentForTask(formTemplate);
-    const autofillResult = await formAutofillResult(form.id);
-    is(autofillResult, "multiple_logins", "form has not been filled due to multiple logins");
-    form.uname.focus();
-    await popupByArrowDown();
-
-    /* test 54 */
-    synthesizeKey("KEY_ArrowDown"); // skip insecure warning
-    // Delete the last entry (of 3), "user-3"
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_ArrowDown");
-    const numLoginsBeforeDeletion = await LoginManager.countLogins(location.origin, "http://autocomplete:8888", null);
-    is(numLoginsBeforeDeletion, 3, "Correct number of logins before deleting one");
-    synthesizeKey("KEY_Delete", {shiftKey: true});
-    is(form.uname.value, "", "username is empty");
-    is(form.pword.value, "", "password is empty");
-    const numLoginsAfterDeletion = await LoginManager.countLogins(location.origin, "http://autocomplete:8888", null);
-    is(numLoginsAfterDeletion, 2, "Correct number of logins after deleting one");
-    synthesizeKey("KEY_ArrowDown"); // skip insecure warning
-    synthesizeKey("KEY_ArrowDown");
-    synthesizeKey("KEY_Enter");
-    await untilAutocompletePopupClosed();
-    is(form.uname.value, "user-1", "username is set");
-    is(form.pword.value, "pass-1", "password is set");
-  });
-
-
   // Tests for single-user forms for ignoring autocomplete=off
 
   add_named_task("default", async () => {

toolkit/components/passwordmgr/test/mochitest/test_autocomplete_https_upgrade.html

@@ -127,65 +127,6 @@
   let popupState = await getPopupState();
   is(popupState.open, false, "Check popup is now closed");
 });
-
-add_task(async function test_delete_first_entry() {
-  await restoreForm();
-  await popupBy();
-
-  let index0Promise = notifySelectedIndex(0);
-  synthesizeKey("KEY_ArrowDown");
-  await index0Promise;
-
-  let deletionPromise = promiseStorageChanged(["removeLogin"]);
-  // On OS X, shift-backspace and shift-delete work, just delete does not.
-  // On Win/Linux, shift-backspace does not work, delete and shift-delete do.
-  synthesizeKey("KEY_Delete", {shiftKey: true});
-  await deletionPromise;
-  await checkLoginFormInFrame(getIframeBrowsingContext(window, 0), "form-basic-username", "", "form-basic-password", "");
-
-  let results = await notifyMenuChanged(3, "name1");
-
-  checkAutoCompleteResults(results.labels, ["name1", "name2"], hostname, "two logins should remain after deleting the first");
-
-  let popupState = await getPopupState();
-  is(popupState.open, true, "Check popup stays open after deleting");
-  synthesizeKey("KEY_Escape");
-  popupState = await getPopupState();
-  is(popupState.open, false, "Check popup closed upon ESC");
-});
-
-add_task(async function test_delete_duplicate_entry() {
-  await restoreForm();
-  await popupBy();
-
-  let index0Promise = notifySelectedIndex(0);
-  synthesizeKey("KEY_ArrowDown");
-  await index0Promise;
-
-  let deletionPromise = promiseStorageChanged(["removeLogin"]);
-  // On OS X, shift-backspace and shift-delete work, just delete does not.
-  // On Win/Linux, shift-backspace does not work, delete and shift-delete do.
-  synthesizeKey("KEY_Delete", {shiftKey: true});
-  await deletionPromise;
-  await checkLoginFormInFrame(getIframeBrowsingContext(window, 0), "form-basic-username", "", "form-basic-password", "");
-
-  is(await LoginManager.countLogins(originNonSecure, originNonSecure, null), 1,
-     "Check that the HTTP login remains");
-  is(await LoginManager.countLogins(originSecure, originSecure, null), 0,
-     "Check that the HTTPS login was deleted");
-
-  // Two menu items should remain as the HTTPS login should have been deleted but
-  // the HTTP would remain.
-  let results = await notifyMenuChanged(2, "name2");
-
-  checkAutoCompleteResults(results.labels, ["name2"], hostname, "one login should remain after deleting the HTTPS name1");
-  let popupState = await getPopupState();
-  is(popupState.open, true, "Check popup stays open after deleting");
-  synthesizeKey("KEY_Escape");
-  popupState = await getPopupState();
-  is(popupState.open, false, "Check popup closed upon ESC");
-});
-
 </script>
 </pre>
 </body>