Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore (v7 vr-tests): Completely remove usage of Screener #26049

Merged
merged 9 commits into from
Dec 21, 2022
Merged

chore (v7 vr-tests): Completely remove usage of Screener #26049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
129662e
chore: remove convert step from rubpublishscreenshot template
TristanWatanabe Dec 16, 2022
83a1a25
chore: convert Screener tags to StoryWright
TristanWatanabe Dec 16, 2022
5715c7a
chore: remove screener config files from vr-tests package
TristanWatanabe Dec 16, 2022
34a45f1
chore: delete unneeded convert script
TristanWatanabe Dec 16, 2022
6f84a1a
chore: remove screener related deps and scripts
TristanWatanabe Dec 16, 2022
fa8f1ea
chore: remove screener from lage config
TristanWatanabe Dec 16, 2022
bb9cabd
chore: update yarn.lock file
TristanWatanabe Dec 16, 2022
f0fa1d1
nit: replace screener comment verbiage with storywright
TristanWatanabe Dec 16, 2022
35a4339
fix: remove Step import
TristanWatanabe Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .devops/templates/runpublishvrscreenshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ steps:
filePath: yarn-ci.sh
displayName: yarn (install packages)

- script: |
yarn workspace ${{ parameters.vrTestPackageName }} convert
displayName: Convert screener component to storywright

