cherry-pick(#35373): Revert "chore: add location named property to annotations" (#35620)

docs/src/test-api/class-testinfo.md

@@ -19,7 +19,6 @@ test('basic test', async ({ page }, testInfo) => {
 - type: <[Array]<[Object]>>
   - `type` <[string]> Annotation type, for example `'skip'` or `'fail'`.
   - `description` ?<[string]> Optional description.
-  - `location` ?<[Location]> Optional location in the source where the annotation is added.
 
 The list of annotations applicable to the current test. Includes annotations from the test, annotations from all [`method: Test.describe`] groups the test belongs to and file-level annotations for the test file.
 

docs/src/test-reporter-api/class-testcase.md

@@ -9,7 +9,6 @@
 - type: <[Array]<[Object]>>
   - `type` <[string]> Annotation type, for example `'skip'` or `'fail'`.
   - `description` ?<[string]> Optional description.
-  - `location` ?<[Location]> Optional location in the source where the annotation is added.
 
 [`property: TestResult.annotations`] of the last test run.
 

docs/src/test-reporter-api/class-testresult.md

@@ -19,7 +19,6 @@ The list of files or buffers attached during the test execution through [`proper
 - type: <[Array]<[Object]>>
   - `type` <[string]> Annotation type, for example `'skip'` or `'fail'`.
   - `description` ?<[string]> Optional description.
-  - `location` ?<[Location]> Optional location in the source where the annotation is added.
 
 The list of annotations applicable to the current test. Includes:
 * annotations defined on the test or suite via [`method: Test.(call)`] and [`method: Test.describe`];

docs/src/test-reporter-api/class-teststep.md

@@ -55,7 +55,6 @@ List of steps inside this step.
 - type: <[Array]<[Object]>>
   - `type` <[string]> Annotation type, for example `'skip'`.
   - `description` ?<[string]> Optional description.
-  - `location` ?<[Location]> Optional location in the source where the annotation is added.
 
 The list of annotations applicable to the current test step.
 

packages/html-reporter/src/testCaseView.tsx

@@ -14,8 +14,7 @@
   limitations under the License.
 */
 
-import type { TestAnnotation } from '@playwright/test';
-import type { TestCase, TestCaseSummary } from './types';
+import type { TestCase, TestAnnotation, TestCaseSummary } from './types';
 import * as React from 'react';
 import { TabbedPane } from './tabbedPane';
 import { AutoChip } from './chip';

packages/html-reporter/src/types.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { TestAnnotation, Metadata } from '@playwright/test';
+import type { Metadata } from '@playwright/test';
 
 export type Stats = {
   total: number;
@@ -59,6 +59,8 @@ export type TestFileSummary = {
   stats: Stats;
 };
 
+export type TestAnnotation = { type: string, description?: string };
+
 export type TestCaseSummary = {
   testId: string,
   title: string;

packages/playwright/src/common/config.ts

@@ -36,6 +36,7 @@ export type FixturesWithLocation = {
   fixtures: Fixtures;
   location: Location;
 };
+export type Annotation = { type: string, description?: string };
 
 export const defaultTimeout = 30000;
 

packages/playwright/src/common/test.ts

@@ -17,10 +17,9 @@
 import { rootTestType } from './testType';
 import { computeTestCaseOutcome } from '../isomorphic/teleReceiver';
 
-import type { FixturesWithLocation, FullProjectInternal } from './config';
+import type { Annotation, FixturesWithLocation, FullProjectInternal } from './config';
 import type { FixturePool } from './fixtures';
 import type { TestTypeImpl } from './testType';
-import type { TestAnnotation } from '../../types/test';
 import type * as reporterTypes from '../../types/testReporter';
 import type { FullProject, Location } from '../../types/testReporter';
 
@@ -51,7 +50,7 @@ export class Suite extends Base {
   _timeout: number | undefined;
   _retries: number | undefined;
   // Annotations known statically before running the test, e.g. `test.describe.skip()` or `test.describe({ annotation }, body)`.
-  _staticAnnotations: TestAnnotation[] = [];
+  _staticAnnotations: Annotation[] = [];
   // Explicitly declared tags that are not a part of the title.
   _tags: string[] = [];
   _modifiers: Modifier[] = [];
@@ -253,7 +252,7 @@ export class TestCase extends Base implements reporterTypes.TestCase {
 
   expectedStatus: reporterTypes.TestStatus = 'passed';
   timeout = 0;
-  annotations: TestAnnotation[] = [];
+  annotations: Annotation[] = [];
   retries = 0;
   repeatEachIndex = 0;
 

packages/playwright/src/common/testType.ts

@@ -104,7 +104,7 @@ export class TestTypeImpl {
       details = fnOrDetails;
     }
 
-    const validatedDetails = validateTestDetails(details, location);
+    const validatedDetails = validateTestDetails(details);
     const test = new TestCase(title, body, this, location);
     test._requireFile = suite._requireFile;
     test.annotations.push(...validatedDetails.annotations);
@@ -114,9 +114,9 @@ export class TestTypeImpl {
     if (type === 'only' || type === 'fail.only')
       test._only = true;
     if (type === 'skip' || type === 'fixme' || type === 'fail')
-      test.annotations.push({ type, location });
+      test.annotations.push({ type });
     else if (type === 'fail.only')
-      test.annotations.push({ type: 'fail', location });
+      test.annotations.push({ type: 'fail' });
   }
 
   private _describe(type: 'default' | 'only' | 'serial' | 'serial.only' | 'parallel' | 'parallel.only' | 'skip' | 'fixme', location: Location, titleOrFn: string | Function, fnOrDetails?: TestDetails | Function, fn?: Function) {
@@ -143,7 +143,7 @@ export class TestTypeImpl {
       body = fn!;
     }
 
-    const validatedDetails = validateTestDetails(details, location);
+    const validatedDetails = validateTestDetails(details);
     const child = new Suite(title, 'describe');
     child._requireFile = suite._requireFile;
     child.location = location;
@@ -158,7 +158,7 @@ export class TestTypeImpl {
     if (type === 'parallel' || type === 'parallel.only')
       child._parallelMode = 'parallel';
     if (type === 'skip' || type === 'fixme')
-      child._staticAnnotations.push({ type, location });
+      child._staticAnnotations.push({ type });
 
     for (let parent: Suite | undefined = suite; parent; parent = parent.parent) {
       if (parent._parallelMode === 'serial' && child._parallelMode === 'parallel')
@@ -229,7 +229,7 @@ export class TestTypeImpl {
         if (modifierArgs.length >= 1 && !modifierArgs[0])
           return;
         const description = modifierArgs[1];
-        suite._staticAnnotations.push({ type, description, location });
+        suite._staticAnnotations.push({ type, description });
       }
       return;
     }
@@ -239,7 +239,7 @@ export class TestTypeImpl {
       throw new Error(`test.${type}() can only be called inside test, describe block or fixture`);
     if (typeof modifierArgs[0] === 'function')
       throw new Error(`test.${type}() with a function can only be called inside describe block`);
-    testInfo._modifier(type, location, modifierArgs as [any, any]);
+    testInfo[type](...modifierArgs as [any, any]);
   }
 
   private _setTimeout(location: Location, timeout: number) {
@@ -276,7 +276,7 @@ export class TestTypeImpl {
         let result: Awaited<ReturnType<typeof raceAgainstDeadline<T>>> | undefined = undefined;
         result = await raceAgainstDeadline(async () => {
           try {
-            return await step.info._runStepBody(expectation === 'skip', body, step.location);
+            return await step.info._runStepBody(expectation === 'skip', body);
           } catch (e) {
             // If the step timed out, the test fixtures will tear down, which in turn
             // will abort unfinished actions in the step body. Record such errors here.
@@ -315,9 +315,8 @@ function throwIfRunningInsideJest() {
   }
 }
 
-function validateTestDetails(details: TestDetails, location: Location) {
-  const originalAnnotations = Array.isArray(details.annotation) ? details.annotation : (details.annotation ? [details.annotation] : []);
-  const annotations = originalAnnotations.map(annotation => ({ ...annotation, location }));
+function validateTestDetails(details: TestDetails) {
+  const annotations = Array.isArray(details.annotation) ? details.annotation : (details.annotation ? [details.annotation] : []);
   const tags = Array.isArray(details.tag) ? details.tag : (details.tag ? [details.tag] : []);
   for (const tag of tags) {
     if (tag[0] !== '@')

packages/playwright/src/isomorphic/teleReceiver.ts

@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import type { Metadata, TestAnnotation } from '../../types/test';
+import type { Metadata } from '../../types/test';
 import type * as reporterTypes from '../../types/testReporter';
+import type { Annotation } from '../common/config';
 import type { ReporterV2 } from '../reporters/reporterV2';
 
 export type StringIntern = (s: string) => string;
@@ -67,7 +68,7 @@ export type JsonTestCase = {
   retries: number;
   tags?: string[];
   repeatEachIndex: number;
-  annotations?: TestAnnotation[];
+  annotations?: Annotation[];
 };
 
 export type JsonTestEnd = {
@@ -94,7 +95,7 @@ export type JsonTestResultEnd = {
   status: reporterTypes.TestStatus;
   errors: reporterTypes.TestError[];
   attachments: JsonAttachment[];
-  annotations?: TestAnnotation[];
+  annotations?: Annotation[];
 };
 
 export type JsonTestStepStart = {
@@ -111,7 +112,7 @@ export type JsonTestStepEnd = {
   duration: number;
   error?: reporterTypes.TestError;
   attachments?: number[]; // index of JsonTestResultEnd.attachments
-  annotations?: TestAnnotation[];
+  annotations?: Annotation[];
 };
 
 export type JsonFullResult = {
@@ -242,7 +243,7 @@ export class TeleReporterReceiver {
     result.error = result.errors?.[0];
     result.attachments = this._parseAttachments(payload.attachments);
     if (payload.annotations) {
-      result.annotations = this._absoluteAnnotationLocations(payload.annotations);
+      result.annotations = payload.annotations;
       test.annotations = result.annotations;
     }
     this._reporter.onTestEnd?.(test, result);
@@ -374,18 +375,10 @@ export class TeleReporterReceiver {
     test.location = this._absoluteLocation(payload.location);
     test.retries = payload.retries;
     test.tags = payload.tags ?? [];
-    test.annotations = this._absoluteAnnotationLocations(payload.annotations ?? []);
+    test.annotations = payload.annotations ?? [];
     return test;
   }
 
-  private _absoluteAnnotationLocations(annotations: TestAnnotation[]): TestAnnotation[] {
-    return annotations.map(annotation => {
-      if (annotation.location)
-        annotation.location = this._absoluteLocation(annotation.location);
-      return annotation;
-    });
-  }
-
   private _absoluteLocation(location: reporterTypes.Location): reporterTypes.Location;
   private _absoluteLocation(location?: reporterTypes.Location): reporterTypes.Location | undefined;
   private _absoluteLocation(location: reporterTypes.Location | undefined): reporterTypes.Location | undefined {
@@ -486,7 +479,7 @@ export class TeleTestCase implements reporterTypes.TestCase {
 
   expectedStatus: reporterTypes.TestStatus = 'passed';
   timeout = 0;
-  annotations: TestAnnotation[] = [];
+  annotations: Annotation[] = [];
   retries = 0;
   tags: string[] = [];
   repeatEachIndex = 0;

packages/playwright/src/reporters/base.ts

@@ -26,7 +26,6 @@ import { getEastAsianWidth } from '../utilsBundle';
 import type { ReporterV2 } from './reporterV2';
 import type { FullConfig, FullResult, Location, Suite, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
 import type { Colors } from '@isomorphic/colors';
-import type { TestAnnotation } from '../../types/test';
 
 export type TestResultOutput = { chunk: string | Buffer, type: 'stdout' | 'stderr' };
 export const kOutputSymbol = Symbol('output');
@@ -377,27 +376,6 @@ export function formatFailure(screen: Screen, config: FullConfig, test: TestCase
   return lines.join('\n');
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function formatTestWarning(screen: Screen, config: FullConfig, warnings: TestAnnotation[]): string[] {
-  warnings.sort((a, b) => {
-    const aLocationKey = a.location ? `${a.location.file}:${a.location.line}:${a.location.column}` : undefined;
-    const bLocationKey = b.location ? `${b.location.file}:${b.location.line}:${b.location.column}` : undefined;
-
-    if (!aLocationKey && !bLocationKey)
-      return 0;
-    if (!aLocationKey)
-      return 1;
-    if (!bLocationKey)
-      return -1;
-    return aLocationKey.localeCompare(bLocationKey);
-  });
-
-  return warnings.filter(w => !!w.description).map(w => {
-    const location = !!w.location ? `${relativeFilePath(screen, config, w.location.file)}:${w.location.line}:${w.location.column}: ` : '';
-    return `${screen.colors.yellow(`    Warning: ${location}${w.description}`)}`;
-  });
-}
-
 export function formatRetry(screen: Screen, result: TestResult) {
   const retryLines = [];
   if (result.retry) {

packages/playwright/src/reporters/html.ts

@@ -29,9 +29,9 @@ import { codeFrameColumns } from '../transform/babelBundle';
 import { resolveReporterOutputPath, stripAnsiEscapes } from '../util';
 
 import type { ReporterV2 } from './reporterV2';
-import type { Metadata, TestAnnotation } from '../../types/test';
+import type { Metadata } from '../../types/test';
 import type * as api from '../../types/testReporter';
-import type { HTMLReport, Stats, TestAttachment, TestCase, TestCaseSummary, TestFile, TestFileSummary, TestResult, TestStep } from '@html-reporter/types';
+import type { HTMLReport, Stats, TestAttachment, TestCase, TestCaseSummary, TestFile, TestFileSummary, TestResult, TestStep, TestAnnotation } from '@html-reporter/types';
 import type { ZipFile } from 'playwright-core/lib/zipBundle';
 import type { TransformCallback } from 'stream';
 
@@ -503,7 +503,7 @@ class HtmlBuilder {
 
   private _serializeAnnotations(annotations: api.TestCase['annotations']): TestAnnotation[] {
     // Annotations can be pushed directly, with a wrong type.
-    return annotations.map(a => ({ type: a.type, description: a.description === undefined ? undefined : String(a.description), location: a.location }));
+    return annotations.map(a => ({ type: a.type, description: a.description === undefined ? undefined : String(a.description) }));
   }
 
   private _createTestResult(test: api.TestCase, result: api.TestResult): TestResult {

packages/playwright/src/reporters/merge.ts

@@ -27,10 +27,10 @@ import { createReporters } from '../runner/reporters';
 import { relativeFilePath } from '../util';
 
 import type { BlobReportMetadata } from './blob';
-import type { ReporterDescription, TestAnnotation } from '../../types/test';
+import type { ReporterDescription } from '../../types/test';
 import type { TestError } from '../../types/testReporter';
 import type { FullConfigInternal } from '../common/config';
-import type { JsonConfig, JsonEvent, JsonFullResult, JsonLocation, JsonProject, JsonSuite, JsonTestCase, JsonTestEnd, JsonTestResultEnd, JsonTestStepEnd, JsonTestStepStart } from '../isomorphic/teleReceiver';
+import type { JsonConfig, JsonEvent, JsonFullResult, JsonLocation, JsonProject, JsonSuite, JsonTestCase, JsonTestResultEnd, JsonTestStepEnd, JsonTestStepStart } from '../isomorphic/teleReceiver';
 import type * as blobV1 from './versions/blobV1';
 
 type StatusCallback = (message: string) => void;
@@ -474,10 +474,7 @@ class PathSeparatorPatcher {
       return;
     }
     if (jsonEvent.method === 'onTestEnd') {
-      const test = jsonEvent.params.test as JsonTestEnd;
-      test.annotations?.forEach(annotation => this._updateAnnotationLocations(annotation));
       const testResult = jsonEvent.params.result as JsonTestResultEnd;
-      testResult.annotations?.forEach(annotation => this._updateAnnotationLocations(annotation));
       testResult.errors.forEach(error => this._updateErrorLocations(error));
       testResult.attachments.forEach(attachment => {
         if (attachment.path)
@@ -493,7 +490,6 @@ class PathSeparatorPatcher {
     if (jsonEvent.method === 'onStepEnd') {
       const step = jsonEvent.params.step as JsonTestStepEnd;
       this._updateErrorLocations(step.error);
-      step.annotations?.forEach(annotation => this._updateAnnotationLocations(annotation));
       return;
     }
   }
@@ -510,12 +506,10 @@ class PathSeparatorPatcher {
     if (isFileSuite)
       suite.title = this._updatePath(suite.title);
     for (const entry of suite.entries) {
-      if ('testId' in entry) {
+      if ('testId' in entry)
         this._updateLocation(entry.location);
-        entry.annotations?.forEach(annotation => this._updateAnnotationLocations(annotation));
-      } else {
+      else
         this._updateSuite(entry);
-      }
     }
   }
 
@@ -526,10 +520,6 @@ class PathSeparatorPatcher {
     }
   }
 
-  private _updateAnnotationLocations(annotation: TestAnnotation) {
-    this._updateLocation(annotation.location);
-  }
-
   private _updateLocation(location?: JsonLocation) {
     if (location)
       location.file = this._updatePath(location.file);