Merge pull request #1323 from RedisInsight/e2e/feature/RI-3646-change-expiration-timeline-to-bar-chart

E2e/feature/ri 3646 change expiration timeline to bar chart

Author: vlad-dargel

tests/e2e/pageObjects/memory-efficiency-page.ts

@@ -33,9 +33,8 @@ export class MemoryEfficiencyPage {
     tableKeysHeader = Selector('[data-test-subj*=tableHeaderCell_keys]');
     // GRAPH ELEMENTS
     donutTotalKeys = Selector('[data-testid=donut-title-keys]');
-    firstPoint = Selector('[data-testid*=circle-3600]');
-    thirdPoint = Selector('[data-testid*=circle-43200]');
-    fourthPoint = Selector('[data-testid*=circle-86400]');
-    noExpiryPoint = Selector('[data-testid*=circle-0]');
-    noExpiryDefaultPoint = Selector('[data-testid=circle-0-0]');
+    firstPoint = Selector('[data-testid*=bar-3600]');
+    thirdPoint = Selector('[data-testid*=bar-43200]');
+    fourthPoint = Selector('[data-testid*=bar-86400]');
+    noExpiryPoint = Selector('[data-testid*=bar-0-]:not(rect[data-testid=bar-0-0])');
 }

tests/e2e/tests/critical-path/memory-efficiency/memory-efficiency.e2e.ts

@@ -196,22 +196,23 @@ test
         await browserPage.deleteKeyByName(streamKeyNameDelimiter);
         await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Summary per expiration time', async t => {
-    // Create new report
+        const yAxis: number = 218;
+        // Create new report
         await t.click(memoryEfficiencyPage.newReportBtn);
         // Points are displayed in graph according to their TTL
-        const firstPointLocation = +((await memoryEfficiencyPage.firstPoint.getAttribute('cy')).slice(0, 2));
-        const thirdPointLocation = await memoryEfficiencyPage.thirdPoint.getAttribute('cy');
-        const fourthPointLocation = +((await memoryEfficiencyPage.fourthPoint.getAttribute('cy')).slice(0, 2));
-        const noExpiryDefaultPointLocation = memoryEfficiencyPage.noExpiryDefaultPoint;
+        const firstPointLocation = +((await memoryEfficiencyPage.firstPoint.getAttribute('y')).slice(0, 2));
+        const thirdPointLocation = await memoryEfficiencyPage.thirdPoint.getAttribute('y');
+        const fourthPointLocation = +((await memoryEfficiencyPage.fourthPoint.getAttribute('y')).slice(0, 2));
+        const noExpiryDefaultPointLocation = memoryEfficiencyPage.noExpiryPoint;
 
-        await t.expect(firstPointLocation).lt(198, 'Point in <1 hr breakdown doesn\'t contain key');
-        await t.expect(fourthPointLocation).lt(198, 'Point in 12-25 Hrs breakdown doesn\'t contain key');
-        await t.expect(thirdPointLocation).eql('198', 'Point in 4-12 Hrs breakdown contains key');
-        await t.expect(noExpiryDefaultPointLocation.exists).notOk('No expiry breakdown displayed when toggle is off', {timeout: 1000});
+        await t.expect(firstPointLocation).lt(yAxis, 'Point in <1 hr breakdown doesn\'t contain key');
+        await t.expect(fourthPointLocation).lt(yAxis, 'Point in 12-25 Hrs breakdown doesn\'t contain key');
+        await t.expect(thirdPointLocation).eql(`${yAxis}`, 'Point in 4-12 Hrs breakdown contains key');
+        await t.expect(noExpiryDefaultPointLocation.visible).notOk('No expiry breakdown displayed when toggle is off', {timeout: 1000});
         // No Expiry toggle shows No expiry breakdown
         await t.click(memoryEfficiencyPage.showNoExpiryToggle);
-        const noExpiryPointLocation = +((await memoryEfficiencyPage.noExpiryPoint.getAttribute('cy')).slice(0, 2));
-        await t.expect(noExpiryPointLocation).lt(198, 'Point in No expiry breakdown doesn\'t contain key');
+        const noExpiryPointLocation = +((await memoryEfficiencyPage.noExpiryPoint.getAttribute('y')).slice(0, 2));
+        await t.expect(noExpiryPointLocation).lt(yAxis, 'Point in No expiry breakdown doesn\'t contain key');
     });
 test
     .before(async t => {