@fluentui-react-native/tester 0.126.12 → 0.126.14

package/src/TestComponents/Text/StandardUsage.tsx

@@ -3,15 +3,12 @@ import { View } from 'react-native';
 import { Text } from '@fluentui/react-native';
 import { Stack } from '@fluentui-react-native/stack';
 import { stackStyle } from '../Common/styles';
-import { TEXT_TESTPAGE } from '../../../../E2E/src/Text/consts';
 
 export const StandardUsage: React.FunctionComponent = () => {
   return (
     <View>
       <Stack style={stackStyle} gap={5}>
-        <Text variant="captionStandard" testID={TEXT_TESTPAGE}>
-          CaptionStandard
-        </Text>
+        <Text variant="captionStandard">CaptionStandard</Text>
         <Text variant="secondaryStandard">SecondaryStandard</Text>
         <Text variant="secondarySemibold">SecondarySemibold</Text>
         <Text variant="bodyStandard">BodyStandard</Text>

package/src/TestComponents/Text/TextE2ETest.tsx

@@ -13,27 +13,42 @@ import {
   V1_TEXT_SECOND_COMPONENT,
   V1_TEXT_SECOND_COMPONENT_CONTENT,
 } from '../../../../E2E/src/Text/consts';
+import { testProps } from '../Common/TestProps';
 
 export const E2ETextTest: React.FunctionComponent = () => {
   return (
     <View>
       <Stack style={stackStyle} gap={5}>
-        <Text variant="captionStandard" testID={V1_TEXT_FIRST_COMPONENT} accessibilityLabel={V1_TEXT_FIRST_ACCESSIBILITY_LABEL}>
+        <Text
+          variant="captionStandard"
+          accessibilityLabel={V1_TEXT_FIRST_ACCESSIBILITY_LABEL}
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(V1_TEXT_FIRST_COMPONENT)}
+        >
           Testing Text Component - Accessibility Label Set
         </Text>
-        <Text variant="captionStandard" testID={V1_TEXT_SECOND_COMPONENT}>
+        <Text
+          variant="captionStandard"
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(V1_TEXT_SECOND_COMPONENT)}
+        >
           {V1_TEXT_SECOND_COMPONENT_CONTENT}
         </Text>
       </Stack>
       <Stack style={stackStyle} gap={5}>
         <DeprecatedText
           variant="captionStandard"
-          testID={DEPRECATED_TEXT_FIRST_COMPONENT}
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(DEPRECATED_TEXT_FIRST_COMPONENT)}
           accessibilityLabel={DEPRECATED_TEXT_FIRST_ACCESSIBILITY_LABEL}
         >
           Testing Deprecated Text Component - Accessibility Label Set
         </DeprecatedText>
-        <DeprecatedText variant="captionStandard" testID={DEPRECATED_TEXT_SECOND_COMPONENT}>
+        <DeprecatedText
+          variant="captionStandard"
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(DEPRECATED_TEXT_SECOND_COMPONENT)}
+        >
           {DEPRECATED_TEXT_SECOND_COMPONENT_CONTENT}
         </DeprecatedText>
       </Stack>

package/src/TestComponents/Text/TextTest.tsx

@@ -4,10 +4,12 @@ import { CustomizeUsage } from './CustomizeUsage';
 import { PressableUsage } from './PressableUsage';
 import { E2ETextTest } from './TextE2ETest';
 import { Test, TestSection, PlatformStatus } from '../Test';
