From 5efc759e04ce320742f96ff7f362eae88ac573fc Mon Sep 17 00:00:00 2001 From: Geoffrey Kwan Date: Mon, 21 Aug 2023 10:33:32 -0400 Subject: [PATCH] test(Archive Run): Clean up test harnesses #1012 --- .../select-runs-controls.harness.ts | 17 +++----- .../teacher-run-list-item.harness.ts | 8 ++-- .../teacher-run-list.harness.ts | 42 +++++++------------ 3 files changed, 23 insertions(+), 44 deletions(-) diff --git a/src/app/teacher/select-runs-controls/select-runs-controls.harness.ts b/src/app/teacher/select-runs-controls/select-runs-controls.harness.ts index 988f4ca7a5..be91ebba80 100644 --- a/src/app/teacher/select-runs-controls/select-runs-controls.harness.ts +++ b/src/app/teacher/select-runs-controls/select-runs-controls.harness.ts @@ -8,33 +8,28 @@ export class SelectRunsControlsHarness extends ComponentHarness { protected getSelectAllCheckbox = this.locatorFor(MatCheckboxHarness); async checkCheckbox(): Promise { - const selectAllCheckBox = await this.getSelectAllCheckbox(); - return await selectAllCheckBox.check(); + return (await this.getSelectAllCheckbox()).check(); } async uncheckCheckbox(): Promise { - const selectAllCheckBox = await this.getSelectAllCheckbox(); - return await selectAllCheckBox.uncheck(); + return (await this.getSelectAllCheckbox()).uncheck(); } async toggleCheckbox(): Promise { - const selectAllCheckBox = await this.getSelectAllCheckbox(); - return await selectAllCheckBox.toggle(); + return (await this.getSelectAllCheckbox()).toggle(); } async isChecked(): Promise { - const checkbox = await this.getSelectAllCheckbox(); - return await checkbox.isChecked(); + return (await this.getSelectAllCheckbox()).isChecked(); } async isIndeterminate(): Promise { - const checkbox = await this.getSelectAllCheckbox(); - return await checkbox.isIndeterminate(); + return (await this.getSelectAllCheckbox()).isIndeterminate(); } async clickMenuButton(menuButtonText: string): Promise { const menu = await this.getMenu(); await menu.open(); - return await menu.clickItem({ text: menuButtonText }); + return menu.clickItem({ text: menuButtonText }); } } diff --git a/src/app/teacher/teacher-run-list-item/teacher-run-list-item.harness.ts b/src/app/teacher/teacher-run-list-item/teacher-run-list-item.harness.ts index bd924ff8db..36ab707f73 100644 --- a/src/app/teacher/teacher-run-list-item/teacher-run-list-item.harness.ts +++ b/src/app/teacher/teacher-run-list-item/teacher-run-list-item.harness.ts @@ -8,18 +8,16 @@ export class TeacherRunListItemHarness extends ComponentHarness { protected getMenu = this.locatorFor(MatMenuHarness); async checkCheckbox(): Promise { - const checkbox = await this.getCheckbox(); - return await checkbox.check(); + return (await this.getCheckbox()).check(); } async isChecked(): Promise { - const checkbox = await this.getCheckbox(); - return await checkbox.isChecked(); + return (await this.getCheckbox()).isChecked(); } async clickMenuButton(menuButtonText: string): Promise { const menu = await this.getMenu(); await menu.open(); - return await menu.clickItem({ text: menuButtonText }); + return menu.clickItem({ text: menuButtonText }); } } diff --git a/src/app/teacher/teacher-run-list/teacher-run-list.harness.ts b/src/app/teacher/teacher-run-list/teacher-run-list.harness.ts index 452367f07e..a634ffebe3 100644 --- a/src/app/teacher/teacher-run-list/teacher-run-list.harness.ts +++ b/src/app/teacher/teacher-run-list/teacher-run-list.harness.ts @@ -15,72 +15,58 @@ export class TeacherRunListHarness extends ComponentHarness { ); async isShowingArchived(): Promise { - const archiveToggle = await this.getArchiveToggle(); - return await archiveToggle.isChecked(); + return (await this.getArchiveToggle()).isChecked(); } async toggleArchiveToggle(): Promise { - const archiveToggle = await this.getArchiveToggle(); - return await archiveToggle.toggle(); + return (await this.getArchiveToggle()).toggle(); } async checkSelectRunsCheckbox(): Promise { - const selectRunsControls = await this.getSelectRunsControls(); - return await selectRunsControls.checkCheckbox(); + return (await this.getSelectRunsControls()).checkCheckbox(); } async uncheckSelectRunsCheckbox(): Promise { - const selectRunsControls = await this.getSelectRunsControls(); - return await selectRunsControls.uncheckCheckbox(); + return (await this.getSelectRunsControls()).uncheckCheckbox(); } async toggleSelectRunsCheckbox(): Promise { - const selectRunsControls = await this.getSelectRunsControls(); - return await selectRunsControls.toggleCheckbox(); + return (await this.getSelectRunsControls()).toggleCheckbox(); } async isSelectRunsCheckboxChecked(): Promise { - const selectRunsControls = await this.getSelectRunsControls(); - return await selectRunsControls.isChecked(); + return (await this.getSelectRunsControls()).isChecked(); } async isSelectRunsCheckboxIndeterminate(): Promise { - const selectRunsControls = await this.getSelectRunsControls(); - return await selectRunsControls.isIndeterminate(); + return (await this.getSelectRunsControls()).isIndeterminate(); } async clickSelectRunsMenuButton(menuButtonText: string): Promise { - const selectRunsControls = await this.getSelectRunsControls(); - return await selectRunsControls.clickMenuButton(menuButtonText); + return (await this.getSelectRunsControls()).clickMenuButton(menuButtonText); } async clickRunListItemCheckbox(index: number): Promise { - const runListItem = await this.getRunListItem(index); - return runListItem.checkCheckbox(); + return (await this.getRunListItem(index)).checkCheckbox(); } async getRunListItem(index: number): Promise { - const runListItems = await this.getRunListItems(); - return runListItems[index]; + return (await this.getRunListItems())[index]; } async getNumRunListItems(): Promise { - const runListItems = await this.getRunListItems(); - return runListItems.length; + return (await this.getRunListItems()).length; } async clickRunListItemMenuButton(index: number, menuButtonText: string): Promise { - const runListItem = await this.getRunListItem(index); - return await runListItem.clickMenuButton(menuButtonText); + return (await this.getRunListItem(index)).clickMenuButton(menuButtonText); } async clickArchiveButton(): Promise { - const button = await this.getArchiveButton(); - return await button.click(); + return (await this.getArchiveButton()).click(); } async clickUnarchiveButton(): Promise { - const button = await this.getUnarchiveButton(); - return await button.click(); + return (await this.getUnarchiveButton()).click(); } }