- script: |
yarn workspace ${{ parameters.vrTestPackageName }} vrt:build
displayName: Build VR tests components package
Expand Down
29 changes: 0 additions & 29 deletions apps/vr-tests/convertStoriesToStoryWright.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions apps/vr-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
"code-style": "just-scripts code-style",
"convert": "bash convertStoriesToStoryWright.sh",
"just": "just-scripts",
"screener": "screener-storybook --conf screener.config.js",
"screener:local": "screener-storybook --conf screener.local.config.js --debug",
"start": "start-storybook --port 5555",
"test": "just-scripts test",
"test:component": "storywright --browsers chromium --url dist/storybook --destpath dist/screenshots --waitTimeScreenshot 500 --concurrency 4 --headless true",
Expand Down Expand Up @@ -52,8 +50,6 @@
"file-loader": "^0.11.1",
"postcss-loader": "^3.0.0",
"raw-loader": "^0.5.1",
"screener-runner": "^0.10.43",
"screener-storybook": "^0.18.6",
"storybook-readme": "^3.3.0",
"storywright": "0.0.26-beta.1",
"style-loader": "^1.2.1",
Expand Down
46 changes: 0 additions & 46 deletions apps/vr-tests/screener.config.js
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions apps/vr-tests/screener.local.config.js
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions apps/vr-tests/src/stories/ActivityItem.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. */
import * as React from 'react';
import Screener, { Steps } from 'screener-storybook/src/screener';
import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { FabricDecorator } from '../utilities';
import { ActivityItem, Icon } from 'office-ui-fabric-react';
Expand All @@ -9,13 +9,13 @@ storiesOf('ActivityItem', module)
.addDecorator(FabricDecorator)
.addDecorator(story =>
// prettier-ignore
<Screener
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.end()}
>
{story()}
</Screener>,
</StoryWright>,
)
.addStory(
'Root',
Expand Down
14 changes: 7 additions & 7 deletions apps/vr-tests/src/stories/Breadcrumb.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. */
import * as React from 'react';
import Screener from 'screener-storybook/src/screener';
import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { FabricDecoratorTall } from '../utilities';
import { Breadcrumb } from 'office-ui-fabric-react';
Expand All @@ -10,8 +10,8 @@ const noOp = () => undefined;
storiesOf('Breadcrumb', module)
.addDecorator(FabricDecoratorTall)
.addDecorator(story => (
<Screener
steps={new Screener.Steps()
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.executeScript(
"document.getElementsByClassName('testWrapper')[0].classList.add('ms-Fabric--isFocusVisible')",
Expand All @@ -36,7 +36,7 @@ storiesOf('Breadcrumb', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory(
'Root',
Expand Down Expand Up @@ -77,8 +77,8 @@ storiesOf('Breadcrumb', module)
storiesOf('Breadcrumb', module)
.addDecorator(FabricDecoratorTall)
.addDecorator(story => (
<Screener
steps={new Screener.Steps()
<StoryWright
steps={new Steps()
.hover('.ms-Breadcrumb-list li:nth-child(2)')
.snapshot('actionable hover', { cropTo: '.testWrapper' })
.hover('.ms-Breadcrumb-list li:nth-child(3)')
Expand All @@ -93,7 +93,7 @@ storiesOf('Breadcrumb', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory('Hovering items', () => (
<Breadcrumb
Expand Down
30 changes: 15 additions & 15 deletions apps/vr-tests/src/stories/Button.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. */
import * as React from 'react';
import Screener, { Steps } from 'screener-storybook/src/screener';
import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { FabricDecorator, FabricDecoratorTall } from '../utilities';
import {
Expand Down Expand Up @@ -48,7 +48,7 @@ const commandProps: IButtonProps = {
storiesOf('Button Default', module)
.addDecorator(FabricDecorator)
.addDecorator(story => (
<Screener
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.hover('.ms-Button')
Expand All @@ -58,7 +58,7 @@ storiesOf('Button Default', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory('Root', () => <DefaultButton {...baseProps} />, { rtl: true })
.addStory('Disabled', () => <DefaultButton {...baseProps} disabled={true} />)
Expand All @@ -79,7 +79,7 @@ storiesOf('Button Default', module)
storiesOf('Button Action', module)
.addDecorator(FabricDecorator)
.addDecorator(story => (
<Screener
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.hover('.ms-Button')
Expand All @@ -89,7 +89,7 @@ storiesOf('Button Action', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory('Root', () => <ActionButton {...baseProps} />, { rtl: true })
.addStory('Disabled', () => <ActionButton {...baseProps} disabled={true} />)
Expand All @@ -100,7 +100,7 @@ storiesOf('Button Action', module)
storiesOf('Button Compound', module)
.addDecorator(FabricDecorator)
.addDecorator(story => (
<Screener
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.hover('.ms-Button')
Expand All @@ -110,7 +110,7 @@ storiesOf('Button Compound', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory('Root', () => <CompoundButton {...baseProps} />, { rtl: true })
.addStory('Disabled', () => <CompoundButton {...baseProps} disabled={true} />)
Expand All @@ -130,7 +130,7 @@ storiesOf('Button Command', module)
))
.addDecorator(FabricDecoratorTall)
.addDecorator(story => (
<Screener
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.hover('.ms-Button')
Expand All @@ -143,7 +143,7 @@ storiesOf('Button Command', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory('Root', () => <CommandBarButton {...commandProps} />, { rtl: true })
.addStory('Disabled', () => <CommandBarButton {...commandProps} disabled={true} />)
Expand All @@ -152,7 +152,7 @@ storiesOf('Button Command', module)
storiesOf('Button Split', module)
.addDecorator(FabricDecoratorTall)
.addDecorator(story => (
<Screener
<StoryWright
steps={new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.hover('.ms-Button:nth-child(1)')
Expand All @@ -171,7 +171,7 @@ storiesOf('Button Split', module)
.end()}
>
{story()}
</Screener>
</StoryWright>
))
.addStory('Root', () => <DefaultButton {...commandProps} split={true} />, { rtl: true })
.addStory('Disabled', () => <DefaultButton {...commandProps} disabled={true} split={true} />)
Expand All @@ -194,9 +194,9 @@ storiesOf('Button Split', module)
storiesOf('Button Special Scenarios', module)
.addDecorator(FabricDecorator)
.addDecorator(story => (
<Screener steps={new Steps().snapshot('default', { cropTo: '.testWrapper' }).end()}>
<StoryWright steps={new Steps().snapshot('default', { cropTo: '.testWrapper' }).end()}>
{story()}
</Screener>
</StoryWright>
))

.addStory('primary with placeholder', () => (
Expand Down Expand Up @@ -227,15 +227,15 @@ storiesOf('Button Special Scenarios', module)
storiesOf('IconButton Scenarios', module)
.addDecorator(FabricDecorator)
.addDecorator(story => (
<Screener
<StoryWright
steps={new Steps()
.snapshot('icon', { cropTo: '.testWrapper' })
.hover('.ms-Button')
.snapshot('hover icon', { cropTo: '.testWrapper' })
.end()}
>
{story()}
</Screener>
</StoryWright>
))

.addStory('normal icon button', () => (
Expand Down
Loading