From 2426d8dd216cb6407fb29b4fa932472792e61336 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Mon, 29 Jul 2024 10:43:20 +0200 Subject: [PATCH 1/3] Verify add show ttl --- .../KeyDetailsSubheader.tsx | 2 +- tests/e2e/pageObjects/browser-page.ts | 2 ++ .../smoke/browser/verify-key-details.e2e.ts | 21 ++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/redisinsight/ui/src/pages/browser/modules/key-details/components/key-details-subheader/KeyDetailsSubheader.tsx b/redisinsight/ui/src/pages/browser/modules/key-details/components/key-details-subheader/KeyDetailsSubheader.tsx index 46abfff49e..f1cf2b8566 100644 --- a/redisinsight/ui/src/pages/browser/modules/key-details/components/key-details-subheader/KeyDetailsSubheader.tsx +++ b/redisinsight/ui/src/pages/browser/modules/key-details/components/key-details-subheader/KeyDetailsSubheader.tsx @@ -60,7 +60,7 @@ export const KeyDetailsSubheader = ({ fill color="secondary" onClick={onAddKey} - data-testid="btn-add-key" + data-testid="add-key-value-items-btn" > + diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts index 2dab013eb3..3b9d061cca 100644 --- a/tests/e2e/pageObjects/browser-page.ts +++ b/tests/e2e/pageObjects/browser-page.ts @@ -271,6 +271,8 @@ export class BrowserPage extends InstancePage { //Get Hash key field ttl value //for Redis databases 7.4 and higher getHashTtlFieldInput = (fieldName: string): Selector => (Selector(`[data-testid=hash-ttl_content-value-${fieldName}]`)); + //checkbox + showTtlCheckbox = Selector('[data-testid=test-check-ttl]~label'); /** * Common part for Add any new key diff --git a/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts b/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts index d1fde3dceb..3a880a408f 100644 --- a/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts +++ b/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts @@ -1,7 +1,7 @@ import { rte } from '../../../../helpers/constants'; import { DatabaseHelper } from '../../../../helpers/database'; import { BrowserPage } from '../../../../pageObjects'; -import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf'; +import { commonUrl, ossStandaloneConfig, ossStandaloneV7Config } from '../../../../helpers/conf'; import { Common } from '../../../../helpers/common'; import { DatabaseAPIRequests } from '../../../../helpers/api/api-database'; import { APIKeyRequests } from '../../../../helpers/api/api-keys'; @@ -119,17 +119,16 @@ test('Verify that user can see JSON Key details', async t => { await t.expect(keyTTLValue).match(expectedTTL, 'The JSON Key TTL is incorrect'); await t.expect(keyBadge).contains('JSON', 'The JSON Key Badge is incorrect'); }); -//the test is skipped until redis databases 7.4 is not added to docker -test + +test.only .before(async() => { - // await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(); + await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV7Config); }) .after(async() => { // Clear and delete database - // await apiKeyRequests.deleteKeyByNameApi(keyName, ); - // await databaseAPIRequests.deleteStandaloneDatabaseApi(); - }) - .skip('Verify that user can set ttl for Hash fields', async t => { + await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneV7Config.databaseName); + await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV7Config); + })('Verify that user can set ttl for Hash fields', async t => { keyName = Common.generateWord(10); const keyName2 = Common.generateWord(10); const field1 = 'Field1WithTtl'; @@ -150,6 +149,11 @@ test ttlFieldValue = await browserPage.getHashTtlFieldInput(field2).textContent; await t.expect(ttlFieldValue).match(expectedTTL, 'the field ttl is not set'); + //verify that ttl column can be hidden + await t.click(browserPage.showTtlCheckbox); + await t.expect(await browserPage.getHashTtlFieldInput(field2).exists).notOk('the ttl column is not hidden'); + await t.click(browserPage.showTtlCheckbox); + //verify that field is removed after ttl field is expired await browserPage.editHashFieldTtlValue(field1, '1'); await t.wait(1000); @@ -160,6 +164,7 @@ test //verify that the key is removed if key has 1 field and ttl field is expired await browserPage.addHashKey(keyName2, ' ', field1); await browserPage.editHashFieldTtlValue(field1, '1'); + await t.wait(1000); await t.click(browserPage.refreshKeysButton); await t.expect(browserPage.getKeySelectorByName(keyName2).exists).notOk('key is not removed when the field ttl is expired'); From 1a94b1c51472c5685fb43c96e0dbe604c652c817 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Mon, 29 Jul 2024 11:58:37 +0200 Subject: [PATCH 2/3] remove only --- tests/e2e/helpers/conf.ts | 8 ++++---- .../e2e/tests/web/smoke/browser/verify-key-details.e2e.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/e2e/helpers/conf.ts b/tests/e2e/helpers/conf.ts index 3a3e813a9f..1d6bcd56bc 100644 --- a/tests/e2e/helpers/conf.ts +++ b/tests/e2e/helpers/conf.ts @@ -40,8 +40,8 @@ export const ossStandaloneV5Config = { }; export const ossStandaloneV7Config = { - host: process.env.OSS_STANDALONE_V7_HOST || 'oss-standalone-v7', - port: process.env.OSS_STANDALONE_V7_PORT || '6379', + host: process.env.OSS_STANDALONE_V7_HOST || 'localhost', + port: process.env.OSS_STANDALONE_V7_PORT || '6378', databaseName: `${process.env.OSS_STANDALONE_V7_DATABASE_NAME || 'test_standalone-v7'}-${uniqueId}`, databaseUsername: process.env.OSS_STANDALONE_V7_USERNAME, databasePassword: process.env.OSS_STANDALONE_V7_PASSWORD @@ -115,7 +115,7 @@ export const cloudDatabaseConfig = { }; export const ossStandaloneNoPermissionsConfig = { - host: process.env.OSS_STANDALONE_NOPERM_HOST || 'oss-standalone', + host: process.env.OSS_STANDALONE_NOPERM_HOST || 'localhost', port: process.env.OSS_STANDALONE_NOPERM_PORT || '6379', databaseName: `${process.env.OSS_STANDALONE_NOPERM_DATABASE_NAME || 'oss-standalone-no-permissions'}-${uniqueId}`, databaseUsername: process.env.OSS_STANDALONE_NOPERM_USERNAME || 'noperm', @@ -140,7 +140,7 @@ export const ossClusterForSSHConfig = { export const ossStandaloneTlsConfig = { host: process.env.OSS_STANDALONE_TLS_HOST || 'oss-standalone-tls', - port: process.env.OSS_STANDALONE_TLS_PORT || '6379', + port: process.env.OSS_STANDALONE_TLS_PORT || '6301', databaseName: `${process.env.OSS_STANDALONE_TLS_DATABASE_NAME || 'test_standalone_tls'}-${uniqueId}`, databaseUsername: process.env.OSS_STANDALONE_TLS_USERNAME, databasePassword: process.env.OSS_STANDALONE_TLS_PASSWORD, diff --git a/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts b/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts index 3a880a408f..ee75bb969b 100644 --- a/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts +++ b/tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts @@ -120,7 +120,7 @@ test('Verify that user can see JSON Key details', async t => { await t.expect(keyBadge).contains('JSON', 'The JSON Key Badge is incorrect'); }); -test.only +test .before(async() => { await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV7Config); }) From 667590af84bb3437af20fea066d6659a89493e94 Mon Sep 17 00:00:00 2001 From: mariasergeenko Date: Mon, 29 Jul 2024 12:00:17 +0200 Subject: [PATCH 3/3] remove config --- tests/e2e/helpers/conf.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/e2e/helpers/conf.ts b/tests/e2e/helpers/conf.ts index 1d6bcd56bc..3a3e813a9f 100644 --- a/tests/e2e/helpers/conf.ts +++ b/tests/e2e/helpers/conf.ts @@ -40,8 +40,8 @@ export const ossStandaloneV5Config = { }; export const ossStandaloneV7Config = { - host: process.env.OSS_STANDALONE_V7_HOST || 'localhost', - port: process.env.OSS_STANDALONE_V7_PORT || '6378', + host: process.env.OSS_STANDALONE_V7_HOST || 'oss-standalone-v7', + port: process.env.OSS_STANDALONE_V7_PORT || '6379', databaseName: `${process.env.OSS_STANDALONE_V7_DATABASE_NAME || 'test_standalone-v7'}-${uniqueId}`, databaseUsername: process.env.OSS_STANDALONE_V7_USERNAME, databasePassword: process.env.OSS_STANDALONE_V7_PASSWORD @@ -115,7 +115,7 @@ export const cloudDatabaseConfig = { }; export const ossStandaloneNoPermissionsConfig = { - host: process.env.OSS_STANDALONE_NOPERM_HOST || 'localhost', + host: process.env.OSS_STANDALONE_NOPERM_HOST || 'oss-standalone', port: process.env.OSS_STANDALONE_NOPERM_PORT || '6379', databaseName: `${process.env.OSS_STANDALONE_NOPERM_DATABASE_NAME || 'oss-standalone-no-permissions'}-${uniqueId}`, databaseUsername: process.env.OSS_STANDALONE_NOPERM_USERNAME || 'noperm', @@ -140,7 +140,7 @@ export const ossClusterForSSHConfig = { export const ossStandaloneTlsConfig = { host: process.env.OSS_STANDALONE_TLS_HOST || 'oss-standalone-tls', - port: process.env.OSS_STANDALONE_TLS_PORT || '6301', + port: process.env.OSS_STANDALONE_TLS_PORT || '6379', databaseName: `${process.env.OSS_STANDALONE_TLS_DATABASE_NAME || 'test_standalone_tls'}-${uniqueId}`, databaseUsername: process.env.OSS_STANDALONE_TLS_USERNAME, databasePassword: process.env.OSS_STANDALONE_TLS_PASSWORD,