Merge pull request #1241 from mito-ds/add-utils

Add utils for filling input and selects

Author: marthacryan

tests/streamlit_ui_tests/features/column_control_panel.spec.ts

@@ -1,5 +1,5 @@
 import { FrameLocator, Page, expect, test } from '@playwright/test';
-import { awaitResponse, getMitoFrameWithTestCSV, checkColumnCellsHaveExpectedValues } from '../utils';
+import { awaitResponse, getMitoFrameWithTestCSV, checkColumnCellsHaveExpectedValues, fillInput, updateSelectedValue } from '../utils';
 
 const openColumnControlPanel = async (mito: any, columnName: string) => {
     const columnHeader = await mito.locator('.endo-column-header-final-container', { hasText: columnName });
@@ -8,15 +8,11 @@ const openColumnControlPanel = async (mito: any, columnName: string) => {
 };
 
 const changeDtypeInColumnControlPanel = async (mito: FrameLocator, page: Page, dtype: string) => {
-    await mito.locator('.spacing-row', { hasText: 'Dtype' }).locator('.select-text').click();
-    await mito.locator('.mito-dropdown-item', { hasText: dtype }).click();
-    await awaitResponse(page);
+    await updateSelectedValue(mito, 'Dtype', dtype);
 }
 
 const changeNumTypeInColumnControlPanel = async (mito: FrameLocator, page: Page, numType: string) => {
-    await mito.locator('.spacing-row', { hasText: 'Num Type' }).locator('.select-text').click();
-    await mito.locator('.mito-dropdown-item', { hasText: numType }).click();
-    await awaitResponse(page);
+    await updateSelectedValue(mito, 'Num Type', numType);
 }
 
 const checkValuesTabHasExpectedValues = async (mito: FrameLocator, expectedValues: any[]) => {
@@ -53,7 +49,7 @@ test.describe('Column Control Panel', () => {
 
         await mito.getByText('Add Filter').click();
         await mito.getByText('Add a Filter').click();
-        await mito.locator('.spacing-row', { hasText: 'Where' }).locator('input').fill('4');
+        await fillInput(mito, 'Where', '4');
         await awaitResponse(page);
 
         await checkColumnCellsHaveExpectedValues(mito, 0, ['7', '10']);
@@ -66,7 +62,7 @@ test.describe('Column Control Panel', () => {
 
         await mito.getByText('Add Filter').click();
         await mito.getByText('Add a Group').click();
-        await mito.locator('.spacing-row', { hasText: 'Where' }).locator('input').fill('7');
+        await fillInput(mito, 'Where', '7');
         await awaitResponse(page);
 
         await checkColumnCellsHaveExpectedValues(mito, 0, ['10']);

tests/streamlit_ui_tests/taskpanes/graph.spec.ts

@@ -1,5 +1,5 @@
 import { FrameLocator, Page, expect, test } from '@playwright/test';
-import { awaitResponse, clickButtonAndAwaitResponse, clickTab, getMitoFrameWithTestCSV, getMitoFrameWithTypeCSV } from '../utils';
+import { awaitResponse, clickButtonAndAwaitResponse, clickTab, fillInput, getMitoFrameWithTestCSV, getMitoFrameWithTypeCSV } from '../utils';
 
 test.describe.configure({ mode: 'parallel' });
 
@@ -241,14 +241,13 @@ test.describe('Graph Functionality', () => {
     await mito.locator('.endo-column-header-final-container').first().getByTitle('Edit Filters').click();
     await mito.getByText('Add Filter').click();
     await mito.getByText('Add a Filter').click();
-    await mito.locator('.spacing-row', { hasText: 'Where' }).locator('input').fill('1');
+    await fillInput(mito, 'Where', '1');
     await expect(mito.locator('.mito-grid-cell-selected')).toHaveCount(3);
 
     // Check that the graph has been updated
     await expect(mito.locator('.g-gtitle', { hasText: 'Column1 bar chart'})).not.toBeVisible();
     await mito.locator('.footer').getByText('graph0').click();
 
-    await awaitResponse(page);
     await awaitResponse(page);
     await expect(mito.locator('.g-gtitle', { hasText: 'Column1 bar chart'})).toBeVisible();
     await expect(mito.locator('g.point')).toHaveCount(6);

tests/streamlit_ui_tests/utils.ts

@@ -48,6 +48,15 @@ export const checkColumnCellsHaveExpectedValues = async (mito: FrameLocator, col
     }
 }
 
+export const fillInput = async (mito: FrameLocator, inputLabel: string, value: string): Promise<void> => {
+    await mito.locator('.spacing-row', { hasText: inputLabel }).locator('input').fill(value);
+}
+
+export const updateSelectedValue = async (mito: FrameLocator, selectLabel: string, value: string): Promise<void> => {
+    await mito.locator('.spacing-row', { hasText: selectLabel }).locator('.select-text').click();
+    await mito.locator('.mito-dropdown-item', { hasText: value }).click();
+}
+
 export const hasExpectedNumberOfRows = async (mito: any, expectedRows: number) => {
     await expect(mito.locator('.index-header-container', { hasText: `${expectedRows - 1}` })).toBeVisible();
     await expect(mito.locator('.index-header-container', { hasText: `${expectedRows}` })).not.toBeVisible();