From 8e02d13e5117c5879f8b7b0ee4d432d7fda5b5a7 Mon Sep 17 00:00:00 2001 From: Tanya Troyanova Date: Fri, 19 Nov 2021 16:01:19 +0300 Subject: [PATCH 1/5] fix e2e tests --- tests/e2e/pageObjects/my-redis-databases-page.ts | 1 + .../e2e/tests/regression/workbench/default-scripts-area.e2e.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/e2e/pageObjects/my-redis-databases-page.ts b/tests/e2e/pageObjects/my-redis-databases-page.ts index af146e48c9..0f24168be9 100644 --- a/tests/e2e/pageObjects/my-redis-databases-page.ts +++ b/tests/e2e/pageObjects/my-redis-databases-page.ts @@ -52,6 +52,7 @@ export class MyRedisDatabasePage { await t.click(this.toastCloseButton); } const db = this.dbNameList.withExactText(dbName.trim()); + await t.expect(db.exists).ok('The database exists', {timeout: 60000}); await t.click(db); } 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 84ea280b03..f48a2823dd 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -32,7 +32,7 @@ test('Verify that user can resize(maximize)/(minimize) the enablement area (the 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.click(workbenchPage.queryInput); await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 }); await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize'); }); From 4572ff83472db3268c9573d4a8ca694ad7be1ab7 Mon Sep 17 00:00:00 2001 From: Tanya Troyanova Date: Fri, 19 Nov 2021 18:20:22 +0300 Subject: [PATCH 2/5] fix test with resize enablement area --- .../tests/regression/workbench/default-scripts-area.e2e.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f48a2823dd..62cb2554e8 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -24,7 +24,7 @@ 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 => { +test.only('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 @@ -32,7 +32,7 @@ test('Verify that user can resize(maximize)/(minimize) the enablement area (the 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.queryInput); + await t.click(workbenchPage.resizeButtonForScriptingAndResults); await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 }); await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize'); }); From c4475143e26e5b977d2a9bc9156b31e6909e4379 Mon Sep 17 00:00:00 2001 From: Tanya Troyanova Date: Fri, 19 Nov 2021 18:51:23 +0300 Subject: [PATCH 3/5] fix test --- .../e2e/tests/regression/workbench/default-scripts-area.e2e.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 62cb2554e8..6bc6bb789b 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -32,7 +32,7 @@ test.only('Verify that user can resize(maximize)/(minimize) the enablement area 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.resizeButtonForScriptingAndResults); + await t.doubleClick(workbenchPage.preselectsAreaContainer); await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 }); await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize'); }); From 378dbe7b05d0821f818efafb77c9355a0a9ceac6 Mon Sep 17 00:00:00 2001 From: Tanya Troyanova Date: Fri, 19 Nov 2021 19:21:28 +0300 Subject: [PATCH 4/5] edit the speed of drag --- .../tests/regression/workbench/default-scripts-area.e2e.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6bc6bb789b..e251162a2e 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -28,12 +28,12 @@ test.only('Verify that user can resize(maximize)/(minimize) the enablement area const offsetX = 100; const areaWidthBefore = await workbenchPage.preselectsAreaContainer.clientWidth; //Minimize the area with default scripts - await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.2 }); + 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.doubleClick(workbenchPage.preselectsAreaContainer); - await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 }); + await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.1 }); await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize'); }); test('Verify that user can expand/collapse the enablement area', async t => { From d0dfda3bcf87218974ad292b7714ee0fc8acb2cb Mon Sep 17 00:00:00 2001 From: Tanya Troyanova Date: Fri, 19 Nov 2021 19:47:33 +0300 Subject: [PATCH 5/5] fix the test --- .../tests/regression/workbench/default-scripts-area.e2e.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e251162a2e..9cb89bd37b 100644 --- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts +++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts @@ -24,7 +24,7 @@ fixture `Default scripts area at Workbench` //Go to Workbench page await t.click(myRedisDatabasePage.workbenchButton); }) -test.only('Verify that user can resize(maximize)/(minimize) the enablement area (the one with default scripts)', async t => { +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 @@ -32,9 +32,9 @@ test.only('Verify that user can resize(maximize)/(minimize) the enablement area 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.doubleClick(workbenchPage.preselectsAreaContainer); + await t.click(workbenchPage.preselectsAreaContainer); await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.1 }); - await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize'); + 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 => { //Collapse the area with default scripts