feat: support new dashboard plugin architecture

cypress/helpers/layout.js

@@ -24,9 +24,18 @@ export const expectAxisToNotHaveDimension = (axisId, dimensionId) => {
     }
 }
 
-export const assertTooltipContainsEntries = (entries) =>
+export const assertTooltipContainsEntries = (primary, entries) => {
+    cy.getBySelLike('layout-chip')
+        .containsExact(primary, EXTENDED_TIMEOUT)
+        .trigger('mouseover')
+
     entries.forEach((entry) => cy.getBySel('tooltip-content').contains(entry))
 
+    // close the tooltip to avoid it covering other elements in subsequent tests
+    cy.get('body').type('{esc}')
+    cy.getBySel('tooltip-content').should('not.exist')
+}
+
 export const assertChipContainsText = (primary, items, secondary) => {
     if (items) {
         cy.getBySelLike('layout-chip')
@@ -49,7 +58,4 @@ export const assertChipContainsText = (primary, items, secondary) => {
             EXTENDED_TIMEOUT
         )
     }
-    cy.getBySelLike('layout-chip')
-        .containsExact(primary, EXTENDED_TIMEOUT)
-        .trigger('mouseover')
 }

cypress/integration/conditions/alphanumericConditions.cy.js

@@ -127,7 +127,10 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Exactly: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Exactly: ${TEST_TEXT}`,
+        ])
     })
 
     it('is not', () => {
@@ -149,7 +152,10 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Is not: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Is not: ${TEST_TEXT}`,
+        ])
     })
 
     it('contains', () => {
@@ -169,7 +175,10 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Contains: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Contains: ${TEST_TEXT}`,
+        ])
     })
 
     it('contains (case-sensitive)', () => {
@@ -190,7 +199,10 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Contains: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Contains: ${TEST_TEXT}`,
+        ])
     })
 
     it('does not contain', () => {
@@ -214,7 +226,7 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([
+        assertTooltipContainsEntries(dimensionName, [
             stageName,
             `Does not contain: ${TEST_TEXT}`,
         ])
@@ -234,7 +246,10 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Is empty / null`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Is empty / null`,
+        ])
     })
 
     it('is not empty / not null', () => {
@@ -257,7 +272,10 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Is not empty / not null`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Is not empty / not null`,
+        ])
     })
 
     it('2 conditions: contains + is not', () => {
@@ -273,7 +291,11 @@ describe('text conditions (event)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 2)
 
-        assertTooltipContainsEntries([stageName, 'Contains: ', 'Is not: '])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            'Contains: ',
+            'Is not: ',
+        ])
     })
 })
 describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
