[PM-5189] Adjusting AutofillInit jest tests

apps/browser/src/autofill/content/autofill-init.spec.ts

@@ -1,7 +1,8 @@
-import { mock } from "jest-mock-extended";
+import { mock, MockProxy } from "jest-mock-extended";
 
 import AutofillPageDetails from "../models/autofill-page-details";
 import AutofillScript from "../models/autofill-script";
+import { AutofillOverlayInlineMenuElements } from "../overlay/content/autofill-overlay-inline-menu-elements";
 import AutofillOverlayContentService from "../services/autofill-overlay-content.service";
 import { flushPromises, sendMockExtensionMessage } from "../spec/testing-utils";
 
@@ -9,8 +10,9 @@ import { AutofillExtensionMessage } from "./abstractions/autofill-init";
 import AutofillInit from "./autofill-init";
 
 describe("AutofillInit", () => {
+  let inlineMenuElements: MockProxy<AutofillOverlayInlineMenuElements>;
+  let autofillOverlayContentService: MockProxy<AutofillOverlayContentService>;
   let autofillInit: AutofillInit;
-  const autofillOverlayContentService = mock<AutofillOverlayContentService>();
   const originalDocumentReadyState = document.readyState;
   let sendExtensionMessageSpy: jest.SpyInstance;
 
@@ -20,7 +22,9 @@ describe("AutofillInit", () => {
         addListener: jest.fn(),
       },
     });
-    autofillInit = new AutofillInit(autofillOverlayContentService);
+    inlineMenuElements = mock<AutofillOverlayInlineMenuElements>();
+    autofillOverlayContentService = mock<AutofillOverlayContentService>();
+    autofillInit = new AutofillInit(autofillOverlayContentService, inlineMenuElements);
     sendExtensionMessageSpy = jest
       .spyOn(autofillInit as any, "sendExtensionMessage")
       .mockImplementation();
@@ -164,8 +168,7 @@ describe("AutofillInit", () => {
           sendMockExtensionMessage(message, sender, sendResponse);
           await flushPromises();
 
-          expect(chrome.runtime.sendMessage).toHaveBeenCalledWith({
+          expect(sendExtensionMessageSpy).toHaveBeenCalledWith("collectPageDetailsResponse", {
-            command: "collectPageDetailsResponse",
             tab: message.tab,
             details: pageDetails,
             sender: message.sender,
@@ -208,14 +211,11 @@ describe("AutofillInit", () => {
         });
 
         it("skips calling the InsertAutofillContentService and does not fill the form if the url to fill is not equal to the current tab url", async () => {
-          const fillScript = mock<AutofillScript>();
+          sendMockExtensionMessage({
-          const message = {
             command: "fillForm",
             fillScript,
             pageDetailsUrl: "https://a-different-url.com",
-          };
+          });
-
-          sendMockExtensionMessage(message);
           await flushPromises();
 
           expect(autofillInit["insertAutofillContentService"].fillForm).not.toHaveBeenCalledWith(

apps/browser/src/autofill/content/autofill-init.ts

@@ -1,7 +1,7 @@
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 
 import AutofillPageDetails from "../models/autofill-page-details";
-import { InlineMenuElements } from "../overlay/abstractions/inline-menu-elements";
+import { AutofillOverlayInlineMenuElements } from "../overlay/abstractions/autofill-overlay-inline-menu-elements";
 import { AutofillOverlayContentService } from "../services/abstractions/autofill-overlay-content.service";
 import CollectAutofillContentService from "../services/collect-autofill-content.service";
 import DomElementVisibilityService from "../services/dom-element-visibility.service";
@@ -17,7 +17,7 @@ import {
 class AutofillInit implements AutofillInitInterface {
   private readonly sendExtensionMessage = sendExtensionMessage;
   private readonly autofillOverlayContentService: AutofillOverlayContentService | undefined;
-  private readonly inlineMenuElements: InlineMenuElements | undefined;
+  private readonly inlineMenuElements: AutofillOverlayInlineMenuElements | undefined;
   private readonly domElementVisibilityService: DomElementVisibilityService;
   private readonly collectAutofillContentService: CollectAutofillContentService;
   private readonly insertAutofillContentService: InsertAutofillContentService;
@@ -37,7 +37,7 @@ class AutofillInit implements AutofillInitInterface {
    */
   constructor(
     autofillOverlayContentService?: AutofillOverlayContentService,
-    inlineMenuElements?: InlineMenuElements,
+    inlineMenuElements?: AutofillOverlayInlineMenuElements,
   ) {
     this.autofillOverlayContentService = autofillOverlayContentService;
     if (this.autofillOverlayContentService) {
@@ -118,8 +118,7 @@ class AutofillInit implements AutofillInitInterface {
       return pageDetails;
     }
 
-    void chrome.runtime.sendMessage({
+    void this.sendExtensionMessage("collectPageDetailsResponse", {
-      command: "collectPageDetailsResponse",
       tab: message.tab,
       details: pageDetails,
       sender: message.sender,
@@ -157,11 +156,7 @@ class AutofillInit implements AutofillInitInterface {
    * is opened.
    */
   private blurAndRemoveOverlay() {
-    if (!this.autofillOverlayContentService) {
+    this.autofillOverlayContentService?.blurMostRecentOverlayField(true);
-      return;
-    }
-
-    this.autofillOverlayContentService.blurMostRecentOverlayField(true);
   }
 
   /**

apps/browser/src/autofill/overlay/abstractions/autofill-overlay-inline-menu-elements.ts

@@ -9,7 +9,7 @@ export type InlineMenuExtensionMessageHandlers = {
   checkIsInlineMenuListVisible: () => boolean;
 };
 
-export interface InlineMenuElements {
+export interface AutofillOverlayInlineMenuElements {
   extensionMessageHandlers: InlineMenuExtensionMessageHandlers;
   isElementInlineMenu(element: HTMLElement): boolean;
   destroy(): void;

apps/browser/src/autofill/overlay/content/autofill-overlay-inline-menu-elements.ts

@@ -7,8 +7,8 @@ import {
 import { AutofillOverlayElement } from "../../utils/autofill-overlay.enum";
 import {
   InlineMenuExtensionMessageHandlers,
-  InlineMenuElements as InlineMenuElementsInterface,
+  AutofillOverlayInlineMenuElements as InlineMenuElementsInterface,
-} from "../abstractions/inline-menu-elements";
+} from "../abstractions/autofill-overlay-inline-menu-elements";
 import AutofillOverlayButtonIframe from "../iframe-content/autofill-overlay-button-iframe";
 import AutofillOverlayListIframe from "../iframe-content/autofill-overlay-list-iframe";
 

apps/browser/src/autofill/services/dom-element-visibility.service.ts

@@ -1,4 +1,4 @@
-import { InlineMenuElements } from "../overlay/abstractions/inline-menu-elements";
+import { AutofillOverlayInlineMenuElements } from "../overlay/abstractions/autofill-overlay-inline-menu-elements";
 import { FillableFormFieldElement, FormFieldElement } from "../types";
 
 import { DomElementVisibilityService as domElementVisibilityServiceInterface } from "./abstractions/dom-element-visibility.service";
@@ -6,7 +6,7 @@ import { DomElementVisibilityService as domElementVisibilityServiceInterface } f
 class DomElementVisibilityService implements domElementVisibilityServiceInterface {
   private cachedComputedStyle: CSSStyleDeclaration | null = null;
 
-  constructor(private inlineMenuElements?: InlineMenuElements) {}
+  constructor(private inlineMenuElements?: AutofillOverlayInlineMenuElements) {}
 
   /**
    * Checks if a form field is viewable. This is done by checking if the element is within the