fix: tests

Author: astandrik

src/containers/Tenant/Query/QueryResult/components/ResultSetsViewer/ResultSetsViewer.scss

@@ -8,10 +8,6 @@
     }
 
     &__title {
-        display: flex;
-        align-items: center;
-        gap: var(--g-spacing-2);
-
         padding-top: var(--g-spacing-4);
         padding-bottom: var(--g-spacing-4);
         padding-left: var(--g-spacing-4);

src/containers/Tenant/Query/QueryResult/components/ResultSetsViewer/ResultSetsViewer.tsx

@@ -55,10 +55,10 @@ export function ResultSetsViewer(props: ResultSetsViewerProps) {
     const renderSingleResult = () => {
         const result = resultSets?.[0];
         return (
-            <div className={b('title')}>
-                <Text>{`Result ${result?.truncated ? '(T)' : ''}`}</Text>
+            <Flex gap={2} alignItems="center" className={b('title')}>
+                <Text>{result?.truncated ? 'Truncated' : 'Result'}</Text>
                 <Text color="secondary">{result?.result?.length || 0}</Text>
-            </div>
+            </Flex>
         );
     };
 

tests/suites/tenant/constants.ts

@@ -2,7 +2,8 @@
 // May cause Memory exceed on real database
 
 export const simpleQuery = 'SELECT 1;';
-export const longTableSelect = 'SELECT * FROM `.sys/pg_class`';
+export const longTableSelect = (limit?: number) =>
+    'SELECT * FROM `.sys/pg_class`' + (limit ? ` LIMIT ${limit};` : ';');
 
 // 400 is pretty enough
 export const longRunningQuery = new Array(400).fill(simpleQuery).join('');

tests/suites/tenant/queryEditor/models/ResultTable.ts

@@ -25,11 +25,13 @@ export class ResultTable {
     private preview: Locator;
     private resultHead: Locator;
     private resultWrapper: Locator;
+    private resultTitle: Locator;
 
     constructor(selector: Locator) {
         this.table = selector.locator('.ydb-query-result-sets-viewer__result');
         this.preview = selector.locator('.kv-preview__result');
         this.resultHead = selector.locator('.ydb-query-result-sets-viewer__head');
+        this.resultTitle = selector.locator('.ydb-query-result-sets-viewer__title');
         this.resultWrapper = selector.locator('.ydb-query-result-sets-viewer__result-wrapper');
     }
 
@@ -81,6 +83,16 @@ export class ResultTable {
         return tabs.count();
     }
 
+    async getResultTitleText() {
+        await this.resultTitle.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        return this.resultTitle.locator('.g-text').first().textContent();
+    }
+
+    async getResultTitleCount() {
+        await this.resultTitle.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
+        return this.resultTitle.locator('.g-text').nth(1).textContent();
+    }
+
     async getResultTabTitleText(index: number) {
         const tabs = await this.getResultTabs();
         const tab = tabs.nth(index);

tests/suites/tenant/queryEditor/queryEditor.test.ts

@@ -217,9 +217,8 @@ test.describe('Test Query Editor', async () => {
         const queryEditor = new QueryEditor(page);
         await queryEditor.setQuery(testQuery);
         await queryEditor.clickRunButton();
-        await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
-        await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result');
-        await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
+        await expect(queryEditor.resultTable.getResultTitleText()).resolves.toBe('Result');
+        await expect(queryEditor.resultTable.getResultTitleCount()).resolves.toBe('1');
     });
 
     test('No result head value for no result', async ({page}) => {
@@ -232,14 +231,27 @@ test.describe('Test Query Editor', async () => {
 
     test('Truncated head value is 1 for 1 row truncated result', async ({page}) => {
         const queryEditor = new QueryEditor(page);
-        await queryEditor.setQuery(longTableSelect);
+        await queryEditor.setQuery(longTableSelect());
         await queryEditor.clickGearButton();
         await queryEditor.settingsDialog.changeLimitRows(1);
         await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
         await queryEditor.clickRunButton();
-        await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
-        await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result(T)');
-        await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
+        await expect(queryEditor.resultTable.getResultTitleText()).resolves.toBe('Truncated');
+        await expect(queryEditor.resultTable.getResultTitleCount()).resolves.toBe('1');
+    });
+
+    test('Truncated results for multiple tabs', async ({page}) => {
+        const queryEditor = new QueryEditor(page);
+        await queryEditor.setQuery(`${longTableSelect(2)}${longTableSelect(2)}`);
+        await queryEditor.clickGearButton();
+        await queryEditor.settingsDialog.changeLimitRows(3);
+        await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
+        await queryEditor.clickRunButton();
+        await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(2);
+        await expect(queryEditor.resultTable.getResultTabTitleText(1)).resolves.toBe(
+            'Result #2(T)',
+        );
+        await expect(queryEditor.resultTable.getResultTabTitleCount(1)).resolves.toBe('1');
     });
 
     test('Query execution status changes correctly', async ({page}) => {
@@ -274,9 +286,8 @@ test.describe('Test Query Editor', async () => {
         await executeSelectedQueryWithKeybinding(page);
 
         await expect(queryEditor.waitForStatus('Completed')).resolves.toBe(true);
-        await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
-        await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result');
-        await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
+        await expect(queryEditor.resultTable.getResultTitleText()).resolves.toBe('Result');
+        await expect(queryEditor.resultTable.getResultTitleCount()).resolves.toBe('1');
     });
 
     test('Running selected query via context menu executes only selected part', async ({page}) => {
@@ -301,9 +312,8 @@ test.describe('Test Query Editor', async () => {
         await queryEditor.runSelectedQueryViaContextMenu();
 
         await expect(queryEditor.waitForStatus('Completed')).resolves.toBe(true);
-        await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
-        await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result');
-        await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
+        await expect(queryEditor.resultTable.getResultTitleText()).resolves.toBe('Result');
+        await expect(queryEditor.resultTable.getResultTitleCount()).resolves.toBe('1');
     });
 
     test('Results controls collapse and expand functionality', async ({page}) => {