From 129662eda5f81e53416aabfb967f589122d5ed96 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Fri, 16 Dec 2022 03:06:48 -0500 Subject: [PATCH 1/9] chore: remove convert step from rubpublishscreenshot template --- .devops/templates/runpublishvrscreenshot.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.devops/templates/runpublishvrscreenshot.yml b/.devops/templates/runpublishvrscreenshot.yml index 21c94e12087c94..9567585d2355bd 100644 --- a/.devops/templates/runpublishvrscreenshot.yml +++ b/.devops/templates/runpublishvrscreenshot.yml @@ -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 From 83a1a257dc43d6dc475acd36ee4ef96ad49f8795 Mon Sep 17 00:00:00 2001 From: Tristan Watanabe Date: Fri, 16 Dec 2022 03:11:27 -0500 Subject: [PATCH 2/9] chore: convert Screener tags to StoryWright --- .../src/stories/ActivityItem.stories.tsx | 6 +-- .../src/stories/Breadcrumb.stories.tsx | 14 +++--- apps/vr-tests/src/stories/Button.stories.tsx | 30 ++++++------ .../src/stories/ButtonNext.stories.tsx | 46 +++++++++---------- .../vr-tests/src/stories/Calendar.stories.tsx | 10 ++-- apps/vr-tests/src/stories/Callout.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Card.stories.tsx | 8 ++-- .../vr-tests/src/stories/Checkbox.stories.tsx | 14 +++--- .../src/stories/ChoiceGroup.stories.tsx | 8 ++-- .../src/stories/Coachmark.stories.tsx | 8 ++-- .../src/stories/ColorPicker.stories.tsx | 8 ++-- .../vr-tests/src/stories/ComboBox.stories.tsx | 8 ++-- .../src/stories/CommandBar.stories.tsx | 8 ++-- .../src/stories/ContextualMenu.stories.tsx | 14 +++--- .../src/stories/DatePicker.stories.tsx | 20 ++++---- .../src/stories/DetailsHeader.stories.tsx | 9 ++-- .../src/stories/DetailsList.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Dialog.stories.tsx | 8 ++-- .../src/stories/DocumentCard.stories.tsx | 15 +++--- .../vr-tests/src/stories/Dropdown.stories.tsx | 14 +++--- .../vr-tests/src/stories/Facepile.stories.tsx | 8 ++-- .../src/stories/FocusTrapZone.stories.tsx | 9 ++-- .../src/stories/FolderCover.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Fonts.stories.tsx | 8 ++-- .../src/stories/GroupedList.stories.tsx | 8 ++-- .../src/stories/HoverCard.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Icon.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Image.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Keytip.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Label.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Layer.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Link.stories.tsx | 6 +-- apps/vr-tests/src/stories/List.stories.tsx | 8 ++-- .../src/stories/MessageBar.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Modal.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Nav.stories.tsx | 8 ++-- .../src/stories/NewSlider.stories.tsx | 8 ++-- .../src/stories/OverflowSet.stories.tsx | 14 +++--- apps/vr-tests/src/stories/Overlay.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Panel.stories.tsx | 14 +++--- .../src/stories/PeoplePicker.stories.tsx | 17 +++---- apps/vr-tests/src/stories/Persona.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Pivot.stories.tsx | 8 ++-- .../src/stories/ProgressIndicator.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Rating.stories.tsx | 8 ++-- .../src/stories/ResizeGroup.stories.tsx | 8 ++-- .../ScrollablePane.DetailsList.stories.tsx | 8 ++-- ...ollablePane.GroupedDetailsList.stories.tsx | 8 ++-- .../src/stories/ScrollablePane.stories.tsx | 8 ++-- .../src/stories/SearchBox.stories.tsx | 8 ++-- .../src/stories/Separator.stories.tsx | 6 +-- apps/vr-tests/src/stories/Shimmer.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Signals.stories.tsx | 6 +-- apps/vr-tests/src/stories/Slider.stories.tsx | 8 ++-- .../src/stories/SpinButton.stories.tsx | 12 ++--- apps/vr-tests/src/stories/Spinner.stories.tsx | 6 +-- apps/vr-tests/src/stories/Stack.stories.tsx | 8 ++-- .../src/stories/Sticky.Breadcrumb.stories.tsx | 9 ++-- .../src/stories/Suggestions.stories.tsx | 9 ++-- .../src/stories/SwatchColorPicker.stories.tsx | 8 ++-- .../src/stories/TagPicker.stories.tsx | 18 ++++---- .../src/stories/TeachingBubble.stories.tsx | 8 ++-- apps/vr-tests/src/stories/Text.stories.tsx | 6 +-- .../src/stories/TextField.stories.tsx | 8 ++-- .../src/stories/ThemeProvider.stories.tsx | 16 +++---- apps/vr-tests/src/stories/Tile.stories.tsx | 14 +++--- apps/vr-tests/src/stories/Toggle.stories.tsx | 6 +-- apps/vr-tests/src/stories/Tooltip.stories.tsx | 14 +++--- 68 files changed, 349 insertions(+), 345 deletions(-) diff --git a/apps/vr-tests/src/stories/ActivityItem.stories.tsx b/apps/vr-tests/src/stories/ActivityItem.stories.tsx index 1ff48503532a15..be8a507d422840 100644 --- a/apps/vr-tests/src/stories/ActivityItem.stories.tsx +++ b/apps/vr-tests/src/stories/ActivityItem.stories.tsx @@ -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'; @@ -9,13 +9,13 @@ storiesOf('ActivityItem', module) .addDecorator(FabricDecorator) .addDecorator(story => // prettier-ignore - {story()} - , + , ) .addStory( 'Root', diff --git a/apps/vr-tests/src/stories/Breadcrumb.stories.tsx b/apps/vr-tests/src/stories/Breadcrumb.stories.tsx index 5f5d427e487060..547b65c25d141f 100644 --- a/apps/vr-tests/src/stories/Breadcrumb.stories.tsx +++ b/apps/vr-tests/src/stories/Breadcrumb.stories.tsx @@ -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'; @@ -10,8 +10,8 @@ const noOp = () => undefined; storiesOf('Breadcrumb', module) .addDecorator(FabricDecoratorTall) .addDecorator(story => ( - {story()} - + )) .addStory( 'Root', @@ -77,8 +77,8 @@ storiesOf('Breadcrumb', module) storiesOf('Breadcrumb', module) .addDecorator(FabricDecoratorTall) .addDecorator(story => ( - {story()} - + )) .addStory('Hovering items', () => ( ( - {story()} - + )) .addStory('Root', () => , { rtl: true }) .addStory('Disabled', () => ) @@ -79,7 +79,7 @@ storiesOf('Button Default', module) storiesOf('Button Action', module) .addDecorator(FabricDecorator) .addDecorator(story => ( - {story()} - + )) .addStory('Root', () => , { rtl: true }) .addStory('Disabled', () => ) @@ -100,7 +100,7 @@ storiesOf('Button Action', module) storiesOf('Button Compound', module) .addDecorator(FabricDecorator) .addDecorator(story => ( - {story()} - + )) .addStory('Root', () => , { rtl: true }) .addStory('Disabled', () => ) @@ -130,7 +130,7 @@ storiesOf('Button Command', module) )) .addDecorator(FabricDecoratorTall) .addDecorator(story => ( - {story()} - + )) .addStory('Root', () => , { rtl: true }) .addStory('Disabled', () => ) @@ -152,7 +152,7 @@ storiesOf('Button Command', module) storiesOf('Button Split', module) .addDecorator(FabricDecoratorTall) .addDecorator(story => ( - {story()} - + )) .addStory('Root', () => , { rtl: true }) .addStory('Disabled', () => ) @@ -194,9 +194,9 @@ storiesOf('Button Split', module) storiesOf('Button Special Scenarios', module) .addDecorator(FabricDecorator) .addDecorator(story => ( - + {story()} - + )) .addStory('primary with placeholder', () => ( @@ -227,7 +227,7 @@ storiesOf('Button Special Scenarios', module) storiesOf('IconButton Scenarios', module) .addDecorator(FabricDecorator) .addDecorator(story => ( - {story()} - + )) .addStory('normal icon button', () => ( diff --git a/apps/vr-tests/src/stories/ButtonNext.stories.tsx b/apps/vr-tests/src/stories/ButtonNext.stories.tsx index c4deb2b3cd48b7..81e78b9aee51af 100644 --- a/apps/vr-tests/src/stories/ButtonNext.stories.tsx +++ b/apps/vr-tests/src/stories/ButtonNext.stories.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import Screener, { Steps } from 'screener-storybook/src/screener'; +import { Steps, StoryWright } from 'storywright'; import { storiesOf } from '@storybook/react'; import { Button } from '@fluentui/react-button'; import { AddIcon } from '@fluentui/react-icons'; @@ -86,7 +86,7 @@ const TeamsTheme: PartialTheme = { storiesOf('Button Next', module) .addDecorator(FabricDecorator) .addDecorator(story => ( - {story()} - + )) .addStory('Default', () => ) .addStory('Primary', () => ) @@ -133,7 +133,7 @@ storiesOf('Button Next - Teams Theme', module) .addDecorator(FabricDecorator) .addDecorator(withThemeProvider({ theme: TeamsTheme })) .addDecorator(story => ( - {story()} - + )) .addStory('Default', () => ) .addStory('Primary', () => ) @@ -168,7 +168,7 @@ storiesOf('Button Next - With icon before content', module) .addDecorator(FabricDecorator) .addDecorator(withThemeProvider) .addDecorator(story => ( - {story()} - + )) .addStory('Default', () => ) .addStory('Primary', () => ( @@ -231,7 +231,7 @@ storiesOf('Button Next - With icon after content', module) .addDecorator(FabricDecorator) .addDecorator(withThemeProvider) .addDecorator(story => ( - {story()} - + )) .addStory('Default', () => (