test(e2e): Treat HogQL insights as fully rolled out (#21722)

* test(e2e): Treat HogQL insights as fully rolled out * Only intercept /query in `interceptInsightLoad()` * Remove long-broken `*Premium.cy.ts` tests * Update e2e.ts * Don't assume that untyped properties are boolean * Update test_property.py
PostHog · Apr 23, 2024 · 3604a1c · 3604a1c
1 parent c0b3406
commit 3604a1c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 150 deletions.
diff --git a/cypress/e2e/dashboardPremium.cy.ts b/cypress/e2e/dashboardPremium.cy.ts
diff --git a/cypress/e2e/insights.cy.ts b/cypress/e2e/insights.cy.ts
@@ -78,12 +78,6 @@ describe('Insights', () => {
         savedInsights.checkInsightIsInListView(insightName)
     })
 
-    it('Shows not found error with invalid short URL', () => {
-        cy.visit('/i/i_dont_exist')
-        cy.location('pathname').should('contain', '/insights/i_dont_exist')
-        cy.get('.LemonSkeleton').should('exist')
-    })
-
     it('Stickiness graph', () => {
         cy.get('[role=tab]').contains('Stickiness').click()
         cy.get('[data-attr=add-action-event-button]').click()

diff --git a/cypress/e2e/insightsPremium.cy.ts b/cypress/e2e/insightsPremium.cy.ts
diff --git a/cypress/e2e/trends.cy.ts b/cypress/e2e/trends.cy.ts
@@ -1,19 +1,19 @@
-import { insight, interceptInsightLoad } from '../productAnalytics'
+import { insight } from '../productAnalytics'
 
 describe('Trends', () => {
     beforeEach(() => {
         insight.newInsight()
     })
 
     it('Can load a graph from a URL directly', () => {
-        const networkInterceptAlias = interceptInsightLoad('TRENDS')
+        cy.intercept('POST', /api\/projects\/\d+\/query\//).as('loadNewQueryInsight')
 
         // regression test, the graph wouldn't load when going directly to a URL
         cy.visit(
             '/insights/new?insight=TRENDS&interval=day&display=ActionsLineGraph&events=%5B%7B"id"%3A"%24pageview"%2C"name"%3A"%24pageview"%2C"type"%3A"events"%2C"order"%3A0%7D%5D&filter_test_accounts=false&breakdown=%24referrer&breakdown_type=event&properties=%5B%7B"key"%3A"%24current_url"%2C"value"%3A"http%3A%2F%2Fhogflix.com"%2C"operator"%3A"icontains"%2C"type"%3A"event"%7D%5D'
         )
 
-        cy.wait(`@${networkInterceptAlias}`)
+        cy.wait(`@loadNewQueryInsight`)
 
         cy.get('[data-attr=trend-line-graph]').should('exist')
     })

diff --git a/cypress/productAnalytics/index.ts b/cypress/productAnalytics/index.ts
@@ -16,43 +16,6 @@ export const savedInsights = {
     },
 }
 
-export function interceptInsightLoad(insightType: string): string {
-    cy.intercept('POST', /api\/projects\/\d+\/insights\/trend\//).as('loadNewTrendsInsight')
-    cy.intercept('POST', /api\/projects\/\d+\/insights\/funnel\//).as('loadNewFunnelInsight')
-    cy.intercept('POST', /api\/projects\/\d+\/insights\/retention\//).as('loadNewRetentionInsight')
-    cy.intercept('POST', /api\/projects\/\d+\/insights\/path\//).as('loadNewPathsInsight')
-    cy.intercept('POST', /api\/projects\/\d+\/query\//).as('loadNewQueryInsight')
-
-    let networkInterceptAlias: string = ''
-    switch (insightType) {
-        case 'TRENDS':
-        case 'STICKINESS':
-        case 'LIFECYCLE':
-            networkInterceptAlias = 'loadNewTrendsInsight'
-            break
-        case 'FUNNELS':
-            networkInterceptAlias = 'loadNewFunnelInsight'
-            break
-        case 'RETENTION':
-            networkInterceptAlias = 'loadNewRetentionInsight'
-            break
-        case 'PATH':
-        case 'PATHS':
-            networkInterceptAlias = 'loadNewPathsInsight'
-            break
-        case 'SQL':
-        case 'JSON':
-            networkInterceptAlias = 'loadNewQueryInsight'
-            break
-    }
-
-    if (networkInterceptAlias === '') {
-        throw new Error('Unknown insight type: ' + insightType)
-    }
-
-    return networkInterceptAlias
-}
-
 export const insight = {
     applyFilter: (): void => {
         cy.get('[data-attr$=add-filter-group]').click()
@@ -75,16 +38,16 @@ export const insight = {
         cy.url().should('not.include', '/new')
     },
     clickTab: (tabName: string): void => {
-        const networkInterceptAlias = interceptInsightLoad(tabName)
+        cy.intercept('POST', /api\/projects\/\d+\/query\//).as('loadNewQueryInsight')
 
         cy.get(`[data-attr="insight-${(tabName === 'PATHS' ? 'PATH' : tabName).toLowerCase()}-tab"]`).click()
         if (tabName !== 'FUNNELS') {
             // funnel insights require two steps before making an api call
-            cy.wait(`@${networkInterceptAlias}`)
+            cy.wait(`@loadNewQueryInsight`)
         }
     },
     newInsight: (insightType: string = 'TRENDS'): void => {
-        const networkInterceptAlias = interceptInsightLoad(insightType)
+        cy.intercept('POST', /api\/projects\/\d+\/query\//).as('loadNewQueryInsight')
 
         if (insightType === 'JSON') {
             cy.clickNavMenu('savedinsights')
@@ -99,7 +62,7 @@ export const insight = {
 
         if (insightType !== 'FUNNELS') {
             // funnel insights require two steps before making an api call
-            cy.wait(`@${networkInterceptAlias}`)
+            cy.wait(`@loadNewQueryInsight`)
         }
     },
     visitInsight: (insightName: string): void => {

diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -29,13 +29,9 @@ beforeEach(() => {
     cy.intercept('**/decide/*', (req) =>
         req.reply(
             decideResponse({
-                // set feature flags here e.g.
+                // Feature flag to be treated as rolled out in E2E tests, e.g.:
                 // 'toolbar-launch-side-action': true,
-                'surveys-new-creation-flow': true,
-                'auto-redirect': true,
-                hogql: true,
-                'data-exploration-insights': true,
-                notebooks: true,
+                'hogql-insights-preview': true,
             })
         )
     )
@@ -46,30 +42,20 @@ beforeEach(() => {
         req.reply({ statusCode: 404, body: 'Cypress forced 404' })
     )
 
-    if (Cypress.spec.name.includes('Premium')) {
-        cy.intercept('/api/users/@me/', { fixture: 'api/user-enterprise' })
+    cy.intercept('GET', /\/api\/projects\/\d+\/insights\/?\?/).as('getInsights')
 
-        cy.request('POST', '/api/login/', {
-            email: '[email protected]',
-            password: '12345678',
-        })
+    cy.request('POST', '/api/login/', {
+        email: '[email protected]',
+        password: '12345678',
+    })
+
+    if (Cypress.spec.name.includes('before-onboarding')) {
         cy.visit('/?no-preloaded-app-context=true')
     } else {
-        cy.intercept('GET', /\/api\/projects\/\d+\/insights\/?\?/).as('getInsights')
-
-        cy.request('POST', '/api/login/', {
-            email: '[email protected]',
-            password: '12345678',
+        cy.visit('/insights')
+        cy.wait('@getInsights').then(() => {
+            cy.get('.saved-insights tr').should('exist')
         })
-
-        if (Cypress.spec.name.includes('before-onboarding')) {
-            cy.visit('/?no-preloaded-app-context=true')
-        } else {
-            cy.visit('/insights')
-            cy.wait('@getInsights').then(() => {
-                cy.get('.saved-insights tr').should('exist')
-            })
-        }
     }
 })
 

diff --git a/posthog/hogql/property.py b/posthog/hogql/property.py
@@ -279,7 +279,7 @@ def property_to_expr(
             )[0:1].values_list("property_type", flat=True)
             property_type = property_types[0] if property_types else None
 
-            if not property_type or property_type == PropertyType.Boolean:
+            if property_type == PropertyType.Boolean:
                 if value == "true":
                     value = True
                 if value == "false":

diff --git a/posthog/hogql/test/test_property.py b/posthog/hogql/test/test_property.py
@@ -185,17 +185,19 @@ def test_property_to_expr_boolean(self):
         )
         self.assertEqual(
             self._property_to_expr(
-                {"type": "event", "key": "unknown_prop", "value": "true"},
+                {"type": "event", "key": "boolean_prop", "value": "false"},
                 team=self.team,
             ),
-            self._parse_expr("properties.unknown_prop = true"),
+            self._parse_expr("properties.boolean_prop = false"),
         )
         self.assertEqual(
             self._property_to_expr(
-                {"type": "event", "key": "boolean_prop", "value": "false"},
+                {"type": "event", "key": "unknown_prop", "value": "true"},
                 team=self.team,
             ),
-            self._parse_expr("properties.boolean_prop = false"),
+            self._parse_expr(
+                "properties.unknown_prop = 'true'"  # We don't have a type for unknown_prop, so string comparison it is
+            ),
         )
 
     def test_property_to_expr_event_list(self):