fix: move the validation to the page class

kubeshop · Oct 20, 2023 · e9ab59d · e9ab59d
1 parent f900da4
commit e9ab59d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/packages/e2e-tests/pages/ExecutorGeneralSettingsPage.ts b/packages/e2e-tests/pages/ExecutorGeneralSettingsPage.ts
@@ -1,4 +1,4 @@
-import type {Page} from '@playwright/test';
+import {type Page, expect} from '@playwright/test';
 
 export class ExecutorGeneralSettingsPage {
   public readonly page: Page;
@@ -7,12 +7,17 @@ export class ExecutorGeneralSettingsPage {
     this.page = page;
   }
 
-  public async getExecutorName(): Promise<string | null> {
-    return this.page.locator('input[id="general-settings-name-type_name"]').inputValue();
-  }
+  public async validateExecutorGeneralSettings(executorName: string, executorType: string): Promise<void> {
+    const executorNameLocator = this.page.locator(
+      `//input[@id="general-settings-name-type_name" and @value="${executorName}"]`
+    );
+
+    expect(executorNameLocator.isVisible()).toBeTruthy();
 
-  public async getExecutorType(): Promise<string | null> {
-    return this.page.locator('input[id="general-settings-name-type_type"]').inputValue();
+    const executorTypeLocator = this.page.locator(
+      `//input[@id="general-settings-name-type_type" and @value="${executorType}"]`
+    );
+    expect(executorTypeLocator.isVisible()).toBeTruthy();
   }
 
   public async deleteExecutor(executorName: string): Promise<void> {

diff --git a/packages/e2e-tests/tests/executors.spec.ts b/packages/e2e-tests/tests/executors.spec.ts
@@ -56,12 +56,8 @@ test(`Custom container executor - general settings`, async ({page}) => {
   await executorsPage.openExecutorSettings(realExecutorName);
 
   const executorGeneralSettingsPage = new ExecutorGeneralSettingsPage(page);
-  const executorNameInput = await executorGeneralSettingsPage.getExecutorName();
 
-  expect(executorNameInput).toBe(executorData.name);
-
-  const executorTypeInput = await executorGeneralSettingsPage.getExecutorType();
-  expect(executorTypeInput).not.toBeNull();
+  await executorGeneralSettingsPage.validateExecutorGeneralSettings(executorData.name, executorData.types[0]);
 
   // Cleanup
   await api.removeExecutor(realExecutorName);