From 71752c37e01d07ef130338e0b81ddf4e2ec07a3f Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Wed, 5 Oct 2022 16:05:25 -0700
Subject: [PATCH 01/15] Add conformance and vr tests to react-progress

---
 apps/vr-tests-react-components/package.json   |  1 +
 .../react-components/react-progress/Spec.md   | 21 +++++++------------
 .../src/components/Progress/Progress.test.tsx | 20 ++++++++++++++++--
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/apps/vr-tests-react-components/package.json b/apps/vr-tests-react-components/package.json
index 66c3ac40876f0..b4d0cd11514c4 100644
--- a/apps/vr-tests-react-components/package.json
+++ b/apps/vr-tests-react-components/package.json
@@ -35,6 +35,7 @@
     "@fluentui/react-persona": "^9.0.0",
     "@fluentui/react-popover": "^9.1.1",
     "@fluentui/react-positioning": "^9.2.0",
+    "@fuentui/react-progress": "9.0.0-alpha.0",
     "@fluentui/react-provider": "^9.1.3",
     "@fluentui/react-radio": "^9.0.7",
     "@fluentui/react-select": "9.0.0-beta.10",
diff --git a/packages/react-components/react-progress/Spec.md b/packages/react-components/react-progress/Spec.md
index 3ccc354c4ef3f..59a88466ac4a9 100644
--- a/packages/react-components/react-progress/Spec.md
+++ b/packages/react-components/react-progress/Spec.md
@@ -2,7 +2,7 @@
 
 ## Background
 
-The `Progress` component is used to display the current progress of an operation flow.
+The `Progress` component is used to display the current progress of an operation flow, or show that an operation is currently being executed.
 
 ## Prior Art
 
@@ -34,7 +34,7 @@ Basic example:
 import { Progress } from '@fluentui/react-progress';
 
 function App() {
-  return <Progress thickness="large" label="Loading" />;
+  return <Progress thickness="large" />;
 }
 ```
 
@@ -53,28 +53,19 @@ The Progress is represented as a rounded rectangular area with an inner animated
 
 ### Slots
 
-- `root` - The root element of the Progress. The html element is a `div`
+- `root` - The root element of the Progress, which also serves as the track for the Progress bar. The html element is a `div`
 - `bar` - The div element that gets animated into a Progress bar. The html element is `div`
-- `track` - The div element that functions as the track for the Progress bar. The html element is `div`
-- `label` - The text shown above the Progress. The html element is a `span`
-- `description` - The text shown below the Progress. The html element is a `span`
 
 ### Props
 
-See API at [Progress.types.tsx](./src/components/Progress/Progress.types.ts).
+See API at [Progress.types.tsx](https://github.com/microsoft/fluentui/blob/master/packages/react-components/react-progress/src/components/Progress/Progress.types.ts).
 
 ## Structure
 
 ```html
 <div class="fui-Progress">
-  <!-- Label for Progress -->
-  <span className="fui-Progress__label">Loading...</span>
-  <!-- Track for Progress -->
-  <div class="fui-Progress__track" />
   <!-- Bar for Progress -->
   <div class="fui-Progess__bar" />
