Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): start onboarding for ordinary mobile signups

Gustavo Yeafdb65c84dc5
diff --git a/src/web/src/components/signup-tracker.dom.test.tsx b/src/web/src/components/signup-tracker.dom.test.tsx
index b6bc7e2b9..b9452df13 100644
--- a/src/web/src/components/signup-tracker.dom.test.tsx
+++ b/src/web/src/components/signup-tracker.dom.test.tsx
@@ -28,45 +28,43 @@ function mount(redirectTo?: string) {
}
describe("SignupTracker account-owned initiation", () => {
- it("does not consume the signup cookie while the breakpoint is unknown", () => {
- mocks.breakpoint = "unknown"
+ it.each(["unknown", "mobile", "desktop"])("starts ordinary signup once before navigation with a %s breakpoint", (breakpoint) => {
+ mocks.breakpoint = breakpoint
document.cookie = "is_new_signup=email; path=/"
- const { registry } = mount("/c/me/machines")
- expect(document.cookie).toContain("is_new_signup=email")
- expect(mocks.track).not.toHaveBeenCalled()
- expect(registry.runtime.ui.get().onboardingState).toBeNull()
- expect(mocks.replace).not.toHaveBeenCalled()
- })
-
- it("consumes unknown to mobile once without automatic onboarding or redirect", () => {
- mocks.breakpoint = "unknown"
- document.cookie = "is_new_signup=email; path=/"
- const { registry, rerender } = mount("/c/me/machines")
- mocks.breakpoint = "mobile"; rerender()
- mocks.breakpoint = "desktop"; rerender()
- expect(mocks.track).toHaveBeenCalledWith({ event: "sign_up", method: "email" })
- expect(registry.runtime.ui.get().onboardingState).toBeNull()
- expect(mocks.replace).not.toHaveBeenCalled()
+ const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+ const registry = createCommunityDbRegistry(client, "viewer")
+ mocks.replace.mockImplementation(() => expect(registry.runtime.ui.get().onboardingState).toMatchObject({ stage: "harness" }))
+ render(<CommunityTestProvider client={client}><SignupTracker redirectTo="/c/me/machines" /></CommunityTestProvider>)
+ expect(document.cookie).not.toContain("is_new_signup=")
+ expect(mocks.track).toHaveBeenCalledExactlyOnceWith({ event: "sign_up", method: "email" })
+ expect(registry.runtime.ui.get().onboardingState).toMatchObject({ stage: "harness" })
+ expect(mocks.replace).toHaveBeenCalledExactlyOnceWith("/c/me/machines")
})
- it("consumes unknown to desktop through the actual owner before navigation", () => {
- mocks.breakpoint = "unknown"
+ it("does not restart mobile onboarding when the viewport changes", () => {
+ mocks.breakpoint = "mobile"
document.cookie = "is_new_signup=email; path=/"
const { registry, rerender } = mount("/c/me/machines")
- mocks.replace.mockImplementation(() => expect(registry.runtime.ui.get().onboardingState).toMatchObject({ stage: "harness" }))
mocks.breakpoint = "desktop"; rerender()
- expect(mocks.track).toHaveBeenCalledWith({ event: "sign_up", method: "email" })
+ mocks.breakpoint = "mobile"; rerender()
+ expect(mocks.track).toHaveBeenCalledExactlyOnceWith({ event: "sign_up", method: "email" })
expect(registry.runtime.ui.get().onboardingState).toMatchObject({ stage: "harness" })
- expect(mocks.replace).toHaveBeenCalledWith("/c/me/machines")
+ expect(mocks.replace).toHaveBeenCalledExactlyOnceWith("/c/me/machines")
})
- it("handles a directly resolved mobile signup without automatic navigation", () => {
- mocks.breakpoint = "mobile"
+ it.each(["unknown", "mobile", "desktop"])("consumes invitation signup before leaving a public page with a %s breakpoint", (breakpoint) => {
+ mocks.breakpoint = breakpoint
document.cookie = "is_new_signup=email; path=/"
- const { registry } = mount("/c/me/machines")
- expect(mocks.track).toHaveBeenCalledWith({ event: "sign_up", method: "email" })
+ const view = render(<SignupTracker />)
+ expect(document.cookie).not.toContain("is_new_signup=")
+ expect(mocks.track).toHaveBeenCalledExactlyOnceWith({ event: "sign_up", method: "email" })
+ expect(mocks.replace).not.toHaveBeenCalled()
+ const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+ const registry = createCommunityDbRegistry(client, "viewer")
+ view.rerender(<CommunityTestProvider client={client}><SignupTracker redirectTo="/c/me/machines" /></CommunityTestProvider>)
expect(registry.runtime.ui.get().onboardingState).toBeNull()
expect(mocks.replace).not.toHaveBeenCalled()
+ expect(mocks.track).toHaveBeenCalledOnce()
})
it("deduplicates repeated resolved renders through cookie consumption", () => {
diff --git a/src/web/src/components/signup-tracker.tsx b/src/web/src/components/signup-tracker.tsx
index 39d238632..2fb6f0055 100644
--- a/src/web/src/components/signup-tracker.tsx
+++ b/src/web/src/components/signup-tracker.tsx
@@ -3,17 +3,14 @@
import { useEffect } from "react"
import { captureProductAnalytics } from "@/lib/product-analytics"
import { useRouter } from "next/navigation"
-import { useBreakpoint } from "@/hooks/use-mobile"
import { startCommunityOnboarding } from "@/lib/community-onboarding"
import { useOptionalCommunityDbRegistry } from "@/lib/community-db/projections"
export function SignupTracker({ redirectTo }: { redirectTo?: string } = {}) {
const router = useRouter()
- const breakpoint = useBreakpoint()
const registry = useOptionalCommunityDbRegistry()
useEffect(() => {
- if (breakpoint === "unknown") return
const signedIn = document.cookie.match(/(?:^|; )is_sign_in=([^;]*)/)
if (signedIn) {
document.cookie = "is_sign_in=; max-age=0; path=/"
@@ -23,7 +20,6 @@ export function SignupTracker({ redirectTo }: { redirectTo?: string } = {}) {
if (!match) return
document.cookie = "is_new_signup=; max-age=0; path=/"
void captureProductAnalytics({ event: "sign_up", method: match[1] })
- if (breakpoint === "mobile") return
if (redirectTo) {
if (redirectTo.startsWith("/c/")) {
if (!registry?.runtime.lifecycle.get().active) return
@@ -33,7 +29,7 @@ export function SignupTracker({ redirectTo }: { redirectTo?: string } = {}) {
}
window.location.replace(redirectTo)
}
- }, [breakpoint, redirectTo, router, registry])
+ }, [redirectTo, router, registry])
return null
}
diff --git a/src/web/src/test/e2e-ui/25-community-ws-reconnect-overlay.spec.ts b/src/web/src/test/e2e-ui/25-community-ws-reconnect-overlay.spec.ts
index e12c2a46e..c1b28a71f 100644
--- a/src/web/src/test/e2e-ui/25-community-ws-reconnect-overlay.spec.ts
+++ b/src/web/src/test/e2e-ui/25-community-ws-reconnect-overlay.spec.ts
@@ -273,9 +273,7 @@ let caseJourneyFailure1Present = false
`guide-reconnect-${process.pid}-${Date.now()}@example.com`,
)
await page.getByRole("button", { name: "Sign in", exact: true }).click()
- await page.waitForURL("**/c/me", { waitUntil: "commit" })
- await page.goto("/c/me/machines")
- await page.getByTestId(tid.onboardingStart).click()
+ await page.waitForURL("**/c/me/machines", { waitUntil: "commit" })
const onboarding = page.getByTestId(tid.onboardingHarnessDialog)
await expect(onboarding).toBeVisible()
await expect(page.locator("html")).toHaveAttribute(
diff --git a/src/web/src/test/e2e-ui/31-machine-guide-motion.spec.ts b/src/web/src/test/e2e-ui/31-machine-guide-motion.spec.ts
index 4ecf603f5..8bcfafd21 100644
--- a/src/web/src/test/e2e-ui/31-machine-guide-motion.spec.ts
+++ b/src/web/src/test/e2e-ui/31-machine-guide-motion.spec.ts
@@ -1,14 +1,14 @@
import { test, expect } from "./_fixtures/case-fixture"
import { tid } from "./_fixtures/testids"
-test("first-signup mobile skips automatic onboarding and does not backfill it on desktop", async ({ page }) => {
+test("first-signup mobile starts onboarding once and retains it on desktop", async ({ page }) => {
await page.setViewportSize({ width: 390, height: 844 })
await page.goto("/sign-in")
await page.getByRole("textbox", { name: "Email" }).fill(
`direct-onboarding-mobile-${process.pid}-${Date.now()}@example.com`,
)
await page.getByRole("button", { name: "Sign in", exact: true }).click()
- await page.waitForURL("**/c/me", { waitUntil: "commit" })
+ await page.waitForURL("**/c/me/machines", { waitUntil: "commit" })
await expect.poll(async () => {
const cookies = await page.context().cookies()
@@ -16,14 +16,15 @@ test("first-signup mobile skips automatic onboarding and does not backfill it on
}).toBe(false)
const onboarding = page.getByTestId(tid.onboardingHarnessDialog)
- await page.waitForTimeout(250)
- await expect(page).toHaveURL(/\/c\/me$/)
- await expect(onboarding).toHaveCount(0)
+ await expect(onboarding).toBeVisible()
+ await expect(onboarding.getByRole("heading", { name: "Which harness do you already use?" })).toBeVisible()
+ await page.getByTestId(tid.onboardingHarnessOption("grok")).click()
+ await onboarding.getByRole("button", { name: "Continue", exact: true }).click()
+ await expect(page.getByTestId(tid.onboardingMachineDialog)).toBeVisible()
await page.setViewportSize({ width: 1280, height: 800 })
- await page.waitForURL("**/c/me/friends", { waitUntil: "commit" })
- await page.waitForTimeout(250)
- await expect(page).toHaveURL(/\/c\/me\/friends$/)
+ await expect(page).toHaveURL(/\/c\/me\/machines$/)
+ await expect(page.getByTestId(tid.onboardingMachineDialog)).toBeVisible()
await expect(onboarding).toHaveCount(0)
})
diff --git a/src/web/src/test/e2e-ui/33-picker-async-layout.spec.ts b/src/web/src/test/e2e-ui/33-picker-async-layout.spec.ts
index b0d9ff385..3951a8779 100644
--- a/src/web/src/test/e2e-ui/33-picker-async-layout.spec.ts
+++ b/src/web/src/test/e2e-ui/33-picker-async-layout.spec.ts
@@ -1,6 +1,7 @@
import type { Locator, Page } from "@playwright/test"
import { expect, test } from "./_fixtures/case-fixture"
import { tid } from "./_fixtures/testids"
+import { waitForElementMotion } from "./_fixtures/actions"
import type { CaseActors, CaseResources } from "./_fixtures/case-fixture"
@@ -174,6 +175,7 @@ test.setTimeout(180_000)
await page.getByRole("button", { name: "Invite to server" }).click()
const dialog = page.getByRole("dialog")
await expect(dialog.getByText("Couldn't load friends.", { exact: true })).toBeVisible({ timeout: 20_000 })
+ await waitForElementMotion(dialog)
const copyBeforeRetry = await dialog.getByRole("button", { name: "Copy", exact: true }).boundingBox()
const failedChainGets = acceptedGets
expect(failedChainGets).toBeGreaterThanOrEqual(2)
@@ -181,6 +183,7 @@ test.setTimeout(180_000)
await dialog.getByRole("button", { name: "Retry" }).click()
await expect(dialog.getByText("No friends to invite — everyone you know is already here.", { exact: true }))
.toBeVisible({ timeout: 20_000 })
+ await waitForElementMotion(dialog)
expect(acceptedGets).toBeGreaterThan(failedChainGets)
expect(await dialog.getByRole("button", { name: "Copy", exact: true }).boundingBox()).toEqual(copyBeforeRetry)
await expectTitleClearOfClose(dialog, 390)
diff --git a/src/web/src/test/e2e-ui/36-server-switch-pending-checkpoint.spec.ts b/src/web/src/test/e2e-ui/36-server-switch-pending-checkpoint.spec.ts
index b059b0779..fc94652e7 100644
--- a/src/web/src/test/e2e-ui/36-server-switch-pending-checkpoint.spec.ts
+++ b/src/web/src/test/e2e-ui/36-server-switch-pending-checkpoint.spec.ts
@@ -197,24 +197,21 @@ function observeTargetRsc(
serverId: string,
timeoutMs: number, caseResources: CaseResources
): {
- finished: Promise<void>
+ finished: Promise<Error | null>
requests: () => string[]
stop: () => void
} {
const requests: string[] = []
let settled = false
- let resolveFinished!: () => void
- let rejectFinished!: (error: Error) => void
- const finished = new Promise<void>((resolve, reject) => {
+ let resolveFinished!: (error: Error | null) => void
+ const finished = new Promise<Error | null>((resolve) => {
resolveFinished = resolve
- rejectFinished = reject
})
const settle = (error?: Error) => {
if (settled) return
settled = true
clearTimeout(timeout)
- if (error) rejectFinished(error)
- else resolveFinished()
+ resolveFinished(error ?? null)
}
const onRequest = (request: Request) => {
if (isTargetRsc(request, serverId)) requests.push(request.url())
@@ -431,7 +428,8 @@ test("server switching exposes one target-scoped cold checkpoint and skips it wh
await clickServer(page, serverC)
await expect.poll(structuralC.heldNavigation).toBeGreaterThan(0)
await structuralC.release()
- await targetRsc.finished
+ const rscFailure = await targetRsc.finished
+ if (rscFailure) throw rscFailure
expect(targetRsc.requests()).toHaveLength(1)
await expectDesktopServerDetail(page, serverC)
await expect(page.getByTestId(tid.channelRow(channelC))).toBeVisible({ timeout: 30_000 })
diff --git a/src/web/src/test/e2e-ui/40-mobile-server-header-hierarchy.spec.ts b/src/web/src/test/e2e-ui/40-mobile-server-header-hierarchy.spec.ts
index 06f03a938..31b2937b9 100644
--- a/src/web/src/test/e2e-ui/40-mobile-server-header-hierarchy.spec.ts
+++ b/src/web/src/test/e2e-ui/40-mobile-server-header-hierarchy.spec.ts
@@ -115,6 +115,7 @@ test.describe("mobile server header direct hierarchy", () => {
const { page } = await actors.asUser("alice", { viewport: { width: 390, height: 844 }, hasTouch: true })
await page.goto(`/c/channels/${serverId}/${channelId}`, { waitUntil: "commit" })
const back = await expectMobileBack(page)
+ await expect(back).toBeEnabled()
await expect(page.getByTestId(tid.composerInput)).toBeVisible()
await expectRootListDuringCancelledSwipe(page, channelId)
const historyLength = await page.evaluate(() => history.length)
diff --git a/src/web/src/test/e2e-ui/54-authenticated-context-menu-policy.spec.ts b/src/web/src/test/e2e-ui/54-authenticated-context-menu-policy.spec.ts
index cfb59a0ea..1bc51433c 100644
--- a/src/web/src/test/e2e-ui/54-authenticated-context-menu-policy.spec.ts
+++ b/src/web/src/test/e2e-ui/54-authenticated-context-menu-policy.spec.ts
@@ -171,6 +171,7 @@ test("public, auth, and invite routes remain browser owned", async ({ page, case
for (const route of ["/", "/sign-in", "/c/invite/not-a-real-token"]) {
await page.goto(route, { waitUntil: "commit" })
await expect(page.locator("body")).toBeVisible()
+ await expect(page.locator("next-route-announcer")).toBeAttached()
if (route === invitePath) {
await expect(page.getByTestId(tid.inviteExpiredTitle)).toBeVisible()
await expect(page.getByTestId(tid.inviteExpiredTitle)).toHaveText("This invite has expired")
@@ -182,6 +183,7 @@ test("public, auth, and invite routes remain browser owned", async ({ page, case
const authenticated = await asUser("alice")
await authenticated.page.goto("/invite/not-a-real-token", { waitUntil: "commit" })
await expect(authenticated.page.locator("body")).toBeVisible()
+ await expect(authenticated.page.locator("next-route-announcer")).toBeAttached()
await rightClickDisposition(
authenticated.page,
await installOrdinaryProbe(authenticated.page),
diff --git a/src/web/src/test/e2e-ui/54-blog-multizone.spec.ts b/src/web/src/test/e2e-ui/54-blog-multizone.spec.ts
index c4a057459..fd827ae1b 100644
--- a/src/web/src/test/e2e-ui/54-blog-multizone.spec.ts
+++ b/src/web/src/test/e2e-ui/54-blog-multizone.spec.ts
@@ -4,7 +4,7 @@ import { tid } from "./_fixtures/testids"
test("main and Blog navigate across Workers through one public origin", async ({ page }) => {
const documentRequests: string[] = []
page.on("request", (request) => {
- if (request.isNavigationRequest() && request.resourceType() === "document") {
+ if (request.isNavigationRequest() && request.resourceType() === "document" && request.frame() === page.mainFrame()) {
documentRequests.push(request.url())
}
})