Skip to content

Commit 9a8dec8

Browse files
astandrikastandrik
committed
fix: fix tests
1 parent a21f370 commit 9a8dec8

File tree

4 files changed

+25
-41
lines changed

4 files changed

+25
-41
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function ResultSetsViewer(props: ResultSetsViewerProps) {
3838
title: (
3939
<div className={b('tab-title')}>
4040
<Text>
41-
{`Result ${resultSets.length > 1 ? `#${index + 1}${resultSets?.[index]?.truncated ? ' (T)' : ''}` : ''}`}
41+
{`Result${resultSets.length > 1 ? ` #${index + 1}` : ''}${resultSets?.[index]?.truncated ? '(T)' : ''}`}
4242
</Text>
4343
<Text color="secondary">{resultSet.result?.length || 0}</Text>
4444
</div>

‎tests/suites/tenant/queryEditor/models/QueryEditor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class QueryEditor {
7373
this.indicatorIcon = this.selector.locator(
7474
'.kv-query-execution-status__query-settings-icon',
7575
);
76-
this.elapsedTimeLabel = this.selector.locator('.ydb-query-elapsed-time');
76+
this.elapsedTimeLabel = this.selector.locator('.kv-query-execution-status .g-label__value');
7777
this.radioButton = this.selector.locator('.query-editor__pane-wrapper .g-radio-button');
7878
this.banner = this.page.locator('.ydb-query-settings-banner');
7979

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ export class ResultTable {
6868
return true;
6969
}
7070

71-
async getResultHeadText() {
72-
await this.resultHead.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
73-
return this.resultHead.innerText();
74-
}
75-
7671
async getResultTabs() {
7772
const tabs = this.resultWrapper.locator(
7873
'.ydb-query-result-sets-viewer__tabs .g-tabs__item',
@@ -86,20 +81,17 @@ export class ResultTable {
8681
return tabs.count();
8782
}
8883

89-
async getResultTabTitle(index: number) {
84+
async getResultTabTitleText(index: number) {
9085
const tabs = await this.getResultTabs();
9186
const tab = tabs.nth(index);
9287
await tab.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
93-
return tab.getAttribute('title');
88+
return tab.locator('.g-text').first().textContent();
9489
}
9590

96-
async hasMultipleResultTabs() {
97-
const tabs = this.resultWrapper.locator('.ydb-query-result-sets-viewer__tabs');
98-
try {
99-
await tabs.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
100-
return true;
101-
} catch {
102-
return false;
103-
}
91+
async getResultTabTitleCount(index: number) {
92+
const tabs = await this.getResultTabs();
93+
const tab = tabs.nth(index);
94+
await tab.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
95+
return tab.locator('.g-text').nth(1).textContent();
10496
}
10597
}

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

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -102,20 +102,6 @@ test.describe('Test Query Editor', async () => {
102102
await expect(queryEditor.isElapsedTimeVisible()).resolves.toBe(true);
103103
});
104104

105-
test('Stop button and elapsed time label disappear after query is stopped', async ({page}) => {
106-
const queryEditor = new QueryEditor(page);
107-
108-
await queryEditor.setQuery(longRunningQuery);
109-
await queryEditor.clickRunButton();
110-
111-
await expect(queryEditor.isStopButtonVisible()).resolves.toBe(true);
112-
113-
await queryEditor.clickStopButton();
114-
115-
await expect(queryEditor.isStopButtonHidden()).resolves.toBe(true);
116-
await expect(queryEditor.isElapsedTimeHidden()).resolves.toBe(true);
117-
});
118-
119105
test('Query execution is terminated when stop button is clicked', async ({page}) => {
120106
const queryEditor = new QueryEditor(page);
121107

@@ -215,7 +201,9 @@ test.describe('Test Query Editor', async () => {
215201
const queryEditor = new QueryEditor(page);
216202
await queryEditor.setQuery(testQuery);
217203
await queryEditor.clickRunButton();
218-
await expect(queryEditor.resultTable.getResultHeadText()).resolves.toBe('Result(1)');
204+
await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
205+
await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result');
206+
await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
219207
});
220208

221209
test('No result head value for no result', async ({page}) => {
@@ -233,7 +221,9 @@ test.describe('Test Query Editor', async () => {
233221
await queryEditor.settingsDialog.changeLimitRows(1);
234222
await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
235223
await queryEditor.clickRunButton();
236-
await expect(queryEditor.resultTable.getResultHeadText()).resolves.toBe('Truncated(1)');
224+
await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
225+
await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result(T)');
226+
await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
237227
});
238228

239229
test('Query execution status changes correctly', async ({page}) => {
@@ -257,8 +247,8 @@ test.describe('Test Query Editor', async () => {
257247

258248
// Verify there are two result tabs
259249
await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(2);
260-
await expect(queryEditor.resultTable.getResultTabTitle(0)).resolves.toBe('Result #1');
261-
await expect(queryEditor.resultTable.getResultTabTitle(1)).resolves.toBe('Result #2');
250+
await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result #1');
251+
await expect(queryEditor.resultTable.getResultTabTitleText(1)).resolves.toBe('Result #2');
262252

263253
// Then verify running only selected part produces one result
264254
await queryEditor.focusEditor();
@@ -268,8 +258,9 @@ test.describe('Test Query Editor', async () => {
268258
await executeSelectedQueryWithKeybinding(page);
269259

270260
await expect(queryEditor.waitForStatus('Completed')).resolves.toBe(true);
271-
await expect(queryEditor.resultTable.hasMultipleResultTabs()).resolves.toBe(false);
272-
await expect(queryEditor.resultTable.getResultHeadText()).resolves.toBe('Result(1)');
261+
await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
262+
await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result');
263+
await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
273264
});
274265

275266
test('Running selected query via context menu executes only selected part', async ({page}) => {
@@ -283,8 +274,8 @@ test.describe('Test Query Editor', async () => {
283274

284275
// Verify there are two result tabs
285276
await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(2);
286-
await expect(queryEditor.resultTable.getResultTabTitle(0)).resolves.toBe('Result #1');
287-
await expect(queryEditor.resultTable.getResultTabTitle(1)).resolves.toBe('Result #2');
277+
await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result #1');
278+
await expect(queryEditor.resultTable.getResultTabTitleText(1)).resolves.toBe('Result #2');
288279

289280
// Then verify running only selected part produces one result without tabs
290281
await queryEditor.focusEditor();
@@ -294,8 +285,9 @@ test.describe('Test Query Editor', async () => {
294285
await queryEditor.runSelectedQueryViaContextMenu();
295286

296287
await expect(queryEditor.waitForStatus('Completed')).resolves.toBe(true);
297-
await expect(queryEditor.resultTable.hasMultipleResultTabs()).resolves.toBe(false);
298-
await expect(queryEditor.resultTable.getResultHeadText()).resolves.toBe('Result(1)');
288+
await expect(queryEditor.resultTable.getResultTabsCount()).resolves.toBe(1);
289+
await expect(queryEditor.resultTable.getResultTabTitleText(0)).resolves.toBe('Result');
290+
await expect(queryEditor.resultTable.getResultTabTitleCount(0)).resolves.toBe('1');
299291
});
300292

301293
test('Results controls collapse and expand functionality', async ({page}) => {

0 commit comments

Comments
 (0)