Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(ui-mode): use server side path separator (#32523)

Browse source 
Fixes https://github.com/microsoft/playwright/issues/32323
This commit is contained in:
Max Schmitt 2024-09-09 22:07:28 +02:00 committed by GitHub
parent 363e79ee87
commit 4b5422a3c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright-core/src/server/trace/viewer/traceViewer.ts
View file

@ -109,6 +109,8 @@ export async function startTraceViewerServer(options?: TraceViewerServerOptions)
export async function installRootRedirect(server: HttpServer, traceUrls: string[], options: TraceViewerRedirectOptions) {
const params = new URLSearchParams();
if (path.sep !== path.posix.sep)
params.set('pathSeparator', path.sep);
for (const traceUrl of traceUrls)
params.append('trace', traceUrl);
if (server.wsGuid())

10
packages/trace-viewer/src/ui/uiModeTraceView.tsx
View file

@ -31,7 +31,8 @@ export const TraceView: React.FC<{
rootDir?: string,
onOpenExternally?: (location: SourceLocation) => void,
revealSource?: boolean,
}> = ({ item, rootDir, onOpenExternally, revealSource }) => {
pathSeparator: string,
}> = ({ item, rootDir, onOpenExternally, revealSource, pathSeparator }) => {
const [model, setModel] = React.useState<{ model: MultiTraceModel, isLive: boolean } | undefined>();
const [counter, setCounter] = React.useState(0);
const pollTimer = React.useRef<NodeJS.Timeout | null>(null);
@ -69,7 +70,12 @@ export const TraceView: React.FC<{
return;
}
const traceLocation = `${outputDir}/${artifactsFolderName(result!.workerIndex)}/traces/${item.testCase?.id}.json`;
const traceLocation = [
outputDir,
artifactsFolderName(result!.workerIndex),
'traces',
`${item.testCase?.id}.json`
].join(pathSeparator);
// Start polling running test.
pollTimer.current = setTimeout(async () => {
try {

12
packages/trace-viewer/src/ui/uiModeView.tsx
View file

@ -38,8 +38,6 @@ import { TestListView } from './uiModeTestListView';
import { TraceView } from './uiModeTraceView';
import { SettingsView } from './settingsView';
const pathSeparator = navigator.userAgent.toLowerCase().includes('windows') ? '\\' : '/';
let xtermSize = { cols: 80, rows: 24 };
const xtermDataSource: XtermDataSource = {
pending: [],
@ -63,6 +61,7 @@ const queryParams = {
outputDir: searchParams.get('outputDir') || undefined,
updateSnapshots: (searchParams.get('updateSnapshots') as 'all' | 'none' | 'missing' | undefined) || undefined,
reporters: searchParams.has('reporter') ? searchParams.getAll('reporter') : undefined,
pathSeparator: searchParams.get('pathSeparator') || '/',
};
if (queryParams.updateSnapshots && !['all', 'none', 'missing'].includes(queryParams.updateSnapshots))
queryParams.updateSnapshots = undefined;
@ -170,7 +169,7 @@ export const UIModeView: React.FC<{}> = ({
onError: error => {
xtermDataSource.write((error.stack || error.value || '') + '\n');
},
pathSeparator,
pathSeparator: queryParams.pathSeparator,
});
setTeleSuiteUpdater(teleSuiteUpdater);
@ -242,8 +241,8 @@ export const UIModeView: React.FC<{}> = ({
// Test tree is built from the model and filters.
const { testTree } = React.useMemo(() => {
if (!testModel)
return { testTree: new TestTree('', new TeleSuite('', 'root'), [], projectFilters, pathSeparator) };
const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, pathSeparator);
return { testTree: new TestTree('', new TeleSuite('', 'root'), [], projectFilters, queryParams.pathSeparator) };
const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, queryParams.pathSeparator);
testTree.filterTree(filterText, statusFilters, isRunningTest ? runningState?.testIds : undefined);
testTree.sortAndPropagateStatus();
testTree.shortenRoot();
@ -332,7 +331,7 @@ export const UIModeView: React.FC<{}> = ({
// run affected watched tests
const testModel = teleSuiteUpdater.asModel();
const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, pathSeparator);
const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, queryParams.pathSeparator);
const testIds: string[] = [];
const set = new Set(params.testFiles);
@ -435,6 +434,7 @@ export const UIModeView: React.FC<{}> = ({
</div>
<div className={clsx('vbox', isShowingOutput && 'hidden')}>
<TraceView
pathSeparator={queryParams.pathSeparator}
item={selectedItem}
rootDir={testModel?.config?.rootDir}
revealSource={revealSource}