Dialog.driver - improve API (#3157)

Author: M-i-k-e-l

src/components/picker/Picker.driver.new.ts

@@ -43,15 +43,15 @@ export const PickerDriver = (props: ComponentProps) => {
   };
 
   const isOpen = (): boolean => {
-    if (dialogDriver.getModal().exists()) {
-      return dialogDriver.getModal().isVisible();
+    if (dialogDriver.exists()) {
+      return dialogDriver.isVisible();
     }
     return modalDriver.exists() && modalDriver.isVisible();
   };
 
   const dismissDialog = (): void => {
-    if (dialogDriver.getModal().isVisible()) {
-      dialogDriver.getModal().pressOnBackground();
+    if (dialogDriver.isVisible()) {
+      dialogDriver.pressOnBackground();
     }
   };
 

src/incubator/Dialog/Dialog.driver.new.ts

@@ -1,9 +1,22 @@
-import {useComponentDriver, ComponentProps} from '../../testkit/new/Component.driver';
+import {ComponentProps} from '../../testkit/new/Component.driver';
 import {ModalDriver} from '../../testkit/';
 
 export const DialogDriver = (props: ComponentProps) => {
   const {renderTree, testID} = props;
-  const driver = useComponentDriver(props);
+
   const modalDriver = ModalDriver({renderTree, testID: `${testID}.modal`});
-  return {...driver, getModal: () => modalDriver};
+
+  const exists = () => {
+    return modalDriver.exists();
+  };
+
+  const isVisible = () => {
+    return modalDriver.isVisible();
+  };
+
+  const pressOnBackground = () => {
+    modalDriver.pressOnBackground();
+  };
+
+  return {isVisible, pressOnBackground, exists};
 };

src/incubator/Dialog/__tests__/index.new.spec.tsx

@@ -58,16 +58,16 @@ const getDriver = (Element: React.JSX.Element) => {
 describe('Incubator.Dialog sanity checks', () => {
   it('Should show dialog', () => {
     const {dialogDriver} = getDriver(<TestCase1 visible/>);
-    expect(dialogDriver.getModal().isVisible()).toBeTruthy();
+    expect(dialogDriver.isVisible()).toBeTruthy();
   });
 
   it('Should dismiss dialog on background press', () => {
     const dismissFn = jest.fn();
     const {dialogDriver} = getDriver(<TestCase1 visible onDismiss={dismissFn}/>);
     expect(dismissFn).not.toHaveBeenCalled();
-    expect(dialogDriver.getModal().isVisible()).toBeTruthy();
-    dialogDriver.getModal().pressOnBackground();
-    expect(dialogDriver.getModal().isVisible()).toBeFalsy();
+    expect(dialogDriver.isVisible()).toBeTruthy();
+    dialogDriver.pressOnBackground();
+    expect(dialogDriver.isVisible()).toBeFalsy();
     expect(dismissFn).toHaveBeenCalledTimes(1);
   });
 
@@ -78,32 +78,33 @@ describe('Incubator.Dialog sanity checks', () => {
       return <Dialog testID={testID} visible ref={dialogRef}/>;
     };
     const {dialogDriver} = getDriver(<RefTestCase/>);
-    expect(dialogDriver.getModal().isVisible()).toBeTruthy();
+    expect(dialogDriver.isVisible()).toBeTruthy();
     act(() => {
       dialogRef.current?.dismiss();
     });
-    expect(dialogDriver.getModal().isVisible()).toBeFalsy();
+    expect(dialogDriver.isVisible()).toBeFalsy();
   });
 
   it('Should exist only if visible', () => {
     const onDismiss = jest.fn();
     const component = <TestCase2 onDismiss={onDismiss}/>;
     const {dialogDriver, renderTree} = getDriver(component);
-    expect(dialogDriver.exists()).toBeFalsy();
+    expect(dialogDriver.isVisible()).toBeFalsy();
     const openButtonDriver = ButtonDriver({renderTree, testID: 'openButton'});
     openButtonDriver.press();
-    expect(dialogDriver.exists()).toBeTruthy();
+    expect(dialogDriver.isVisible()).toBeTruthy();
     expect(onDismiss).toHaveBeenCalledTimes(0);
     const closeButtonDriver = ButtonDriver({renderTree, testID: 'closeButton'});
     closeButtonDriver.press();
-    expect(dialogDriver.exists()).toBeFalsy();
+    expect(dialogDriver.isVisible()).toBeFalsy();
     expect(onDismiss).toHaveBeenCalledTimes(1);
   });
 
   it('Modal exists even when not visible (WOAUILIB-3606)', () => {
     const onDismiss = jest.fn();
     const component = <TestCase2 onDismiss={onDismiss}/>;
     const {dialogDriver} = getDriver(component);
-    expect(dialogDriver.getModal().exists()).toBeTruthy();
+    expect(dialogDriver.exists()).toBeTruthy();
+    expect(dialogDriver.isVisible()).toBeFalsy();
   });
 });