From b308ac6c4902e01e9fe224414e170940e79172de Mon Sep 17 00:00:00 2001
From: "beltran.bulbarella" <beltran.bulbarella@datadoghq.com>
Date: Tue, 31 Mar 2026 16:17:44 +0200
Subject: [PATCH 1/2] Remove skip for firefox, await for error boundary to be
 reported

---
 test/apps/nextjs/app/error-test/error.tsx  |  7 +++++--
 test/e2e/scenario/nextjsPlugin.scenario.ts | 10 +++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/apps/nextjs/app/error-test/error.tsx b/test/apps/nextjs/app/error-test/error.tsx
index 072ebbdbbf..99a2683002 100644
--- a/test/apps/nextjs/app/error-test/error.tsx
+++ b/test/apps/nextjs/app/error-test/error.tsx
@@ -4,15 +4,18 @@
 
 import { addNextjsError } from '@datadog/browser-rum-nextjs'
 import Link from 'next/link'
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 
 export default function ErrorBoundary({ error, reset }: { error: Error & { digest?: string }; reset: () => void }) {
+  const [errorReported, setErrorReported] = useState(false)
+
   useEffect(() => {
     addNextjsError(error)
+    setErrorReported(true)
   }, [error])
 
   return (
-    <div data-testid="error-boundary">
+    <div data-testid="error-boundary" data-error-reported={errorReported || undefined}>
       <h2>Something went wrong!</h2>
       {error.digest && <p data-testid="error-digest">Digest: {error.digest}</p>}
       <button onClick={reset}>Try again</button>
diff --git a/test/e2e/scenario/nextjsPlugin.scenario.ts b/test/e2e/scenario/nextjsPlugin.scenario.ts
index 395e695c71..deee749a17 100644
--- a/test/e2e/scenario/nextjsPlugin.scenario.ts
+++ b/test/e2e/scenario/nextjsPlugin.scenario.ts
@@ -206,16 +206,12 @@ test.describe('nextjs - errors', () => {
       createTest('should report client-side error')
         .withRum()
         .withNextjsApp(router)
-        .run(async ({ page, flushEvents, intakeRegistry, withBrowserLogs, browserName }) => {
-          test.skip(
-            browserName === 'firefox',
-            'firefox is sending the errors in two separate batches, however the last batch is delayed making the test setup to miss it'
-          )
+        .run(async ({ page, flushEvents, intakeRegistry, withBrowserLogs }) => {
           await page.click('text=Go to Error Test')
           await page.waitForURL(`**${viewPrefix}/error-test`)
 
           await page.click('[data-testid="trigger-error"]')
-          await page.waitForSelector('[data-testid="error-boundary"]')
+          await page.waitForSelector('[data-testid="error-boundary"][data-error-reported]')
 
           await flushEvents()
 
@@ -236,7 +232,7 @@ test.describe('nextjs - errors', () => {
           .withNextjsApp(router)
           .run(async ({ page, flushEvents, intakeRegistry, withBrowserLogs }) => {
             await page.click('text=Go to Server Error')
-            await page.waitForSelector('[data-testid="error-boundary"]')
+            await page.waitForSelector('[data-testid="error-boundary"][data-error-reported]')
 
             await flushEvents()
 

From eecdc8675a45c5e1107175b9c7b617ffc018a9d8 Mon Sep 17 00:00:00 2001
From: "beltran.bulbarella" <beltran.bulbarella@datadoghq.com>
Date: Wed, 1 Apr 2026 10:24:12 +0200
Subject: [PATCH 2/2] Add data-testid to error-boundary

---
 .../nextjs/pages/pages-router/error-test.tsx  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/apps/nextjs/pages/pages-router/error-test.tsx b/test/apps/nextjs/pages/pages-router/error-test.tsx
index 9ec73b34d1..13ba97fe45 100644
--- a/test/apps/nextjs/pages/pages-router/error-test.tsx
+++ b/test/apps/nextjs/pages/pages-router/error-test.tsx
@@ -1,6 +1,6 @@
 import { ErrorBoundary } from '@datadog/browser-rum-nextjs'
 import type { ErrorBoundaryFallback } from '@datadog/browser-rum-nextjs'
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import Link from 'next/link'
 
 function ErrorThrower() {
@@ -13,14 +13,22 @@ function ErrorThrower() {
   )
 }
 
-const ErrorFallback: ErrorBoundaryFallback = ({ error, resetError }) => (
-  <div data-testid="error-boundary">
-    <p>{error.message}</p>
-    <button data-testid="reset-error" onClick={resetError}>
-      Reset
-    </button>
-  </div>
-)
+const ErrorFallback: ErrorBoundaryFallback = ({ error, resetError }) => {
+  const [errorReported, setErrorReported] = useState(false)
+
+  useEffect(() => {
+    setErrorReported(true)
+  }, [error])
+
+  return (
+    <div data-testid="error-boundary" data-error-reported={errorReported || undefined}>
+      <p>{error.message}</p>
+      <button data-testid="reset-error" onClick={resetError}>
+        Reset
+      </button>
+    </div>
+  )
+}
 
 export default function ErrorTestPage() {
   return (