Merge pull request #926 from RedisInsight/e2e/fix-for-tests

updates for e2e tests

Author: vlad-dargel

tests/e2e/helpers/api/api-database.ts

@@ -3,7 +3,6 @@ import * as request from 'supertest';
 import { asyncFilter, doAsyncStuff } from '../async-helper';
 import { AddNewDatabaseParameters, OSSClusterParameters, databaseParameters } from '../../pageObjects/add-redis-database-page';
 import { apiUrl } from '../../helpers/conf';
-import { parseAsync } from '@babel/core';
 
 const endpoint = apiUrl;
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]

tests/e2e/tests/critical-path/pub-sub/subscribe-unsubscribe.e2e.ts

@@ -1,8 +1,9 @@
-import { acceptLicenseTermsAndAddDatabase, deleteDatabase, addNewStandaloneDatabase } from '../../../helpers/database';
+import { acceptLicenseTermsAndAddDatabaseApi, acceptLicenseTerms } from '../../../helpers/database';
 import { MyRedisDatabasePage, PubSubPage, CliPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig, ossStandaloneV5Config } from '../../../helpers/conf';
 import { env, rte } from '../../../helpers/constants';
 import { verifyMessageDisplayingInPubSub } from '../../../helpers/pub-sub';
+import { addNewStandaloneDatabaseApi, deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const pubSubPage = new PubSubPage();
@@ -12,12 +13,12 @@ fixture `Subscribe/Unsubscribe from a channel`
     .meta({ env: env.web, rte: rte.standalone, type: 'critical_path' })
     .page(commonUrl)
     .beforeEach(async t => {
-        await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName);
+        await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig, ossStandaloneConfig.databaseName);
         //Go to PubSub page
         await t.click(myRedisDatabasePage.pubSubButton);
     })
     .afterEach(async() => {
-        await deleteDatabase(ossStandaloneConfig.databaseName);
+        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user is unsubscribed from the pubsub channel when he go to the pubsub window after launching application for the first time', async t => {
     //Verify that the Channel field placeholder is 'Enter Channel Name'
@@ -61,16 +62,17 @@ test('Verify that the focus gets always shifted to a newest message (auto-scroll
 });
 test
     .before(async t => {
-        await acceptLicenseTermsAndAddDatabase(ossStandaloneV5Config, ossStandaloneV5Config.databaseName);
-        await t.click(myRedisDatabasePage.myRedisDBButton);
-        await addNewStandaloneDatabase(ossStandaloneConfig);
+        await acceptLicenseTerms();
+        await addNewStandaloneDatabaseApi(ossStandaloneV5Config);
+        await addNewStandaloneDatabaseApi(ossStandaloneConfig);
+        await t.eval(() => location.reload());
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
         //Go to PubSub page
         await t.click(myRedisDatabasePage.pubSubButton);
     })
     .after(async() => {
-        await deleteDatabase(ossStandaloneV5Config.databaseName);
-        await deleteDatabase(ossStandaloneConfig.databaseName);
+        await deleteStandaloneDatabaseApi(ossStandaloneV5Config);
+        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Verify that user subscription state is changed to unsubscribed, all the messages are cleared and total message counter is reset when user connect to another database', async t => {
         await t.click(pubSubPage.subscribeButton);
         //Publish 10 messages

tests/e2e/tests/regression/browser/database-overview-keys.e2e.ts

@@ -1,5 +1,5 @@
 import { Chance } from 'chance';
-import { ClientFunction, t } from 'testcafe';
+import { t } from 'testcafe';
 import { acceptLicenseTerms, acceptLicenseTermsAndAddDatabase, deleteDatabase } from '../../../helpers/database';
 import {
     MyRedisDatabasePage,
@@ -11,6 +11,7 @@ import {
 import { rte } from '../../../helpers/constants';
 import { cloudDatabaseConfig, commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { Common } from '../../../helpers/common';
+import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const workbenchPage = new WorkbenchPage();
@@ -51,7 +52,7 @@ fixture `Database overview`
         await deleteDatabase(`${ossStandaloneConfig.databaseName} [${index}]`);
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
         await browserPage.deleteKeyByName(keyName);
-        await deleteDatabase(ossStandaloneConfig.databaseName);
+        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test('Verify that user can see total and current logical database number of keys (if there are any keys in other logical DBs)', async t => {
     //Wait for Total Keys number refreshed

tests/e2e/tests/regression/pub-sub/debug-mode.e2e.ts

@@ -1,8 +1,9 @@
-import { acceptLicenseTermsAndAddDatabase, deleteDatabase } from '../../../helpers/database';
+import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
 import { MyRedisDatabasePage, PubSubPage, CliPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { env, rte } from '../../../helpers/constants';
 import { verifyMessageDisplayingInPubSub } from '../../../helpers/pub-sub';
+import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const pubSubPage = new PubSubPage();
@@ -12,7 +13,7 @@ fixture `PubSub debug mode`
     .meta({ env: env.web, rte: rte.standalone, type: 'regression' })
     .page(commonUrl)
     .beforeEach(async t => {
-        await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName);
+        await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig, ossStandaloneConfig.databaseName);
         //Go to PubSub page and subscribe to channel
         await t.click(myRedisDatabasePage.pubSubButton);
         await t.click(pubSubPage.subscribeButton);
@@ -22,7 +23,7 @@ fixture `PubSub debug mode`
         await cliPage.sendCommandInCli('10 publish channel third');
     })
     .afterEach(async() => {
-        await deleteDatabase(ossStandaloneConfig.databaseName);
+        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 
 test('Verify that when user navigating away and back to pubsub window the debug mode state will be reset to default auto-scroll', async t => {

tests/e2e/tests/regression/workbench/workbench-pipeline.e2e.ts

@@ -1,9 +1,9 @@
 import { ClientFunction } from 'testcafe';
 import { env, rte } from '../../../helpers/constants';
-import { acceptLicenseTermsAndAddDatabase } from '../../../helpers/database';
+import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
 import { MyRedisDatabasePage, SettingsPage, WorkbenchPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
-import { deleteStandaloneDatabase } from '../../../helpers/api/api-database';
+import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const workbenchPage = new WorkbenchPage();
@@ -18,14 +18,14 @@ fixture `Workbench Pipeline`
     .meta({ type: 'regression' })
     .page(commonUrl)
     .beforeEach(async t => {
-        await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName);
+        await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig, ossStandaloneConfig.databaseName);
         // Go to Settings page - Pipeline mode
         await t.click(myRedisDatabasePage.settingsButton);
         await t.click(settingsPage.accordionAdvancedSettings);
     })
     .afterEach(async() => {
         //Delete database
-        await deleteStandaloneDatabase(ossStandaloneConfig);
+        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
 test
     .meta({ env: env.web, rte: rte.standalone })('Verify that user can see the text in settings for pipeline with link', async t => {