@@ -317,7 +339,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Exactly: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [`Exactly: ${TEST_TEXT}`])
     })
 
     it('is not', () => {
@@ -337,7 +359,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Is not: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [`Is not: ${TEST_TEXT}`])
     })
 
     it('contains', () => {
@@ -357,7 +379,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Contains: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [`Contains: ${TEST_TEXT}`])
     })
 
     it('contains (case-sensitive)', () => {
@@ -378,7 +400,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Contains: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [`Contains: ${TEST_TEXT}`])
     })
 
     it('does not contain', () => {
@@ -402,7 +424,9 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Does not contain: ${TEST_TEXT}`])
+        assertTooltipContainsEntries(dimensionName, [
+            `Does not contain: ${TEST_TEXT}`,
+        ])
     })
 
     it('is empty / null', () => {
@@ -419,7 +443,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Is empty / null`])
+        assertTooltipContainsEntries(dimensionName, [`Is empty / null`])
     })
 
     it('is not empty / not null', () => {
@@ -436,7 +460,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([`Is not empty / not null`])
+        assertTooltipContainsEntries(dimensionName, [`Is not empty / not null`])
     })
 
     it('2 conditions: contains + is not', () => {
@@ -452,7 +476,7 @@ describe(['>=41'], 'text conditions (TE)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 2)
 
-        assertTooltipContainsEntries(['Contains: ', 'Is not: '])
+        assertTooltipContainsEntries(dimensionName, ['Contains: ', 'Is not: '])
     })
 })
 /* This test doesn't look like it needs `testIsolation: false`

cypress/integration/conditions/booleanConditions.cy.js

@@ -68,7 +68,7 @@ describe('boolean conditions - Yes/NA', () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, /\bYes\b/])
+        assertTooltipContainsEntries(dimensionName, [stageName, /\bYes\b/])
     })
 
     it('Not answered selected', () => {
@@ -85,7 +85,10 @@ describe('boolean conditions - Yes/NA', () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, /\bNot answered\b/])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            /\bNot answered\b/,
+        ])
     })
 
     it('Yes + Not answered selected', () => {
@@ -103,7 +106,11 @@ describe('boolean conditions - Yes/NA', () => {
 
         assertChipContainsText(dimensionName, 'all')
 
-        assertTooltipContainsEntries([stageName, /\bYes\b/, /\bNot answered\b/])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            /\bYes\b/,
+            /\bNot answered\b/,
+        ])
     })
 })
 
@@ -122,7 +129,7 @@ describe('boolean conditions - Yes/No/NA', () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, /\bYes\b/])
+        assertTooltipContainsEntries(dimensionName, [stageName, /\bYes\b/])
     })
 
     it('No selected', () => {
@@ -132,7 +139,7 @@ describe('boolean conditions - Yes/No/NA', () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, /\bNo\b/])
+        assertTooltipContainsEntries(dimensionName, [stageName, /\bNo\b/])
     })
 
     it('Yes + Not answered selected', () => {
@@ -149,7 +156,11 @@ describe('boolean conditions - Yes/No/NA', () => {
 
         assertChipContainsText(dimensionName, 2)
 
-        assertTooltipContainsEntries([stageName, /\bYes\b/, /\bNot answered\b/])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            /\bYes\b/,
+            /\bNot answered\b/,
+        ])
     })
 
     it('Yes + No + Not answered selected', () => {
@@ -167,7 +178,7 @@ describe('boolean conditions - Yes/No/NA', () => {
 
         assertChipContainsText(dimensionName, 'all')
 
-        assertTooltipContainsEntries([
+        assertTooltipContainsEntries(dimensionName, [
             stageName,
             /\bYes\b/,
             /\bNo\b/,

cypress/integration/conditions/dateConditions.cy.js

@@ -92,7 +92,10 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Exactly: ${TEST_DATE}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Exactly: ${TEST_DATE}`,
+        ])
     })
 
     it('is not', () => {
@@ -113,7 +116,10 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Is not: ${TEST_DATE}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Is not: ${TEST_DATE}`,
+        ])
     })
 
     it('after', () => {
@@ -133,7 +139,10 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `After: ${TEST_DATE}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `After: ${TEST_DATE}`,
+        ])
     })
 
     it('after or including', () => {
@@ -154,7 +163,7 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([
+        assertTooltipContainsEntries(dimensionName, [
             stageName,
             `After or including: ${TEST_DATE}`,
         ])
@@ -178,7 +187,10 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Before: ${TEST_DATE}`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Before: ${TEST_DATE}`,
+        ])
     })
 
     it('before or including', () => {
@@ -198,7 +210,7 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([
+        assertTooltipContainsEntries(dimensionName, [
             stageName,
             `Before or including: ${TEST_DATE}`,
         ])
@@ -226,7 +238,10 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Is empty / null`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Is empty / null`,
+        ])
     })
 
     it('is not empty / not null', () => {
@@ -258,7 +273,10 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 1)
 
-        assertTooltipContainsEntries([stageName, `Is not empty / not null`])
+        assertTooltipContainsEntries(dimensionName, [
+            stageName,
+            `Is not empty / not null`,
+        ])
     })
 
     it('2 conditions: after + before or including', () => {
@@ -283,7 +301,7 @@ describe('date conditions (Date)', { testIsolation: false }, () => {
 
         assertChipContainsText(dimensionName, 2)
 
-        assertTooltipContainsEntries([
+        assertTooltipContainsEntries(dimensionName, [
             stageName,
             `After: ${TEST_DATE_AFT}`,
             `Before or including: ${TEST_DATE_BFI}`,