From 6a33e26bbf5e25df07c7be1843b6af77df483a26 Mon Sep 17 00:00:00 2001 From: Elena Naboko Date: Wed, 2 Feb 2022 13:45:35 +0300 Subject: [PATCH] [E2E] Fix TTL for different data types --- .../smoke/browser/verify-key-details.e2e.ts | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts b/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts index 92769495b6..e8a98162d8 100644 --- a/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts +++ b/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts @@ -14,6 +14,8 @@ const myRedisDatabasePage = new MyRedisDatabasePage(); const browserPage = new BrowserPage(); const userAgreementPage = new UserAgreementPage(); const addRedisDatabasePage = new AddRedisDatabasePage(); +const keyTTL = '2147476121'; +const expectedTTL = /214747612*/; fixture `Key details verification` .meta({ type: 'smoke' }) @@ -29,8 +31,6 @@ fixture `Key details verification` }) test('Verify that user can see Hash Key details', async t => { const keyName = 'Hash1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addHashKey(keyName, keyTTL); @@ -42,13 +42,11 @@ test('Verify that user can see Hash Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('Hash', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('Hash', 'The Key Badge'); }); test('Verify that user can see List Key details', async t => { const keyName = 'List1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addListKey(keyName, keyTTL); @@ -60,13 +58,11 @@ test('Verify that user can see List Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('List', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('List', 'The Key Badge'); }); test('Verify that user can see Set Key details', async t => { const keyName = 'Set1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addSetKey(keyName, keyTTL); @@ -78,12 +74,11 @@ test('Verify that user can see Set Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('Set', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('Set', 'The Key Badge'); }); test('Verify that user can see String Key details', async t => { const keyName = 'String1testKeyForEdit'; - const keyTTL = '2147476121'; const value = 'keyValue12334353434;' await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); @@ -97,13 +92,11 @@ test('Verify that user can see String Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('String', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('String', 'The Key Badge'); }); test('Verify that user can see ZSet Key details', async t => { const keyName = 'ZSet1testKeyForEdit'; - const keyTTL = '2147476121'; - await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); await browserPage.addZSetKey(keyName, '1', keyTTL); @@ -115,12 +108,11 @@ test('Verify that user can see ZSet Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('Sorted Set', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('Sorted Set', 'The Key Badge'); }); test('Verify that user can see JSON Key details', async t => { const keyName = 'JSON1testKeyForEdit'; - const keyTTL = '2147476121'; const jsonValue = '{"employee":{ "name":"John", "age":30, "city":"New York" }}'; await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName); @@ -134,6 +126,6 @@ test('Verify that user can see JSON Key details', async t => { await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name'); await t.expect(keyDetails).contains('JSON', 'The Key Type'); await t.expect(keyDetails).contains('TTL', 'The TTL'); - await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL'); + await t.expect(keyTTLValue).match(expectedTTL, 'The Key TTL'); await t.expect(keyBadge).contains('JSON', 'The Key Badge'); });