Merge master in

cypress/e2e/billingUpgradeCTA.cy.ts

@@ -0,0 +1,57 @@
+import { decideResponse } from '../fixtures/api/decide'
+import * as fflate from 'fflate'
+
+// Mainly testing to make sure events are fired as expected
+
+describe('Billing Upgrade CTA', () => {
+    beforeEach(() => {
+        cy.intercept('**/decide/*', (req) =>
+            req.reply(
+                decideResponse({
+                    'billing-upgrade-language': 'credit_card',
+                })
+            )
+        )
+
+        cy.intercept('/api/billing-v2/', { fixture: 'api/billing-v2/billing-v2-unsubscribed.json' })
+    })
+
+    it('Check that events are being sent on each page visit', () => {
+        cy.visit('/organization/billing')
+        cy.get('[data-attr=product_analytics-upgrade-cta] .LemonButton__content').should('have.text', 'Add credit card')
+        cy.window().then((win) => {
+            const events = (win as any)._cypress_posthog_captures
+
+            const matchingEvents = events.filter((event) => event.event === 'billing CTA shown')
+            // One for each product card
+            expect(matchingEvents.length).to.equal(4)
+        })
+
+        // Mock billing response with subscription
+        cy.intercept('/api/billing-v2/', { fixture: 'api/billing-v2/billing-v2.json' })
+        cy.reload()
+
+        cy.get('[data-attr=session_replay-upgrade-cta] .LemonButton__content').should('have.text', 'Add paid plan')
+        cy.intercept('POST', '**/e/?compression=gzip-js*').as('capture3')
+        cy.window().then((win) => {
+            const events = (win as any)._cypress_posthog_captures
+
+            const matchingEvents = events.filter((event) => event.event === 'billing CTA shown')
+            expect(matchingEvents.length).to.equal(4)
+        })
+
+        cy.intercept('/api/billing-v2/', { fixture: 'api/billing-v2/billing-v2-unsubscribed.json' })
+        // Navigate to the onboarding billing step
+        cy.visit('/products')
+        cy.get('[data-attr=product_analytics-onboarding-card]').click()
+        cy.get('[data-attr=onboarding-breadcrumbs] > :nth-child(5)').click()
+
+        cy.intercept('POST', '**/e/?compression=gzip-js*').as('capture4')
+        cy.window().then((win) => {
+            const events = (win as any)._cypress_posthog_captures
+
+            const matchingEvents = events.filter((event) => event.event === 'billing CTA shown')
+            expect(matchingEvents.length).to.equal(3)
+        })
+    })
+})

cypress/e2e/events.cy.ts

@@ -72,7 +72,7 @@ describe('Events', () => {
         cy.get('[data-attr="new-prop-filter-EventPropertyFilters.0"]').click()
         cy.get('[data-attr=taxonomic-filter-searchfield]').click()
         cy.get('[data-attr=prop-filter-event_properties-0]').click()
-        cy.get('[data-attr=prop-val] .ant-select-selector').click({ force: true })
+        cy.get('[data-attr=prop-val] .LemonInput').click({ force: true })
         cy.wait('@getBrowserValues').then(() => {
             cy.get('[data-attr=prop-val-0]').click()
             cy.get('.DataTable').should('exist')

cypress/e2e/surveys.cy.ts

@@ -94,7 +94,7 @@ describe('Surveys', () => {
         // select the first property
         cy.get('[data-attr="property-select-toggle-0"]').click()
         cy.get('[data-attr="prop-filter-person_properties-0"]').click()
-        cy.get('[data-attr=prop-val] .ant-select-selector').click({ force: true })
+        cy.get('[data-attr=prop-val] .LemonInput').click({ force: true })
         cy.get('[data-attr=prop-val-0]').click({ force: true })
 
         cy.get('[data-attr="rollout-percentage"]').type('100')