[ACS-6456] fixed code smells and removed duplication

Alfresco · Dec 18, 2023 · e4a2806 · e4a2806
1 parent a58075f
commit e4a2806
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/projects/aca-playwright-shared/src/api/nodes-api.ts b/projects/aca-playwright-shared/src/api/nodes-api.ts
@@ -405,7 +405,7 @@ export class NodesApi {
   async getNodeProperty(nodeId: string, property: string): Promise<string> {
     try {
       const node = await this.getNodeById(nodeId);
-      return (node.entry.properties && node.entry.properties[property]) || '';
+      return node.entry.properties?.[property] || '';
     } catch (error) {
       console.error(`${this.constructor.name} ${this.getNodeProperty.name}`, error);
       return '';

diff --git a/projects/aca-playwright-shared/src/page-objects/components/dialogs/share-dialog.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dialogs/share-dialog.component.ts
@@ -22,7 +22,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Locator, Page } from '@playwright/test';
+import { ElementHandle, Locator, Page } from '@playwright/test';
 import { BaseComponent } from '../base.component';
 import { timeouts } from '../../../utils';
 import { DateTimePicker } from '../datetime-picker/datetime-picker.component';
@@ -85,19 +85,24 @@ export class ShareDialogComponent extends BaseComponent {
     await this.closeButton.click();
   }
 
+  async isToggleStatus(toggle: ElementHandle, status: string): Promise<boolean> {
+    const toggleClass = await toggle.getAttribute('class');
+    return toggleClass.includes(status);
+  }
+
   async isShareToggleChecked(): Promise<boolean> {
-    const toggleClass = await this.shareToggle.getAttribute('class');
-    return toggleClass.includes('checked');
+    const shareToggleElement = await this.shareToggle.elementHandle();
+    return this.isToggleStatus(shareToggleElement, 'checked');
   }
 
   async isShareToggleDisabled(): Promise<boolean> {
-    const toggleClass = await this.shareToggle.getAttribute('class');
-    return toggleClass.includes('mat-disabled');
+    const shareToggleElement = await this.shareToggle.elementHandle();
+    return this.isToggleStatus(shareToggleElement, 'mat-disabled');
   }
 
   async isExpireToggleEnabled(): Promise<boolean> {
-    const toggleClass = await this.expireToggle.getAttribute('class');
-    return toggleClass.includes('checked');
+    const expireToggleElement = await this.expireToggle.elementHandle();
+    return this.isToggleStatus(expireToggleElement, 'checked');
   }
 
   async getExpireDate(): Promise<string> {