updates by pr comments

Author: vlad-dargel

tests/e2e/pageObjects/settings-page.ts

@@ -35,24 +35,33 @@ export class SettingsPage {
     }
 
     /**
- * Change Commands In Pipeline value
- * @param value Value for pipeline
- */
+    * Change Commands In Pipeline value
+    * @param value Value for pipeline
+    */
     async changeCommandsInPipeline(value: string): Promise<void> {
         await t.hover(this.commandsInPipelineValue);
         await t.click(this.commandsInPipelineInput);
         await t.typeText(this.commandsInPipelineInput, value, { replace: true });
         await t.click(this.applyButton);
     }
 
+    /**
+     * Get state of Analytics switcher
+     */
     async getAnalyticsSwitcherValue(): Promise<string> {
         return await this.switchAnalyticsOption.getAttribute('aria-checked');
     }
 
+    /**
+     * Get state of Notifications switcher
+     */
     async getNotificationsSwitcherValue(): Promise<string> {
         return await this.switchNovitifationsOption.getAttribute('aria-checked');
     }
 
+    /**
+     * Get state of Eula switcher
+     */
     async getEulaSwitcherValue(): Promise<string> {
         return await this.switchEulaOption.getAttribute('aria-checked');
     }

tests/e2e/pageObjects/user-agreement-page.ts

@@ -16,16 +16,19 @@ export class UserAgreementPage {
     pluginSectionWithText = Selector('[data-testid=plugin-section]');
     recommendedSwitcher = Selector('[data-testid=switch-option-recommended]');
 
-  //Accept RedisInsight License Terms
-  async acceptLicenseTerms():Promise<void> {
-      if (await this.switchOptionEula.exists) {
-          await t.click(this.switchOptionEula);
-          await t.click(this.switchOptionEncryption);
-          await t.click(this.submitButton);
-      }
-  }
+    //Accept RedisInsight License Terms
+    async acceptLicenseTerms(): Promise<void> {
+        if (await this.switchOptionEula.exists) {
+            await t.click(this.switchOptionEula);
+            await t.click(this.switchOptionEncryption);
+            await t.click(this.submitButton);
+        }
+    }
 
-  async getRecommendedSwitcherValue(): Promise<string> {
-    return await this.recommendedSwitcher.getAttribute('aria-checked');
-}
+    /**
+     * Get state of Recommended switcher
+     */
+    async getRecommendedSwitcherValue(): Promise<string> {
+        return await this.recommendedSwitcher.getAttribute('aria-checked');
+    }
 }

tests/e2e/tests/critical-path/a-first-start-form/user-agreements-form.e2e.ts

@@ -15,25 +15,30 @@ fixture `Agreements Verification`
     .beforeEach(async t => {
         await t.maximizeWindow();
     });
-test('Verify that user should accept User Agreements to continue working with the application, the Welcome page is opened after user agrees, the encryption enabled by default and specific message', async t => {
+test('Verify that user should accept User Agreements to continue working with the application', async t => {
     await t.expect(userAgreementPage.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
+    await t.click(addRedisDatabasePage.addDatabaseButton);
+    //Verify that I still has agreements popup & cannot add a database
+    await t.expect(userAgreementPage.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
+    await t.expect(addRedisDatabasePage.addDatabaseManually.exists).notOk('User can\'t add a database');
+});
+test('Verify that the encryption enabled by default and specific message', async t => {
+    const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.';
     //Verify that section with plugin warning is displayed
     await t.expect(userAgreementPage.pluginSectionWithText.visible).ok('Plugin text is displayed');
     //Verify that text that is displayed in window is 'While adding new visualization plugins, use files only from trusted authors to avoid automatic execution of malicious code.'
     const pluginText = userAgreementPage.pluginSectionWithText.innerText;
-    await t.expect(pluginText).eql('To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.');
+    await t.expect(pluginText).eql(expectedPluginText, 'Plugin text is incorrect');
     // Verify that encryption enabled by default
     await t.expect(userAgreementPage.switchOptionEncryption.withAttribute('aria-checked', 'true').exists).ok('Encryption enabled by default');
-    await t.click(addRedisDatabasePage.addDatabaseButton);
-    //Verify that I still has agreements popup & cannot add a database
-    await t.expect(userAgreementPage.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
-    await t.expect(addRedisDatabasePage.addDatabaseManually.exists).notOk('User can\'t add a database');
+});
+test('Verify that the Welcome page is opened after user agrees', async t => {
     //Accept agreements
     await t.click(settingsPage.switchEulaOption);
     await t.click(settingsPage.submitConsentsPopupButton);
     //Verify that I dont have an popup
     await t.expect(userAgreementPage.userAgreementsPopup.exists).notOk('User Agreements Popup isn\'t shown after accept agreements');
-    //Verify that Welcome page is displayed
+    //Verify that Welcome page is displayed after user agrees
     await t.expect(addRedisDatabasePage.welcomePageTitle.exists).ok('Welcome page is displayed');
     //Verify I can work with the application
     await t.click(addRedisDatabasePage.addDatabaseButton);