Merge pull request #2619 from RedisInsight/e2e/bugfix/stabilization_for_tests

fix for sm tests

Author: mariasergeenko

tests/e2e/pageObjects/base-page.ts

@@ -1,9 +1,11 @@
-import { t } from 'testcafe';
+import { Selector, t } from 'testcafe';
 import { NavigationPanel } from './components/navigation-panel';
 import { Toast } from './components/toast';
 import { ShortcutsPanel } from './components/shortcuts-panel';
 
 export class BasePage {
+    notification = Selector('[data-testid^=-notification]');
+
     NavigationPanel = new NavigationPanel();
     ShortcutsPanel = new ShortcutsPanel();
     Toast = new Toast();

tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts

@@ -33,7 +33,7 @@ export class AddRedisDatabase {
     showPasswordBtn = Selector('[aria-label^="Show password"]');
     testConnectionBtn = Selector('[data-testid=btn-test-connection]');
     // TEXT INPUTS (also referred to as 'Text fields')
-    disabledDatabaseInfo = Selector('[class=euiListGroupItem__text]');
+    disabledDatabaseInfo = Selector('[class=euiListGroupItem__label]');
     hostInput = Selector('[data-testid=host]');
     portInput = Selector('[data-testid=port]');
     databaseAliasInput = Selector('[data-testid=name]');

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

@@ -20,7 +20,7 @@ fixture `Subscribe/Unsubscribe from a channel`
         await t.click(myRedisDatabasePage.NavigationPanel.pubSubButton);
     })
     .afterEach(async() => {
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
+        await databaseAPIRequests.deleteAllDatabasesApi();
     });
 test('Verify that when user subscribe to the pubsub channel he can see all the messages being published to my database from the moment of my subscription', async t => {
     // Verify that the Channel field placeholder is 'Enter Channel Name'
@@ -66,17 +66,16 @@ test('Verify that the focus gets always shifted to a newest message (auto-scroll
 });
 test
     .before(async t => {
-        await databaseHelper.acceptLicenseTerms();
-        await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV5Config);
+        await databaseHelper.acceptLicenseTermsAndAddDatabase(ossStandaloneV5Config);
+        await t.click(pubSubPage.NavigationPanel.myRedisDBButton);
         await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneConfig);
         await myRedisDatabasePage.reloadPage();
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
         // Go to PubSub page
         await t.click(myRedisDatabasePage.NavigationPanel.pubSubButton);
     })
     .after(async() => {
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneV5Config);
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
+        await databaseAPIRequests.deleteAllDatabasesApi();
     })('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/critical-path/url-handling/url-handling.e2e.ts

@@ -34,8 +34,8 @@ test
         };
 
         await t.navigateTo(generateLink(connectUrlParams));
-        await t.expect(await myRedisDatabasePage.AddRedisDatabase.disabledDatabaseInfo.nth(0).find('span').getAttribute('title')).contains(host, 'Wrong host value');
-        await t.expect(await myRedisDatabasePage.AddRedisDatabase.disabledDatabaseInfo.nth(1).find('span').getAttribute('title')).contains(port, 'Wrong port value');
+        await t.expect(await myRedisDatabasePage.AddRedisDatabase.disabledDatabaseInfo.nth(0).getAttribute('title')).contains(host, 'Wrong host value');
+        await t.expect(await myRedisDatabasePage.AddRedisDatabase.disabledDatabaseInfo.nth(1).getAttribute('title')).contains(port, 'Wrong port value');
         await t.click(await myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
         // wait for db is added
         await t.wait(3_000);
@@ -75,8 +75,8 @@ test
 
         //Verify that the same db is not added
         await t.navigateTo(generateLink(connectUrlParams));
-        await t.wait(3_000);
         await t.click(await workbenchPage.NavigationPanel.myRedisDBButton);
+        await t.expect(browserPage.notification.exists).notOk({ timeout: 10000 });
         await t.expect(await myRedisDatabasePage.dbNameList.child('span').withExactText(databaseName).count).eql(2, 'the same db is added twice');
     });