refactor: replace click overloads with click() and clickRedirectsTo() (#8)

* refactor: replace click overloads with click() and clickRedirectsTo()

* refactor: replace click overloads with click() and clickRedirectsTo()

Author: PeterYinusa

src/controls/html-element.ts

@@ -51,19 +51,22 @@ export class HTMLElement implements IHTMLElement {
   /**
    *
    * Schedules a command to click on this element
+   * @return {*}  {Promise<void>}
+   * @memberof HTMLElement
+   */
+  async click(): Promise<void> {
+    return await this.callIfMethodExists('click');
+  }
+  /**
+   *
+   * Schedules a command to click on this element and return a new page object
    * @template TPage
-   * @param {new () => TPage} [page]
-   * @return {*}  {Promise<any>}
+   * @param {new () => TPage} page
+   * @return {*}  {Promise<TPage>}
    * @memberof HTMLElement
    */
-  click(): Promise<void>;
-  click<TPage>(page: new () => TPage): Promise<TPage>;
-  async click<TPage>(page?: new () => TPage): Promise<any> {
-    if (page) {
-      return await this.callIfMethodExists('click', [page]);
-    } else {
-      return await this.callIfMethodExists('click');
-    }
+  async clickRedirectsTo<TPage>(page: new () => TPage): Promise<TPage> {
+    return await this.callIfMethodExists('clickRedirectsTo', [page]);
   }
   /**
    *

src/flask/pages/onboarding/experimental-area.ts

@@ -27,6 +27,6 @@ export class ExperimentalArea extends PageObject {
    * @memberof ExperimentalArea
    */
   async iAccept(): Promise<Welcome> {
-    return await this.iAcceptButton.click<Welcome>(Welcome);
+    return await this.iAcceptButton.clickRedirectsTo<Welcome>(Welcome);
   }
 }

src/interface/controls/html-element.ts

@@ -3,8 +3,7 @@ import { IConfirmation } from '../wallet/confirmation';
 
 export interface IHTMLElement {
   click(): Promise<void>;
-  click<TPage>(page: new () => TPage): Promise<TPage>;
-  click<TPage>(page?: new () => TPage): Promise<any>;
+  clickRedirectsTo<TPage>(page: new () => TPage): Promise<TPage>;
   clickAndSwitchToWindow<TPage extends IConfirmation | IPageObject>(page: new () => TPage): Promise<TPage>;
   clickAndWait(duration: number): Promise<void>;
   getAttribute(attribute: string): Promise<string | null>;

src/metamask/pages/onboarding/confirm-recovery-phrase.ts

@@ -60,6 +60,6 @@ export class ConfirmRecoveryPhrase extends PageObject {
    */
   async confirm(): Promise<Metametrics> {
     await this.confirmButton.click();
-    return await this.modalButton.click<Metametrics>(Metametrics);
+    return await this.modalButton.clickRedirectsTo<Metametrics>(Metametrics);
   }
 }

src/metamask/pages/onboarding/create-password.ts

@@ -65,7 +65,7 @@ export class CreatePassword extends PageObject {
    * @memberof CreatePassword
    */
   async importWallet(): Promise<Metametrics> {
-    return await this.submitButton.click<Metametrics>(Metametrics);
+    return await this.submitButton.clickRedirectsTo<Metametrics>(Metametrics);
   }
   /**
    *
@@ -74,6 +74,6 @@ export class CreatePassword extends PageObject {
    * @memberof CreatePassword
    */
   async createWallet(): Promise<ReviewRecoveryPhrase> {
-    return await this.submitButton.click<ReviewRecoveryPhrase>(ReviewRecoveryPhrase);
+    return await this.submitButton.clickRedirectsTo<ReviewRecoveryPhrase>(ReviewRecoveryPhrase);
   }
 }

src/metamask/pages/onboarding/import-with-recory-phrase.ts

@@ -46,6 +46,6 @@ export class ImportWithRecoveryPhrase extends PageObject {
    * @memberof ImportWithRecoveryPhrase
    */
   async confirmSecretRecoveryPhrase(): Promise<CreatePassword> {
-    return await this.confirmButton.click<CreatePassword>(CreatePassword);
+    return await this.confirmButton.clickRedirectsTo<CreatePassword>(CreatePassword);
   }
 }

src/metamask/pages/onboarding/metametrics.ts

@@ -27,6 +27,6 @@ export class Metametrics extends PageObject {
    * @memberof Metametrics
    */
   async continue(): Promise<Completion> {
-    return await this.iAgreeButton.click<Completion>(Completion);
+    return await this.iAgreeButton.clickRedirectsTo<Completion>(Completion);
   }
 }

src/metamask/pages/onboarding/review-recovery-phrase.ts

@@ -39,6 +39,6 @@ export class ReviewRecoveryPhrase extends PageObject {
    * @memberof ReviewRecoveryPhrase
    */
   async next(): Promise<ConfirmRecoveryPhrase> {
-    return await this.nextButton.click<ConfirmRecoveryPhrase>(ConfirmRecoveryPhrase);
+    return await this.nextButton.clickRedirectsTo<ConfirmRecoveryPhrase>(ConfirmRecoveryPhrase);
   }
 }

src/metamask/pages/onboarding/welcome.ts

@@ -37,7 +37,7 @@ export class Welcome extends PageObject {
    */
   async createANewWallet(): Promise<CreatePassword> {
     await this.createANewWalletButton.click();
-    return await this.createWithSRPButton.click<CreatePassword>(CreatePassword);
+    return await this.createWithSRPButton.clickRedirectsTo<CreatePassword>(CreatePassword);
   }
   /**
    *
@@ -47,6 +47,6 @@ export class Welcome extends PageObject {
    */
   async iHaveAnExistingWallet(): Promise<ImportWithRecoveryPhrase> {
     await this.importAnExistingWalletButton.click();
-    return await this.importWithSRPButton.click<ImportWithRecoveryPhrase>(ImportWithRecoveryPhrase);
+    return await this.importWithSRPButton.clickRedirectsTo<ImportWithRecoveryPhrase>(ImportWithRecoveryPhrase);
   }
 }

src/playwright/html-element.ts

@@ -31,11 +31,13 @@ export class PlaywrightHTMLElement implements IHTMLElement {
     return locator;
   }
 
-  async click<TPage>(page?: new () => TPage): Promise<any> {
+  async click(): Promise<void> {
     await this.webElement.click({ timeout: this.timeout });
-    if (page) {
-      return await DappDriver.getPage<TPage>(page);
-    }
+  }
+
+  async clickRedirectsTo<TPage>(page: new () => TPage): Promise<TPage> {
+    await this.webElement.click({ timeout: this.timeout });
+    return await DappDriver.getPage<TPage>(page);
   }
 
   async clickAndWait(duration: number): Promise<void> {