diff --git a/tests/e2e/pageObjects/workbench-page.ts b/tests/e2e/pageObjects/workbench-page.ts index 8c14ab27a3..ff1da6c32b 100644 --- a/tests/e2e/pageObjects/workbench-page.ts +++ b/tests/e2e/pageObjects/workbench-page.ts @@ -32,9 +32,9 @@ export class WorkbenchPage { queryInputScriptArea: Selector overviewTotalKeys: Selector overviewTotalMemory: Selector - resizeButtonForPreselectsArea: Selector + collapsePreselectAreaButton: Selector + expandPreselectAreaButton: Selector preselectButtons: Selector - preselectsAreaContainer: Selector reRunCommandButton: Selector queryCardNoModuleOutput: Selector queryCardNoModuleButton: Selector @@ -45,6 +45,8 @@ export class WorkbenchPage { internalLinkWorkingWithHashes: Selector preselectExactSearch: Selector preselectGroupBy: Selector + preselectArea: Selector + expandArea: Selector constructor() { //CSS selectors @@ -63,7 +65,8 @@ export class WorkbenchPage { //BUTTONS this.submitCommandButton = Selector('[data-testid=btn-submit]'); this.resizeButtonForScriptingAndResults = Selector('[data-test-subj=resize-btn-scripting-area-and-results]'); - this.resizeButtonForPreselectsArea = Selector('[data-test-subj=resize-btn-preselects-area]'); + this.collapsePreselectAreaButton = Selector('[data-testid=collapse-enablement-area]'); + this.expandPreselectAreaButton = Selector('[data-testid=expand-enablement-area]'); this.paginationButtonPrevious = Selector(this.cssSelectorPaginationButtonPrevious); this.paginationButtonNext = Selector(this.cssSelectorPaginationButtonNext); this.selectViewType = Selector('[data-testid=select-view-type]'); @@ -88,13 +91,15 @@ export class WorkbenchPage { this.queryInputScriptArea = Selector('[data-testid=query-input-container] .view-line'); this.overviewTotalKeys = Selector('[data-test-subj=overview-total-keys]'); this.overviewTotalMemory = Selector('[data-test-subj=overview-total-memory]'); - this.preselectsAreaContainer = Selector('[data-test-subj=resize-container-preselects-area]'); this.queryCardNoModuleOutput = Selector('[data-testid=query-card-no-module-output]'); this.queryCardNoModuleButton = Selector('[data-testid=query-card-no-module-button] a'); this.monacoCommandDetails = Selector('div.suggest-details-container'); this.monacoCloseCommandDetails = Selector('span.codicon-close'); this.monacoSuggestion = Selector('span.monaco-icon-name-container'); this.iframe = Selector('.pluginIframe', { timeout: 90000 }); + // Panel + this.preselectArea = Selector('[data-testid=enablementArea]'); + this.expandArea = Selector('[]') } /** diff --git a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts index 9cb89bd37b..d0ebb0e71d 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -1,6 +1,5 @@ import { addNewStandaloneDatabase } from '../../../helpers/database'; -import { WorkbenchPage } from '../../../pageObjects/workbench-page'; -import { MyRedisDatabasePage, UserAgreementPage, AddRedisDatabasePage } from '../../../pageObjects'; +import { MyRedisDatabasePage, UserAgreementPage, AddRedisDatabasePage, WorkbenchPage } from '../../../pageObjects'; import { commonUrl, ossStandaloneConfig @@ -24,25 +23,17 @@ fixture `Default scripts area at Workbench` //Go to Workbench page await t.click(myRedisDatabasePage.workbenchButton); }) -test('Verify that user can resize(maximize)/(minimize) the enablement area (the one with default scripts)', async t => { - const offsetX = 100; - const areaWidthBefore = await workbenchPage.preselectsAreaContainer.clientWidth; - //Minimize the area with default scripts - await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.1 }); - await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).lt(areaWidthBefore, 'Default scripts area is smaller after resize'); - //Maximize the area with default scripts - const areaWidthAfter = await workbenchPage.preselectsAreaContainer.clientWidth; - await t.click(workbenchPage.preselectsAreaContainer); - await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.1 }); - await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gte(areaWidthAfter, 'Default scripts area is bigger after resize'); -}); test('Verify that user can expand/collapse the enablement area', async t => { + //Hover over Enablement area + await t.hover(workbenchPage.preselectArea); //Collapse the area with default scripts - await t.doubleClick(workbenchPage.resizeButtonForPreselectsArea); - await t.expect(await workbenchPage.preselectButtons.visible).eql(false, 'Default scripts area after resize is minimized'); - //Expand the area with default scripts - await t.click(workbenchPage.preselectsAreaContainer); - await t.expect(await workbenchPage.preselectButtons.visible).eql(true, 'Default scripts area after resize is maximized'); + await t.click(workbenchPage.collapsePreselectAreaButton); + //Validate that Enablement area is not displayed + await t.expect(workbenchPage.preselectArea.visible).notOk('Enablement area is collapsed'); + //Expand Enablement area + await t.click(workbenchPage.expandPreselectAreaButton); + //Validate that Enablement area is displayed + await t.expect(workbenchPage.preselectArea.visible).ok('Enablement area is expanded'); }); test('Verify that user can see the [Manual] option in the Enablement area', async t => { const optionsForCheck = [