Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

feat(ui-mode): reenables the update-snapshots option and uses a dropdown (#37098)

Adam Gastineau052451207996
diff --git a/packages/trace-viewer/src/ui/defaultSettingsView.tsx b/packages/trace-viewer/src/ui/defaultSettingsView.tsx
index 03e1a018f0..5c12f82345 100644
--- a/packages/trace-viewer/src/ui/defaultSettingsView.tsx
+++ b/packages/trace-viewer/src/ui/defaultSettingsView.tsx
@@ -34,24 +34,33 @@ export const DefaultSettingsView: React.FC<{}> = () => {
return (
<SettingsView
settings={[
- { value: darkMode, set: setDarkMode, name: 'Dark mode' },
{
+ type: 'check',
+ value: darkMode,
+ set: setDarkMode,
+ name: 'Dark mode'
+ },
+ {
+ type: 'check',
value: shouldPopulateCanvasFromScreenshot,
set: setShouldPopulateCanvasFromScreenshot,
name: 'Display canvas content',
title: 'Attempt to display the captured canvas appearance in the snapshot preview. May not be accurate.',
},
{
+ type: 'check',
value: actionsFilter.includes('getter'),
set: value => setActionsFilter(value ? [...actionsFilter, 'getter'] : actionsFilter.filter(a => a !== 'getter')),
name: 'Show getter actions',
},
{
+ type: 'check',
value: actionsFilter.includes('route'),
set: value => setActionsFilter(value ? [...actionsFilter, 'route'] : actionsFilter.filter(a => a !== 'route')),
name: 'Show route actions',
},
{
+ type: 'check',
value: actionsFilter.includes('configuration'),
set: value => setActionsFilter(value ? [...actionsFilter, 'configuration'] : actionsFilter.filter(a => a !== 'configuration')),
name: 'Show configuration actions',
diff --git a/packages/trace-viewer/src/ui/settingsView.css b/packages/trace-viewer/src/ui/settingsView.css
index 4142b6897e..4e59055227 100644
--- a/packages/trace-viewer/src/ui/settingsView.css
+++ b/packages/trace-viewer/src/ui/settingsView.css
@@ -39,3 +39,8 @@
margin-right: 5px;
flex-shrink: 0;
}
+
+.settings-view .setting select {
+ margin-left: 8px;
+ flex-shrink: 0;
+}
diff --git a/packages/trace-viewer/src/ui/settingsView.tsx b/packages/trace-viewer/src/ui/settingsView.tsx
index 69439e773c..824dc22e38 100644
--- a/packages/trace-viewer/src/ui/settingsView.tsx
+++ b/packages/trace-viewer/src/ui/settingsView.tsx
@@ -17,33 +17,66 @@
import * as React from 'react';
import './settingsView.css';
-export type Setting<T> = {
- value: T;
- set: (value: T) => void;
+export type Setting = {
name: string;
title?: string;
-};
+} & ({
+ type: 'check',
+ value: boolean;
+ set: (value: boolean) => void;
+} | {
+ type: 'select',
+ options: Array<{ label: string, value: string }>;
+ value: string;
+ set: (value: string) => void;
+});
export const SettingsView: React.FunctionComponent<{
- settings: Setting<boolean>[];
+ settings: Setting[];
}> = ({ settings }) => {
return (
<div className='vbox settings-view'>
- {settings.map(({ value, set, name, title }) => {
- const labelId = `setting-${name}`;
+ {settings.map(setting => {
+ const labelId = `setting-${setting.name}`;
return (
- <div key={name} className='setting' title={title}>
- <input
- type='checkbox'
- id={labelId}
- checked={value}
- onChange={() => set(!value)}
- />
- <label htmlFor={labelId}>{name}</label>
+ <div key={setting.name} className='setting' title={setting.title}>
+ {renderSetting(setting, labelId)}
</div>
);
})}
</div>
);
};
+
+const renderSetting = (setting: Setting, labelId: string) => {
+ switch (setting.type) {
+ case 'check':
+ return (
+ <>
+ <input
+ type='checkbox'
+ id={labelId}
+ checked={setting.value}
+ onChange={() => setting.set(!setting.value)}
+ />
+ <label htmlFor={labelId}>{setting.name}</label>
+ </>
+ );
+ case 'select':
+ return (
+ <>
+ <label htmlFor={labelId}>{setting.name}</label>
+ <select id={labelId} value={setting.value} onChange={e => setting.set(e.target.value)}>
+ {setting.options.map(option => (
+ <option key={option.value} value={option.value}>
+ {option.label}
+ </option>
+ ))}
+ </select>
+ </>
+ );
+ default:
+ return null;
+ }
+};
diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx
index 4375018765..1c3b5ad400 100644
--- a/packages/trace-viewer/src/ui/uiModeView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeView.tsx
@@ -57,11 +57,11 @@ const queryParams = {
projects: searchParams.getAll('project'),
workers: searchParams.get('workers') || undefined,
headed: searchParams.has('headed'),
- updateSnapshots: (searchParams.get('updateSnapshots') as 'all' | 'none' | 'missing' | undefined) || undefined,
+ updateSnapshots: (searchParams.get('updateSnapshots') as reporterTypes.FullConfig['updateSnapshots'] | undefined) || undefined,
reporters: searchParams.has('reporter') ? searchParams.getAll('reporter') : undefined,
pathSeparator: searchParams.get('pathSeparator') || '/',
};
-if (queryParams.updateSnapshots && !['all', 'none', 'missing'].includes(queryParams.updateSnapshots))
+if (queryParams.updateSnapshots && !['all', 'changed', 'none', 'missing'].includes(queryParams.updateSnapshots))
queryParams.updateSnapshots = undefined;
const isMac = navigator.platform === 'MacIntel';
@@ -100,10 +100,7 @@ export const UIModeView: React.FC<{}> = ({
const [revealSource, setRevealSource] = React.useState(false);
const onRevealSource = React.useCallback(() => setRevealSource(true), [setRevealSource]);
- const showTestingOptions = false;
- const [singleWorker, setSingleWorker] = React.useState(false);
- const [showBrowser, setShowBrowser] = React.useState(false);
- const [updateSnapshots, setUpdateSnapshots] = React.useState(false);
+ const [updateSnapshots, setUpdateSnapshots] = useSetting<reporterTypes.FullConfig['updateSnapshots']>('updateSnapshots', 'missing');
const inputRef = React.useRef<HTMLInputElement>(null);
@@ -288,9 +285,7 @@ export const UIModeView: React.FC<{}> = ({
grepInvert: queryParams.grepInvert,
testIds: [...testIds],
projects: [...projectFilters].filter(([_, v]) => v).map(([p]) => p),
- ...(singleWorker ? { workers: '1' } : {}),
- ...(showBrowser ? { headed: true } : {}),
- ...(updateSnapshots ? { updateSnapshots: 'all' } : {}),
+ updateSnapshots,
reporters: queryParams.reporters,
trace: 'on',
});
@@ -302,7 +297,7 @@ export const UIModeView: React.FC<{}> = ({
setTestModel({ ...testModel });
setRunningState(oldState => oldState ? ({ ...oldState, completed: true }) : undefined);
});
- }, [projectFilters, isRunningTest, testModel, testServerConnection, singleWorker, showBrowser, updateSnapshots]);
+ }, [projectFilters, isRunningTest, testModel, testServerConnection, updateSnapshots]);
React.useEffect(() => {
if (!testServerConnection || !teleSuiteUpdater)
@@ -497,21 +492,22 @@ export const UIModeView: React.FC<{}> = ({
setFilterText={setFilterText}
onRevealSource={onRevealSource}
/>
- {showTestingOptions && <>
- <Toolbar noShadow={true} noMinHeight={true} className='settings-toolbar' onClick={() => setTestingOptionsVisible(!testingOptionsVisible)}>
- <span
- className={`codicon codicon-${testingOptionsVisible ? 'chevron-down' : 'chevron-right'}`}
- style={{ marginLeft: 5 }}
- title={testingOptionsVisible ? 'Hide Testing Options' : 'Show Testing Options'}
- />
- <div className='section-title'>Testing Options</div>
- </Toolbar>
- {testingOptionsVisible && <SettingsView settings={[
- { value: singleWorker, set: setSingleWorker, name: 'Single worker' },
- { value: showBrowser, set: setShowBrowser, name: 'Show browser' },
- { value: updateSnapshots, set: setUpdateSnapshots, name: 'Update snapshots' },
- ]} />}
- </>}
+ <Toolbar noShadow={true} noMinHeight={true} className='settings-toolbar' onClick={() => setTestingOptionsVisible(!testingOptionsVisible)}>
+ <span
+ className={`codicon codicon-${testingOptionsVisible ? 'chevron-down' : 'chevron-right'}`}
+ style={{ marginLeft: 5 }}
+ title={testingOptionsVisible ? 'Hide Testing Options' : 'Show Testing Options'}
+ />
+ <div className='section-title'>Testing Options</div>
+ </Toolbar>
+ {testingOptionsVisible && <SettingsView settings={[
+ { type: 'select', options: [
+ { label: 'All', value: 'all' },
+ { label: 'Changed', value: 'changed' },
+ { label: 'Missing', value: 'missing' },
+ { label: 'None', value: 'none' },
+ ], value: updateSnapshots, set: setUpdateSnapshots as (value: string) => void, name: 'Update snapshots' },
+ ]} />}
<Toolbar noShadow={true} noMinHeight={true} className='settings-toolbar' onClick={() => setSettingsVisible(!settingsVisible)}>
<span
className={`codicon codicon-${settingsVisible ? 'chevron-down' : 'chevron-right'}`}