Merge pull request #3479 from RedisInsight/e2e/feature/RI-5767_update-key-details

add hast field ttl test

Author: mariasergeenko

tests/e2e/pageObjects/browser-page.ts

@@ -94,6 +94,7 @@ export class BrowserPage extends InstancePage {
     saveButton = Selector('[data-testid=save-btn]');
     bulkActionsButton = Selector('[data-testid=btn-bulk-actions]');
     editHashButton = Selector('[data-testid^=hash_edit-btn-]');
+    editHashFieldTtlButton = Selector('[data-testid^=hash-ttl_edit-btn-]', { timeout: 500 });
     editZsetButton = Selector('[data-testid^=zset_edit-btn-]');
     editListButton = Selector('[data-testid^=list_edit-btn-]');
     cancelStreamGroupBtn = Selector('[data-testid=cancel-stream-groups-btn]');
@@ -161,6 +162,7 @@ export class BrowserPage extends InstancePage {
     hashFieldValueInput = Selector('[data-testid=field-value]');
     hashFieldNameInput = Selector('[data-testid=field-name]');
     hashFieldValueEditor = Selector('[data-testid^=hash_value-editor]');
+    hashTtlFieldInput = Selector('[data-testid=hash-ttl]');
     listKeyElementInput = Selector('[data-testid=element]');
     listKeyElementEditorInput = Selector('[data-testid^=list_value-editor-]');
     stringKeyValueInput = Selector('[data-testid=string-value]');
@@ -265,6 +267,10 @@ export class BrowserPage extends InstancePage {
     noReadySearchDialogTitle = Selector('[data-testid=welcome-page-title]');
     closeDialogButton = Selector('[class*=euiModal__closeIcon]');
 
+    //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}]`));
+
     /**
      * Common part for Add any new key
      * @param keyName The name of the key
@@ -399,8 +405,8 @@ export class BrowserPage extends InstancePage {
      * @param TTL The Time to live value of the key
      * @param field The field name of the key
      * @param value The value of the key
-     */
-    async addHashKey(keyName: string, TTL = ' ', field = ' ', value = ' '): Promise<void> {
+     * @param fieldTtl The ttl of the field for Redis databases 7.4 and higher*/
+    async addHashKey(keyName: string, TTL = ' ', field = ' ', value = ' ', fieldTtl = ''): Promise<void> {
         if (await this.Toast.toastCloseButton.exists) {
             await t.click(this.Toast.toastCloseButton);
         }
@@ -415,6 +421,9 @@ export class BrowserPage extends InstancePage {
         await t.typeText(this.keyTTLInput, TTL, { replace: true, paste: true });
         await t.typeText(this.hashFieldNameInput, field, { replace: true, paste: true });
         await t.typeText(this.hashFieldValueInput, value, { replace: true, paste: true });
+        if(fieldTtl !== ''){
+            await t.typeText(this.hashTtlFieldInput, fieldTtl, { replace: true, paste: true });
+        }
         await t.click(this.addKeyButton);
     }
 
@@ -634,14 +643,18 @@ export class BrowserPage extends InstancePage {
      * Add field to hash key
      * @param keyFieldValue The value of the hash field
      * @param keyValue The hash value
+     * @param fieldTtl The hash field ttl value for Redis databases 7.4 and higher
      */
-    async addFieldToHash(keyFieldValue: string, keyValue: string): Promise<void> {
+    async addFieldToHash(keyFieldValue: string, keyValue: string, fieldTtl = ''): Promise<void> {
         if (await this.Toast.toastCloseButton.exists) {
             await t.click(this.Toast.toastCloseButton);
         }
         await t.click(this.addKeyValueItemsButton);
         await t.typeText(this.hashFieldInput, keyFieldValue, { replace: true, paste: true });
         await t.typeText(this.hashValueInput, keyValue, { replace: true, paste: true });
+        if(fieldTtl !== ' '){
+            await t.typeText(this.hashTtlFieldInput, fieldTtl, { replace: true, paste: true });
+        }
         await t.click(this.saveHashFieldButton);
     }
 
@@ -657,6 +670,19 @@ export class BrowserPage extends InstancePage {
             .click(this.applyButton);
     }
 
+    /**
+     * Edit Hash field ttl value
+     * @param fieldName The field name
+     * @param fieldTtl The hash field ttl value for Redis databases 7.4 and higher
+     */
+    async editHashFieldTtlValue(fieldName: string, fieldTtl: string): Promise<void> {
+        await t
+            .hover(this.getHashTtlFieldInput(fieldName))
+            .click(this.editHashFieldTtlButton)
+            .typeText(this.inlineItemEditor, fieldTtl, { replace: true, paste: true })
+            .click(this.applyButton);
+    }
+
     //Get Hash key value from details
     async getHashKeyValue(): Promise<string> {
         return this.hashFieldValue.textContent;

tests/e2e/tests/web/smoke/browser/verify-key-details.e2e.ts

@@ -119,3 +119,48 @@ 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
+    .before(async() => {
+        // await databaseHelper.acceptLicenseTermsAndAddDatabaseApi();
+    })
+    .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 => {
+        keyName = Common.generateWord(10);
+        const keyName2 = Common.generateWord(10);
+        const field1 = 'Field1WithTtl';
+        const field2 = 'Field2WithTtl';
+        await browserPage.addHashKey(keyName, ' ',  field1,  'value',  keyTTL);
+
+        //verify that user can create key with ttl for the has field
+        let ttlFieldValue = await browserPage.getHashTtlFieldInput(field1).textContent;
+        await t.expect(ttlFieldValue).match(expectedTTL, 'the field ttl is not set');
+
+        // verify that ttl can have empty value
+        await browserPage.editHashFieldTtlValue(field1, ' ');
+        ttlFieldValue = await browserPage.getHashTtlFieldInput(field1).textContent;
+        await t.expect(ttlFieldValue).eql('No Limit', 'the field ttl can not be removed');
+
+        //verify that ttl field value can be set
+        await browserPage.addFieldToHash(field2, 'value', keyTTL);
+        ttlFieldValue = await browserPage.getHashTtlFieldInput(field2).textContent;
+        await t.expect(ttlFieldValue).match(expectedTTL, 'the field ttl is not set');
+
+        //verify that field is removed after ttl field is expired
+        await browserPage.editHashFieldTtlValue(field1, '1');
+        await t.wait(1000);
+        await t.click(browserPage.refreshKeyButton);
+        const result = browserPage.hashFieldsList.count;
+        await t.expect(result).eql(1, 'the field was not removed');
+
+        //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.click(browserPage.refreshKeysButton);
+
+        await t.expect(browserPage.getKeySelectorByName(keyName2).exists).notOk('key is not removed when the field ttl is expired');
+    });