From 349b2ab274da561cd27dc4cd7b3b73412dbcb3b5 Mon Sep 17 00:00:00 2001 From: "tatsiana.trayanava" Date: Mon, 23 May 2022 23:39:02 +0300 Subject: [PATCH 1/2] e2e - test fixes --- tests/e2e/pageObjects/browser-page.ts | 8 +++++--- ...ey.e2e.ts.ts => stream-key-entry-deletion.e2e.ts} | 2 +- .../tests/critical-path/monitor/save-commands.e2e.ts | 2 +- tests/e2e/tests/regression/browser/add-keys.e2e.ts | 3 ++- .../e2e/tests/regression/browser/last-refresh.e2e.ts | 12 ++++++------ 5 files changed, 15 insertions(+), 12 deletions(-) rename tests/e2e/tests/critical-path/browser/{stream-key.e2e.ts.ts => stream-key-entry-deletion.e2e.ts} (98%) diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts index 9352532c1d..773b7e965c 100644 --- a/tests/e2e/pageObjects/browser-page.ts +++ b/tests/e2e/pageObjects/browser-page.ts @@ -70,6 +70,7 @@ export class BrowserPage { addNewStreamEntry = Selector('[data-testid=add-key-value-items-btn]'); removeEntryButton = Selector('[data-testid^=remove-entry-button-]'); confirmRemoveEntryButton = Selector('[data-testid^=remove-entry-button-]').withExactText('Remove'); + clearStreamEntryInputs = Selector('[data-testid=remove-item]'); //LINKS internalLinkToWorkbench = Selector('[data-testid=internal-workbench-link]'); //OPTION ELEMENTS @@ -110,7 +111,7 @@ export class BrowserPage { streamEntryId = Selector('[data-testid=entryId]'); streamField = Selector('[data-testid=field-name]'); streamValue = Selector('[data-testid=field-value]'); - addStreamRow = Selector('[data-testid=add-new-row]'); + addStreamRow = Selector('[data-testid=add-new-item]'); streamFieldsValues = Selector('[data-testid^=stream-entry-field-]'); //TEXT ELEMENTS keySizeDetails = Selector('[data-testid=key-size-text]'); @@ -219,18 +220,19 @@ export class BrowserPage { * @param value The key value * @param TTL The Time to live value of the key (optional parameter) */ - async addJsonKey(keyName: string, value = ' ', TTL?: string): Promise { + async addJsonKey(keyName: string, value: string, TTL?: string): Promise { await t.click(this.plusAddKeyButton); await t.click(this.keyTypeDropDown); await t.click(this.jsonOption); await t.click(this.addKeyNameInput); await t.typeText(this.addKeyNameInput, keyName); await t.click(this.jsonKeyValueInput); - await t.typeText(this.jsonKeyValueInput, value); + await t.typeText(this.jsonKeyValueInput, value, { paste: true }); if (TTL !== undefined) { await t.click(this.keyTTLInput); await t.typeText(this.keyTTLInput, TTL); } + await t.debug(); await t.click(this.addKeyButton); } diff --git a/tests/e2e/tests/critical-path/browser/stream-key.e2e.ts.ts b/tests/e2e/tests/critical-path/browser/stream-key-entry-deletion.e2e.ts similarity index 98% rename from tests/e2e/tests/critical-path/browser/stream-key.e2e.ts.ts rename to tests/e2e/tests/critical-path/browser/stream-key-entry-deletion.e2e.ts index caea280950..ce031fbbe1 100644 --- a/tests/e2e/tests/critical-path/browser/stream-key.e2e.ts.ts +++ b/tests/e2e/tests/critical-path/browser/stream-key-entry-deletion.e2e.ts @@ -20,7 +20,7 @@ const values = [ '27' ]; -fixture `Stream key` +fixture `Stream key entry deletion` .meta({ type: 'critical_path', rte: rte.standalone diff --git a/tests/e2e/tests/critical-path/monitor/save-commands.e2e.ts b/tests/e2e/tests/critical-path/monitor/save-commands.e2e.ts index 6960337c67..07227badfb 100644 --- a/tests/e2e/tests/critical-path/monitor/save-commands.e2e.ts +++ b/tests/e2e/tests/critical-path/monitor/save-commands.e2e.ts @@ -11,7 +11,7 @@ import { rte } from '../../../helpers/constants'; const monitorPage = new MonitorPage(); const cliPage = new CliPage(); const tempDir = os.tmpdir(); -const downloadsDir = `${process.env.HOME}\\Downloads`; +const downloadsDir = `C:*****\\Downloads`; fixture `Save commands` .meta({ type: 'regression' }) diff --git a/tests/e2e/tests/regression/browser/add-keys.e2e.ts b/tests/e2e/tests/regression/browser/add-keys.e2e.ts index 6bf6d4e008..40c4f6040c 100644 --- a/tests/e2e/tests/regression/browser/add-keys.e2e.ts +++ b/tests/e2e/tests/regression/browser/add-keys.e2e.ts @@ -24,7 +24,8 @@ fixture `Different JSON types creation` await cliPage.sendCommandInCli(commandString); await deleteDatabase(ossStandaloneConfig.databaseName); }); -test('Verify that user can create different types(string, number, null, array, boolean) of JSON', async t => { +// skipped due the issue https://redislabs.atlassian.net/browse/RI-2966 +test.skip('Verify that user can create different types(string, number, null, array, boolean) of JSON', async t => { for (let i = 0; i < jsonKeys.length; i++) { await browserPage.addJsonKey(jsonKeys[i][0], jsonKeys[i][1]); await t.click(browserPage.toastCloseButton); diff --git a/tests/e2e/tests/regression/browser/last-refresh.e2e.ts b/tests/e2e/tests/regression/browser/last-refresh.e2e.ts index bde0da5e5b..ff8d61f08d 100644 --- a/tests/e2e/tests/regression/browser/last-refresh.e2e.ts +++ b/tests/e2e/tests/regression/browser/last-refresh.e2e.ts @@ -30,7 +30,7 @@ test //Hover on the refresh icon await t.hover(browserPage.refreshKeysButton); //Verify the last update info - await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nless than a minute ago', 'tooltip text'); + await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nnow', 'tooltip text'); }); test .meta({ rte: rte.standalone }) @@ -43,11 +43,11 @@ test await t.wait(120000); //Hover on the refresh icon await t.hover(browserPage.refreshKeyButton); - await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\n2 minutes ago', 'tooltip text'); + await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\n2 min', 'tooltip text'); //Click on Refresh and check last refresh await t.click(browserPage.refreshKeyButton); await t.hover(browserPage.refreshKeyButton); - await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nless than a minute ago', 'tooltip text'); + await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nnow', 'tooltip text'); }); test .meta({ rte: rte.standalone }) @@ -59,7 +59,7 @@ test //Hover on the refresh icon await t.hover(browserPage.refreshKeyButton); //Verify the last update info - await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nless than a minute ago', 'tooltip text'); + await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nnow', 'tooltip text'); }); test .meta({ rte: rte.standalone }) @@ -71,9 +71,9 @@ test //Hover on the keys refresh icon await t.hover(browserPage.refreshKeysButton); //Verify the last update info - await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nless than a minute ago', 'tooltip text'); + await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nnow', 'tooltip text'); //Hover on the key in details refresh icon await t.hover(browserPage.refreshKeyButton); //Verify the last update info - await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nless than a minute ago', 'tooltip text'); + await t.expect(browserPage.tooltip.innerText).contains('Last Refresh\nnow', 'tooltip text'); }); From 3bf23178e04520c2a18bbca82c433f6d986e9366 Mon Sep 17 00:00:00 2001 From: "tatsiana.trayanava" Date: Tue, 24 May 2022 12:22:39 +0300 Subject: [PATCH 2/2] e2e - remove debug and unskip test --- tests/e2e/pageObjects/browser-page.ts | 1 - tests/e2e/tests/regression/browser/add-keys.e2e.ts | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts index 773b7e965c..8eab09a736 100644 --- a/tests/e2e/pageObjects/browser-page.ts +++ b/tests/e2e/pageObjects/browser-page.ts @@ -232,7 +232,6 @@ export class BrowserPage { await t.click(this.keyTTLInput); await t.typeText(this.keyTTLInput, TTL); } - await t.debug(); await t.click(this.addKeyButton); } diff --git a/tests/e2e/tests/regression/browser/add-keys.e2e.ts b/tests/e2e/tests/regression/browser/add-keys.e2e.ts index 40c4f6040c..6bf6d4e008 100644 --- a/tests/e2e/tests/regression/browser/add-keys.e2e.ts +++ b/tests/e2e/tests/regression/browser/add-keys.e2e.ts @@ -24,8 +24,7 @@ fixture `Different JSON types creation` await cliPage.sendCommandInCli(commandString); await deleteDatabase(ossStandaloneConfig.databaseName); }); -// skipped due the issue https://redislabs.atlassian.net/browse/RI-2966 -test.skip('Verify that user can create different types(string, number, null, array, boolean) of JSON', async t => { +test('Verify that user can create different types(string, number, null, array, boolean) of JSON', async t => { for (let i = 0; i < jsonKeys.length; i++) { await browserPage.addJsonKey(jsonKeys[i][0], jsonKeys[i][1]); await t.click(browserPage.toastCloseButton);