-  <!-- Label for Progress description -->
-  <span className="fui-Progress__description">Loading Text</span>
 </div>
 ```
 
@@ -88,7 +79,7 @@ See [MIGRATION.md](./MIGRATION.md).
 
 - **Display** - The Progress will use the following priority:
 
-  - Specifying the `percentComplete` from `0` to `1` will alter the Progress from indeterminate to determinate.
+  - Specifying the `value` prop will alter the Progress from `indeterminate` to `determinate`.
   - The component also has `rtl` support and will animate the progress bar from right to left if set.
 
 ### Interaction
@@ -103,3 +94,5 @@ The Progress is non-interactive.
 - **Touch** - Nothing
 
 ## Accessibility
+
+- The `determinate` Progress has the proper `aria` attributes assigned to the element that will allow screen readers to get the `max` and current `value` of the `Progress`.
diff --git a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
index 467578b5ef475..27b8b5d254d84 100644
--- a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
+++ b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
@@ -19,10 +19,26 @@ describe('Progress', () => {
     },
   });
 
-  // TODO add more tests here, and create visual regression tests in /apps/vr-tests
-
   it('renders a default state', () => {
     const result = render(<Progress>Default Progress</Progress>);
     expect(result.container).toMatchSnapshot();
   });
+  it('has role progressbar', () => {
+    const result = render(<Progress />);
+    expect(result.getByRole('progressbar')).toBeDefined();
+  });
+  it('doesnt add aria attributes for indeterminate', () => {
+    const result = render(<Progress />);
+    expect(result.getByRole('progressbar').getAttribute('aria-valuenow')).toBeFalsy();
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemax')).toBeFalsy();
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemin')).toBeFalsy();
+  });
+  it('adds aria attributes for determinate', () => {
+    const result = render(<Progress value={0.52} />);
+    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuenow')).toEqual(
+      '0.52',
+    );
+    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemin')).toEqual('0');
+    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemax')).toEqual('1');
+  });
 });

From 80df633f569b9ddf8e833c4ed77471f45db8bc0b Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 11:43:17 -0700
Subject: [PATCH 02/15] Add Progress stories to vr tests

---
 .../src/stories/Progress.stories.tsx          | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 apps/vr-tests-react-components/src/stories/Progress.stories.tsx

diff --git a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
new file mode 100644
index 0000000000000..c990b7f18fa23
--- /dev/null
+++ b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { Progress } from '@fluentui/react-progress';
+import { TestWrapperDecoratorNoAnimation } from '../utilities/TestWrapperDecorator';
+
+storiesOf('Progress converged', module)
+  .addDecorator(TestWrapperDecoratorNoAnimation)
+  .addStory('Indeterminate', () => <Progress className="test-class" />, {
+    includeDarkMode: true,
+    includeHighContrast: true,
+    includeRtl: true,
+  })
+  .addStory('Indeterminate with thickness large', () => <Progress className="test-class" thickness="large" />)
+  .addStory('Determinate', () => <Progress className="test-class" value={0.5} />, {
+    includeDarkMode: true,
+    includeHighContrast: true,
+    includeRtl: true,
+  })
+  .addStory('Determinate with thickness large', () => (
+    <Progress className="test-class" value={0.5} thickness="large" />
+  ));

From f31339ac7ef2ae77533004a194b8d14eba4036b6 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 11:51:19 -0700
Subject: [PATCH 03/15] remove private tag in package.json

---
 packages/react-components/react-progress/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-components/react-progress/package.json b/packages/react-components/react-progress/package.json
index 2614f42fd2705..efc5762ebe4dc 100644
--- a/packages/react-components/react-progress/package.json
+++ b/packages/react-components/react-progress/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@fluentui/react-progress",
   "version": "9.0.0-alpha.0",
-  "private": true,
   "description": "Progress component for FluentUI v9",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",

From cd31c9030774b404dde2a9bd6fe0b238777e62ee Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 12:00:01 -0700
Subject: [PATCH 04/15] Update tests

---
 .../src/stories/Progress.stories.tsx                   | 10 ++++------
 .../src/components/Progress/Progress.test.tsx          |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
index c990b7f18fa23..52fd7c8aa5f01 100644
--- a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
@@ -5,17 +5,15 @@ import { TestWrapperDecoratorNoAnimation } from '../utilities/TestWrapperDecorat
 
 storiesOf('Progress converged', module)
   .addDecorator(TestWrapperDecoratorNoAnimation)
-  .addStory('Indeterminate', () => <Progress className="test-class" />, {
+  .addStory('Indeterminate', () => <Progress />, {
     includeDarkMode: true,
     includeHighContrast: true,
     includeRtl: true,
   })
-  .addStory('Indeterminate with thickness large', () => <Progress className="test-class" thickness="large" />)
-  .addStory('Determinate', () => <Progress className="test-class" value={0.5} />, {
+  .addStory('Indeterminate with thickness large', () => <Progress thickness="large" />)
+  .addStory('Determinate', () => <Progress value={0.5} />, {
     includeDarkMode: true,
     includeHighContrast: true,
     includeRtl: true,
   })
-  .addStory('Determinate with thickness large', () => (
-    <Progress className="test-class" value={0.5} thickness="large" />
-  ));
+  .addStory('Determinate with thickness large', () => <Progress value={0.5} thickness="large" />);
diff --git a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
index 27b8b5d254d84..001de834cef1a 100644
--- a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
+++ b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
@@ -27,11 +27,11 @@ describe('Progress', () => {
     const result = render(<Progress />);
     expect(result.getByRole('progressbar')).toBeDefined();
   });
-  it('doesnt add aria attributes for indeterminate', () => {
+  it('does not add aria attributes for indeterminate', () => {
     const result = render(<Progress />);
-    expect(result.getByRole('progressbar').getAttribute('aria-valuenow')).toBeFalsy();
-    expect(result.getByRole('progressbar').getAttribute('aria-valuemax')).toBeFalsy();
-    expect(result.getByRole('progressbar').getAttribute('aria-valuemin')).toBeFalsy();
+    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuenow')).toBeFalsy();
+    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemax')).toBeFalsy();
+    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemin')).toBeFalsy();
   });
   it('adds aria attributes for determinate', () => {
     const result = render(<Progress value={0.52} />);

From f5ef2044cecf0430f84db6798e52cc262b45fead Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 12:05:11 -0700
Subject: [PATCH 05/15] change files

---
 ...eact-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json

diff --git a/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json b/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json
new file mode 100644
index 0000000000000..6537ef014da73
--- /dev/null
+++ b/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Add vr and conformance tests",
+  "packageName": "@fluentui/react-progress",
+  "email": "ololubek@microsoft.com",
+  "dependentChangeType": "patch"
+}

From 6970506502257308549931b5cbe00fe1da83feb2 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 12:06:56 -0700
Subject: [PATCH 06/15] update package.json

---
 packages/react-components/react-progress/package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-components/react-progress/package.json b/packages/react-components/react-progress/package.json
index efc5762ebe4dc..d5f51e47523a1 100644
--- a/packages/react-components/react-progress/package.json
+++ b/packages/react-components/react-progress/package.json
@@ -47,7 +47,9 @@
   "beachball": {
     "disallowedChangeTypes": [
       "major",
-      "prerelease"
+      "prerelease",
+      "minor",
+      "patch"
     ]
   }
 }

From 5915396285e9bc7256a21d5280c8f73d81a5f6d5 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 12:09:50 -0700
Subject: [PATCH 07/15] fix

---
 packages/react-components/react-progress/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react-components/react-progress/package.json b/packages/react-components/react-progress/package.json
index d5f51e47523a1..c7d2404900810 100644
--- a/packages/react-components/react-progress/package.json
+++ b/packages/react-components/react-progress/package.json
@@ -47,7 +47,6 @@
   "beachball": {
     "disallowedChangeTypes": [
       "major",
-      "prerelease",
       "minor",
       "patch"
     ]

From 6a06205a10d40c87ced939d39f49f9e2103e0aed Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 13:35:09 -0700
Subject: [PATCH 08/15] fix typo

---
 apps/vr-tests-react-components/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/vr-tests-react-components/package.json b/apps/vr-tests-react-components/package.json
index b4d0cd11514c4..17f1fcda10381 100644
--- a/apps/vr-tests-react-components/package.json
+++ b/apps/vr-tests-react-components/package.json
@@ -35,7 +35,7 @@
     "@fluentui/react-persona": "^9.0.0",
     "@fluentui/react-popover": "^9.1.1",
     "@fluentui/react-positioning": "^9.2.0",
-    "@fuentui/react-progress": "9.0.0-alpha.0",
+    "@fluentui/react-progress": "9.0.0-alpha.0",
     "@fluentui/react-provider": "^9.1.3",
     "@fluentui/react-radio": "^9.0.7",
     "@fluentui/react-select": "9.0.0-beta.10",

From 6e23e96445e74d9c5d47933de27fb9d2a83498a9 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 14:34:23 -0700
Subject: [PATCH 09/15] Update SPEC.md with ProgressField info

---
 .../react-components/react-progress/Spec.md   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/react-components/react-progress/Spec.md b/packages/react-components/react-progress/Spec.md
index 59a88466ac4a9..611709c849e99 100644
--- a/packages/react-components/react-progress/Spec.md
+++ b/packages/react-components/react-progress/Spec.md
@@ -45,6 +45,28 @@ function App() {
 - Determinate Progress
   - The determinate form of the Progress component that incrementally loads from 0% to 100%
 
+#### Adding Label and Description with ProgressField
+
+There is a `ProgressField` component that adds a `label`, validation state(`success`, `warning`, `error`), and hint text to the `Progress`.
+You can use it like so:
+
+```jsx
+import * as React from 'react';
+import type { ProgressFieldProps } from '@fluentui/react-field';
+import { ProgressField } from '@fluentui/react-field';
+
+export const Default = (props: ProgressFieldProps) => (
+  <ProgressField
+    label="Example Progress field"
+    value={0.75}
+    validationState="success"
+    validationMessage="This is a success message"
+    hint="This is a hint message"
+    {...props}
+  />
+);
+```
+
 ### Shape
 
 The Progress is represented as a rounded rectangular area with an inner animated bar that either travels across the area indefinitely or animates up till a specified point

From a9bdd3a8626c9170cbfef5eed34228b8894e2a80 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 15:39:05 -0700
Subject: [PATCH 10/15] update rtl styling and vr test

---
 .../src/stories/Progress.stories.tsx                   |  4 ++--
 .../src/components/Progress/useProgressStyles.ts       | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
index 52fd7c8aa5f01..0505a05212a1c 100644
--- a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
 import { Progress } from '@fluentui/react-progress';
-import { TestWrapperDecoratorNoAnimation } from '../utilities/TestWrapperDecorator';
+//import { TestWrapperDecoratorNoAnimation } from '../utilities/TestWrapperDecorator';
 
 storiesOf('Progress converged', module)
-  .addDecorator(TestWrapperDecoratorNoAnimation)
+  //.addDecorator(TestWrapperDecoratorNoAnimation)
   .addStory('Indeterminate', () => <Progress />, {
     includeDarkMode: true,
     includeHighContrast: true,
diff --git a/packages/react-components/react-progress/src/components/Progress/useProgressStyles.ts b/packages/react-components/react-progress/src/components/Progress/useProgressStyles.ts
index 219348c30f1be..f32c0b7ef4332 100644
--- a/packages/react-components/react-progress/src/components/Progress/useProgressStyles.ts
+++ b/packages/react-components/react-progress/src/components/Progress/useProgressStyles.ts
@@ -26,6 +26,14 @@ const indeterminateProgress = {
     left: '100%',
   },
 };
+const indeterminateProgressRTL = {
+  '100%': {
+    right: '-100%',
+  },
+  '0%': {
+    right: '100%',
+  },
+};
 
 /**
  * Styles for the root slot
@@ -86,7 +94,7 @@ const useBarStyles = makeStyles({
   },
 
   rtl: {
-    animationDirection: 'reverse',
+    animationName: indeterminateProgressRTL,
   },
 });
 

From 1183ded42cc26730560656dd85cb0ab13f47cd27 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 15:43:39 -0700
Subject: [PATCH 11/15] cleanup

---
 apps/vr-tests-react-components/src/stories/Progress.stories.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
index 0505a05212a1c..05d2c567954f9 100644
--- a/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Progress.stories.tsx
@@ -1,10 +1,8 @@
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
 import { Progress } from '@fluentui/react-progress';
-//import { TestWrapperDecoratorNoAnimation } from '../utilities/TestWrapperDecorator';
 
 storiesOf('Progress converged', module)
-  //.addDecorator(TestWrapperDecoratorNoAnimation)
   .addStory('Indeterminate', () => <Progress />, {
     includeDarkMode: true,
     includeHighContrast: true,

From c79471727a21477114d21d8d0aef4dd6c2bde45d Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Thu, 6 Oct 2022 17:06:24 -0700
Subject: [PATCH 12/15] Move aria props to root and update tests

---
 .../src/components/Progress/Progress.test.tsx      | 14 ++++++--------
 .../src/components/Progress/useProgress.tsx        | 14 ++++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
index 001de834cef1a..1e2b2364549e1 100644
--- a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
+++ b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
@@ -29,16 +29,14 @@ describe('Progress', () => {
   });
   it('does not add aria attributes for indeterminate', () => {
     const result = render(<Progress />);
-    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuenow')).toBeFalsy();
-    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemax')).toBeFalsy();
-    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemin')).toBeFalsy();
+    expect(result.getByRole('progressbar').getAttribute('aria-valuenow')).toBeFalsy();
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemin')).toBeFalsy();
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemax')).toBeFalsy();
   });
   it('adds aria attributes for determinate', () => {
     const result = render(<Progress value={0.52} />);
-    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuenow')).toEqual(
-      '0.52',
-    );
-    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemin')).toEqual('0');
-    expect(result.container.getElementsByClassName('fui-Progress__bar')[0].getAttribute('aria-valuemax')).toEqual('1');
+    expect(result.getByRole('progressbar').getAttribute('aria-valuenow')).toEqual('0.52');
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemin')).toEqual('0');
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemax')).toEqual('1');
   });
 });
diff --git a/packages/react-components/react-progress/src/components/Progress/useProgress.tsx b/packages/react-components/react-progress/src/components/Progress/useProgress.tsx
index 47eca9757ae66..6806630d81cf6 100644
--- a/packages/react-components/react-progress/src/components/Progress/useProgress.tsx
+++ b/packages/react-components/react-progress/src/components/Progress/useProgress.tsx
@@ -15,15 +15,17 @@ export const useProgress_unstable = (props: ProgressProps, ref: React.Ref<HTMLEl
   // Props
   const { thickness = 'medium', value, max = 1.0 } = props;
 
-  const root = getNativeElementProps('div', { ref, role: 'progressbar', ...props });
+  const root = getNativeElementProps('div', {
+    ref,
+    role: 'progressbar',
+    'aria-valuemin': value ? 0 : undefined,
+    'aria-valuemax': value ? max : undefined,
+    'aria-valuenow': value,
+    ...props,
+  });
 
   const bar = resolveShorthand(props.bar, {
     required: true,
-    defaultProps: {
-      'aria-valuemin': value ? 0 : undefined,
-      'aria-valuemax': value ? max : undefined,
-      'aria-valuenow': value,
-    },
   });
 
   const state: ProgressState = {

From a0fc351d42a03a1f75a08b80f45ed89ce11d0015 Mon Sep 17 00:00:00 2001
From: tomi-msft <66456876+tomi-msft@users.noreply.github.com>
Date: Fri, 7 Oct 2022 11:24:53 -0700
Subject: [PATCH 13/15] Update
 change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json

Co-authored-by: Makoto Morimoto <Humberto.Morimoto@microsoft.com>
---
 ...tui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json b/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json
index 6537ef014da73..42cf99b94a79a 100644
--- a/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json
+++ b/change/@fluentui-react-progress-0341ff0e-8632-492b-8459-66f2acc50ea6.json
@@ -1,6 +1,6 @@
 {
   "type": "prerelease",
-  "comment": "Add vr and conformance tests",
+  "comment": "chore: Add vr and conformance tests.",
   "packageName": "@fluentui/react-progress",
   "email": "ololubek@microsoft.com",
   "dependentChangeType": "patch"

From e7216583880b41b94411d76250c13dd49ecc14a0 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Fri, 7 Oct 2022 11:35:46 -0700
Subject: [PATCH 14/15] Add test for max prop

---
 .../src/components/Progress/Progress.test.tsx               | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
index 1e2b2364549e1..02ae57d73b692 100644
--- a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
+++ b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
@@ -39,4 +39,10 @@ describe('Progress', () => {
     expect(result.getByRole('progressbar').getAttribute('aria-valuemin')).toEqual('0');
     expect(result.getByRole('progressbar').getAttribute('aria-valuemax')).toEqual('1');
   });
+  it('updates the max prop properly', () => {
+    const result = render(<Progress value={13} max={42} />);
+    expect(result.getByRole('progressbar').getAttribute('aria-valuenow')).toEqual('13');
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemin')).toEqual('0');
+    expect(result.getByRole('progressbar').getAttribute('aria-valuemax')).toEqual('42');
+  });
 });

From 2eaed632dc7097252aa3f066066ebe3703a9e574 Mon Sep 17 00:00:00 2001
From: Tomi Olubeko <ololubek@microsoft.com>
Date: Fri, 7 Oct 2022 13:06:31 -0700
Subject: [PATCH 15/15] remove snapshot

---
 .../src/components/Progress/Progress.test.tsx      |  4 ----
 .../Progress/__snapshots__/Progress.test.tsx.snap  | 14 --------------
 2 files changed, 18 deletions(-)
 delete mode 100644 packages/react-components/react-progress/src/components/Progress/__snapshots__/Progress.test.tsx.snap

diff --git a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
index 02ae57d73b692..8d0ee6f72d9f5 100644
--- a/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
+++ b/packages/react-components/react-progress/src/components/Progress/Progress.test.tsx
@@ -19,10 +19,6 @@ describe('Progress', () => {
     },
   });
 
-  it('renders a default state', () => {
-    const result = render(<Progress>Default Progress</Progress>);
-    expect(result.container).toMatchSnapshot();
-  });
   it('has role progressbar', () => {
     const result = render(<Progress />);
     expect(result.getByRole('progressbar')).toBeDefined();
diff --git a/packages/react-components/react-progress/src/components/Progress/__snapshots__/Progress.test.tsx.snap b/packages/react-components/react-progress/src/components/Progress/__snapshots__/Progress.test.tsx.snap
deleted file mode 100644
index e3869fcb8905d..0000000000000
--- a/packages/react-components/react-progress/src/components/Progress/__snapshots__/Progress.test.tsx.snap
+++ /dev/null
@@ -1,14 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Progress renders a default state 1`] = `
-<div>
-  <div
-    class="fui-Progress"
-    role="progressbar"
-  >
-    <div
-      class="fui-Progress__bar"
-    />
-  </div>
-</div>
-`;