cherry-pick(#35637): chore: completely remove annotation warnings code

agg23 · mxschmitt · commit 0259acf7b308 · 2025-04-17T16:48:23.000+02:00
diff --git a/packages/playwright/src/common/testType.ts b/packages/playwright/src/common/testType.ts
@@ -25,8 +25,6 @@ import { wrapFunctionWithLocation } from '../transform/transform';
 import type { FixturesWithLocation } from './config';
 import type { Fixtures, TestDetails, TestStepInfo, TestType } from '../../types/test';
 import type { Location } from '../../types/testReporter';
-import type { TestInfoImpl, TestStepInternal } from '../worker/testInfo';
-
 
 const testTypeSymbol = Symbol('testType');
 
@@ -262,15 +260,11 @@ export class TestTypeImpl {
     suite._use.push({ fixtures, location });
   }
 
-  _step<T>(expectation: 'pass'|'skip', title: string, body: (step: TestStepInfo) => T | Promise<T>, options: {box?: boolean, location?: Location, timeout?: number } = {}): Promise<T> {
+  async _step<T>(expectation: 'pass'|'skip', title: string, body: (step: TestStepInfo) => T | Promise<T>, options: {box?: boolean, location?: Location, timeout?: number } = {}): Promise<T> {
     const testInfo = currentTestInfo();
     if (!testInfo)
       throw new Error(`test.step() can only be called from a test`);
     const step = testInfo._addStep({ category: 'test.step', title, location: options.location, box: options.box });
-    return testInfo._floatingPromiseScope.wrapPromiseAPIResult(this._stepInternal(expectation, testInfo, step, body, options), step.location);
-  }
-
-  private async _stepInternal<T>(expectation: 'pass'|'skip', testInfo: TestInfoImpl, step: TestStepInternal, body: (step: TestStepInfo) => T | Promise<T>, options: {box?: boolean, location?: Location, timeout?: number } = {}): Promise<T> {
     return await currentZone().with('stepZone', step).run(async () => {
       try {
         let result: Awaited<ReturnType<typeof raceAgainstDeadline<T>>> | undefined = undefined;
diff --git a/packages/playwright/src/matchers/expect.ts b/packages/playwright/src/matchers/expect.ts
@@ -385,10 +385,8 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
         setMatcherCallContext({ expectInfo: this._info, testInfo, step: step.info });
         const callback = () => matcher.call(target, ...args);
         const result = currentZone().with('stepZone', step).run(callback);
-        if (result instanceof Promise) {
-          const promise = result.then(finalizer).catch(reportStepError);
-          return testInfo._floatingPromiseScope.wrapPromiseAPIResult(promise, stackFrames[0]);
-        }
+        if (result instanceof Promise)
+          return result.then(finalizer).catch(reportStepError);
         finalizer();
         return result;
       } catch (e) {
diff --git a/packages/playwright/src/reporters/base.ts b/packages/playwright/src/reporters/base.ts
@@ -319,7 +319,6 @@ export function formatFailure(screen: Screen, config: FullConfig, test: TestCase
   const header = formatTestHeader(screen, config, test, { indent: '  ', index, mode: 'error' });
   lines.push(screen.colors.red(header));
   for (const result of test.results) {
-    // const warnings = result.annotations.filter(a => a.type === 'warning');
     const resultLines: string[] = [];
     const errors = formatResultFailure(screen, test, result, '    ');
     if (!errors.length)
@@ -329,11 +328,6 @@ export function formatFailure(screen: Screen, config: FullConfig, test: TestCase
       resultLines.push(screen.colors.gray(separator(screen, `    Retry #${result.retry}`)));
     }
     resultLines.push(...errors.map(error => '\n' + error.message));
-    // TODO: 1.53: Actually build annotations
-    // if (warnings.length) {
-    //   resultLines.push('');
-    //   resultLines.push(...formatTestWarning(screen, config, warnings));
-    // }
     for (let i = 0; i < result.attachments.length; ++i) {
       const attachment = result.attachments[i];
       if (attachment.name.startsWith('_error-context') && attachment.path) {
diff --git a/packages/playwright/src/worker/floatingPromiseScope.ts b/packages/playwright/src/worker/floatingPromiseScope.ts
diff --git a/packages/playwright/src/worker/testInfo.ts b/packages/playwright/src/worker/testInfo.ts
@@ -23,7 +23,6 @@ import { TimeoutManager, TimeoutManagerError, kMaxDeadline } from './timeoutMana
 import { filteredStackTrace, getContainedPath, normalizeAndSaveAttachment, trimLongString, windowsFilesystemFriendlyLength } from '../util';
 import { TestTracing } from './testTracing';
 import { testInfoError } from './util';
-import { FloatingPromiseScope } from './floatingPromiseScope';
 
 import type { RunnableDescription } from './timeoutManager';
 import type { FullProject, TestInfo, TestStatus, TestStepInfo } from '../../types/test';
@@ -60,7 +59,6 @@ export class TestInfoImpl implements TestInfo {
   readonly _startTime: number;
   readonly _startWallTime: number;
   readonly _tracing: TestTracing;
-  readonly _floatingPromiseScope: FloatingPromiseScope = new FloatingPromiseScope();
   readonly _uniqueSymbol;
 
   _wasInterrupted = false;
diff --git a/packages/playwright/src/worker/workerMain.ts b/packages/playwright/src/worker/workerMain.ts
@@ -427,26 +427,9 @@ export class WorkerMain extends ProcessRunner {
         throw firstAfterHooksError;
     }).catch(() => {});  // Ignore the top-level error, it is already inside TestInfo.errors.
 
-    if (testInfo._isFailure()) {
+    if (testInfo._isFailure())
       this._isStopped = true;
 
-      // Only if failed, create warning if any of the async calls were not awaited in various stages.
-      if (!process.env.PW_DISABLE_FLOATING_PROMISES_WARNING && testInfo._floatingPromiseScope.hasFloatingPromises()) {
-        // TODO: 1.53: Actually build annotations
-        // Dedupe by location
-        // const annotationLocations = new Map<string | undefined, Location | undefined>(testInfo._floatingPromiseScope.floatingPromises().map(
-        //     ({ location }) => {
-        //       const locationKey = location ? `${location.file}:${location.line}:${location.column}` : undefined;
-        //       return [locationKey, location];
-        //     }));
-
-        // testInfo.annotations.push(...[...annotationLocations.values()].map(location => ({
-        //   type: 'warning', description: `This async call was not awaited by the end of the test. This can cause flakiness. It is recommended to run ESLint with "@typescript-eslint/no-floating-promises" to verify.`, location
-        // })));
-        testInfo._floatingPromiseScope.clear();
-      }
-    }
-
     if (this._isStopped) {
       // Run all remaining "afterAll" hooks and teardown all fixtures when worker is shutting down.
       // Mark as "cleaned up" early to avoid running cleanup twice.
diff --git a/tests/playwright-test/reporter-base.spec.ts b/tests/playwright-test/reporter-base.spec.ts
@@ -486,72 +486,5 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(text).toContain('› passes @bar1 @bar2 (');
       expect(text).toContain('› passes @baz1 @baz2 (');
     });
-
-    test.skip('should show warnings on failing tests', async ({ runInlineTest }) => {
-      const result = await runInlineTest({
-        'a.spec.ts': `
-          import { test, expect } from '@playwright/test';
-          test('fail', async ({ page }, testInfo) => {
-            testInfo.annotations.push({ type: 'warning', description: 'foo' });
-            expect(page.locator('div')).toHaveText('A', { timeout: 100 });
-            throw new Error();
-          });
-        `,
-      });
-      expect(result.exitCode).toBe(1);
-      expect(result.passed).toBe(0);
-      expect(result.output).toContain('Warning: a.spec.ts:5:41: This async call was not awaited by the end of the test.');
-      expect(result.output).toContain('Warning: foo');
-    });
-
-    test.skip('should not show warnings on passing tests', async ({ runInlineTest }) => {
-      const result = await runInlineTest({
-        'a.spec.ts': `
-          import { test, expect } from '@playwright/test';
-          test('success', async ({ page }, testInfo) => {
-            testInfo.annotations.push({ type: 'warning', description: 'foo' });
-          });
-        `,
-      });
-      expect(result.exitCode).toBe(0);
-      expect(result.passed).toBe(1);
-      expect(result.output).not.toContain('Warning: foo');
-    });
-
-    test.skip('should properly sort warnings', async ({ runInlineTest }) => {
-      const result = await runInlineTest({
-        'external.js': `
-          import { expect } from '@playwright/test';
-          export const externalAsyncCall = (page) => {
-            expect(page.locator('div')).toHaveText('A', { timeout: 100 });
-          };
-        `,
-        'a.spec.ts': `
-          import { test, expect } from '@playwright/test';
-          import { externalAsyncCall } from './external.js';
-          test('fail a', async ({ page }, testInfo) => {
-            testInfo.annotations.push({ type: 'warning', description: 'foo' });
-            externalAsyncCall(page);
-            expect(page.locator('div')).toHaveText('A', { timeout: 100 });
-            testInfo.annotations.push({ type: 'warning', description: 'bar' });
-            throw new Error();
-          });
-        `,
-      });
-      expect(result.exitCode).toBe(1);
-      expect(result.passed).toBe(0);
-      expect(result.output).toContain('Warning: a.spec.ts:7:41: This async call was not awaited by the end of the test.');
-      expect(result.output).toContain('Warning: external.js:4:41: This async call was not awaited by the end of the test.');
-      expect(result.output).toContain('Warning: foo');
-      expect(result.output).toContain('Warning: bar');
-
-      const manualIndexFoo = result.output.indexOf('Warning: foo');
-      const manualIndexBar = result.output.indexOf('Warning: bar');
-      const externalIndex = result.output.indexOf('Warning: external.js:4:41');
-      const specIndex = result.output.indexOf('Warning: a.spec.ts:7:41');
-      expect(specIndex).toBeLessThan(externalIndex);
-      expect(externalIndex).toBeLessThan(manualIndexFoo);
-      expect(manualIndexFoo).toBeLessThan(manualIndexBar);
-    });
   });
 }
diff --git a/tests/playwright-test/warnings.spec.ts b/tests/playwright-test/warnings.spec.ts