+import { TEXT_TESTPAGE } from '../../../../E2E/src/index.consts';
 
 const textSections: TestSection[] = [
   {
     name: 'Standard Usage',
+    testID: TEXT_TESTPAGE,
     component: StandardUsage,
   },
   {

package/src/TestComponents/TextExperimental/ExperimentalTextE2ETest.tsx

@@ -9,6 +9,7 @@ import {
   EXPERIMENTAL_TEXT_NO_A11Y_LABEL_COMPONENT,
   EXPERIMENTAL_TEXT_CONTENT,
 } from '../../../../E2E/src/TextExperimental/consts';
+import { testProps } from '../Common/TestProps';
 
 export const E2EExperimentalTextTest: React.FunctionComponent = () => {
   return (
@@ -16,12 +17,17 @@ export const E2EExperimentalTextTest: React.FunctionComponent = () => {
       <Stack style={stackStyle} gap={5}>
         <Text
           variant="captionStandard"
-          testID={EXPERIMENTAL_TEXT_TEST_COMPONENT}
           accessibilityLabel={EXPERIMENTAL_TEXT_ACCESSIBILITY_LABEL}
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(EXPERIMENTAL_TEXT_TEST_COMPONENT)}
         >
           Testing Text Component - Accessibility Label Set
         </Text>
-        <Text variant="captionStandard" testID={EXPERIMENTAL_TEXT_NO_A11Y_LABEL_COMPONENT}>
+        <Text
+          variant="captionStandard"
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(EXPERIMENTAL_TEXT_NO_A11Y_LABEL_COMPONENT)}
+        >
           {EXPERIMENTAL_TEXT_CONTENT}
         </Text>
       </Stack>

package/src/TestComponents/TextExperimental/StandardUsage.tsx

@@ -4,12 +4,17 @@ import { Text } from '@fluentui-react-native/experimental-text';
 import { Stack } from '@fluentui-react-native/stack';
 import { stackStyle } from '../Common/styles';
 import { HOMEPAGE_EXPERIMENTAL_TEXT_BUTTON } from '../../../../E2E/src/TextExperimental/consts';
+import { testProps } from '../Common/TestProps';
 
 export const StandardUsage: React.FunctionComponent = () => {
   return (
     <View>
       <Stack style={stackStyle} gap={5}>
-        <Text variant="captionStandard" testID={HOMEPAGE_EXPERIMENTAL_TEXT_BUTTON}>
+        <Text
+          variant="captionStandard"
+          /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+          {...testProps(HOMEPAGE_EXPERIMENTAL_TEXT_BUTTON)}
+        >
           CaptionStandard
         </Text>
         <Text variant="secondaryStandard">SecondaryStandard</Text>

package/src/TestComponents/Theme/ThemeTest.tsx

@@ -50,7 +50,7 @@ const Panel: React.FunctionComponent = () => {
       <PrimaryButton onClick={onClick} content="Primary Button" disabled={disabled} />
       <Button onClick={onClick} content="Default Button" disabled={disabled} />
       <StealthButton onClick={onClick} content="Stealth Button" disabled={disabled} />
-      <Text testID={THEME_TESTPAGE}>This is a text element</Text>
+      <Text>This is a text element</Text>
       <Button onClick={onClick} content="This button has longer text" disabled={disabled} />
     </View>
   );
@@ -103,6 +103,7 @@ const SwatchList: React.FunctionComponent = () => {
 const themeSections: TestSection[] = [
   {
     name: 'Component Examples',
+    testID: THEME_TESTPAGE,
     component: Panel,
   },
   {

package/src/TestComponents/Tokens/TokenTest.tsx

@@ -9,6 +9,7 @@ import { commonTestStyles } from '../Common/styles';
 import { Text } from '@fluentui/react-native';
 import { Test, TestSection, PlatformStatus } from '../Test';
 import { TOKENS_TEST_COMPONENT, TOKEN_TESTPAGE } from '../../../../E2E/src/Tokens/consts';
+import { testProps } from '../Common/TestProps';
 
 const getThemedStyles = themedStyleSheet((theme: Theme) => {
   return {
@@ -49,7 +50,11 @@ const ColorToken: React.FunctionComponent<ColorTokenProps> = (p: ColorTokenProps
   const themedStyles = getThemedStyles(useTheme());
   return (
     <View style={styles.swatchItem}>
-      <View style={[getSwatchColorStyle(p.name, p.color), themedStyles.swatch]} testID={TOKENS_TEST_COMPONENT} />
+      <View
+        style={[getSwatchColorStyle(p.name, p.color), themedStyles.swatch]}
+        /* For Android E2E testing purposes, testProps must be passed in after accessibilityLabel. */
+        {...testProps(TOKENS_TEST_COMPONENT)}
+      />
       <Text>{p.name}</Text>
     </View>
   );