From b02eabf67afe159b7850fdd5141da5f3ca68e3ef Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 15 Feb 2022 15:29:19 -0800
Subject: [PATCH 1/7] fix(android): nested frames were sometimes not recreated
 (#9748)

Co-authored-by: Eduardo Speroni <edusperoni@gmail.com>

From 803553a6896d257b0874e1a393ec1641af197402 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 22 Feb 2022 18:04:11 -0800
Subject: [PATCH 2/7] feat: testID property for use with e2e testing without
 interfering with a11y

---
 packages/core/ui/core/view/index.android.ts | 6 +++++-
 packages/core/ui/core/view/index.ios.ts     | 6 +++++-
 packages/core/ui/core/view/view-common.ts   | 7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index c7a5933e01..b3bd6b5ff7 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -3,7 +3,7 @@ import type { Point, CustomLayoutView as CustomLayoutViewDefinition } from '.';
 import type { GestureTypes, GestureEventData } from '../../gestures';
 
 // Types.
-import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty } from './view-common';
+import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty } from './view-common';
 import { paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length } from '../../styling/style-properties';
 import { layout } from '../../../utils';
 import { Trace } from '../../../trace';
@@ -796,6 +796,10 @@ export class View extends ViewCommon {
 		this.nativeViewProtected.setAlpha(float(value));
 	}
 
+	[testIDProperty.setNative](value: string) {
+		this.nativeViewProtected.setContentDescription(value);
+	}
+
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.setFocusable(!!value);
 
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
index dfc05b5617..2d815d4c13 100644
--- a/packages/core/ui/core/view/index.ios.ts
+++ b/packages/core/ui/core/view/index.ios.ts
@@ -2,7 +2,7 @@
 import { Point, View as ViewDefinition } from '.';
 
 // Requires
-import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty } from './view-common';
+import { ViewCommon, isEnabledProperty, originXProperty, originYProperty, isUserInteractionEnabledProperty, testIDProperty } from './view-common';
 import { ShowModalOptions, hiddenProperty } from '../view-base';
 import { Trace } from '../../../trace';
 import { layout, iOSNativeHelper } from '../../../utils';
@@ -572,6 +572,10 @@ export class View extends ViewCommon implements ViewDefinition {
 		this.updateOriginPoint(this.originX, value);
 	}
 
+	[testIDProperty.setNative](value: string) {
+		this.nativeViewProtected.accessibilityIdentifier = value;
+	}
+
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.isAccessibilityElement = !!value;
 
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
index cce5a3838d..18bdc67db6 100644
--- a/packages/core/ui/core/view/view-common.ts
+++ b/packages/core/ui/core/view/view-common.ts
@@ -82,6 +82,8 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 	public accessibilityValue: string;
 	public accessibilityHint: string;
 
+	public testID: string;
+
 	public touchAnimation: boolean | TouchAnimationOptions;
 	public ignoreTouchAnimation: boolean;
 
@@ -1196,6 +1198,11 @@ const ignoreTouchAnimationProperty = new Property<ViewCommon, boolean>({
 });
 ignoreTouchAnimationProperty.register(ViewCommon);
 
+export const testIDProperty = new Property<ViewCommon, string>({
+	name: 'testID',
+});
+testIDProperty.register(ViewCommon);
+
 accessibilityIdentifierProperty.register(ViewCommon);
 accessibilityLabelProperty.register(ViewCommon);
 accessibilityValueProperty.register(ViewCommon);

From f0ba44e7201c5eba86239884b62771177c4516c6 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Thu, 3 Mar 2022 21:29:08 +0100
Subject: [PATCH 3/7] feat: better testID support along a11y

wip
---
 apps/toolbox/src/pages/a11y.xml              | 24 ++++++++---------
 packages/core/accessibility/index.android.ts |  4 ++-
 packages/core/global-types.d.ts              |  1 +
 packages/core/ui/core/view/index.android.ts  | 27 ++++++++++++++++----
 packages/core/ui/core/view/index.ios.ts      | 15 +++++++++--
 packages/core/ui/core/view/view-common.ts    |  4 +++
 packages/core/ui/text-base/index.android.ts  | 19 ++++++++++----
 7 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/apps/toolbox/src/pages/a11y.xml b/apps/toolbox/src/pages/a11y.xml
index 1cf0298045..d8c62cb364 100644
--- a/apps/toolbox/src/pages/a11y.xml
+++ b/apps/toolbox/src/pages/a11y.xml
@@ -7,25 +7,25 @@
     <GridLayout padding="20" class="a11y-demo-page">   
       <ScrollView>
           <StackLayout>
-            <Button text="Open Modal Page" class="view-item" tap="{{openModal}}" />
-            <Button text="Open Normal Page" class="view-item" tap="{{openNormal}}" />
+            <Button testID="openModalPageButton" text="Open Modal Page" class="view-item" tap="{{openModal}}" />
+            <Button testID="openNormalPageButton" text="Open Normal Page" class="view-item" tap="{{openNormal}}" />
 
-            <Label text="Accessible Label" class="view-item a11y text-center" accessibilityLabel="Accessible Label" accessibilityHint="Just a label" accessibilityRole="{{accessibilityRole.StaticText}}" accessibilityValue="Accessible Label" />
-            <Button text="Accessible Button" class="view-item a11y" accessibilityLabel="Accessible Button" accessibilityHint="Tapping this really does nothing" />
+            <Label testID="testLabel1" text="Accessible Label" class="view-item a11y text-center" accessibilityLabel="Accessible Label" accessibilityHint="Just a label" accessibilityRole="{{accessibilityRole.StaticText}}" accessibilityValue="Accessible Label" />
+            <Button testID="testLabel2" text="Accessible Button" class="view-item a11y" accessibilityLabel="Accessible Button" accessibilityHint="Tapping this really does nothing" />
             
-            <Image src="res://icon" width="50" class="view-item a11y" accessibilityLabel="Image with explicit attribute role" accessibilityRole="{{accessibilityRole.Image}}" />
-            <Image src="res://icon" width="50" class="view-item a11y a11y-role-image" accessibilityLabel="Image with css defined role" />
+            <Image testID="testImage1" src="res://icon" width="50" class="view-item a11y" accessibilityLabel="Image with explicit attribute role" accessibilityRole="{{accessibilityRole.Image}}" />
+            <Image testID="testImage2" src="res://icon" width="50" class="view-item a11y a11y-role-image" accessibilityLabel="Image with css defined role" />
             
             
             <Image src="{{ largeImageSrc }}" width="50" class="view-item a11y a11y-role-image" accessibilityLabel="Image with css defined role" />
 
-            <Switch checked="true" class="view-item a11y" accessibilityLabel="Switch with attribute state" accessibilityState="{{accessibilityState.Checked}}" checkedChange="{{checkedChange}}" />
-            <Switch checked="true" class="view-item a11y a11y-state-checked" accessibilityLabel="Switch with css state" checkedChange="{{checkedChange}}" />
+            <Switch testID="testSwitch1" checked="true" class="view-item a11y" accessibilityLabel="Switch with attribute state" accessibilityState="{{accessibilityState.Checked}}" checkedChange="{{checkedChange}}" />
+            <Switch testID="testSwitch2" checked="true" class="view-item a11y a11y-state-checked" accessibilityLabel="Switch with css state" checkedChange="{{checkedChange}}" />
 
-            <TextView hint="TextView" text="{{switchCheckedText}}" class="view-item a11y" accessibilityLabel="TestView with a value" accessibilityLiveRegion="{{accessibilityLiveRegions.Polite}}" />
-            <TextField hint="TextField" class="view-item a11y" accessibilityLabel="Plain jane TextField" accessibilityHint="Tell us your real name Jane" />
+            <TextView testID="testTextView" hint="TextView" text="{{switchCheckedText}}" class="view-item a11y" accessibilityLabel="TestView with a value" accessibilityLiveRegion="{{accessibilityLiveRegions.Polite}}" />
+            <TextField testID="testTextField" hint="TextField" class="view-item a11y" accessibilityLabel="Plain jane TextField" accessibilityHint="Tell us your real name Jane" />
             <TextView hint="TextView" class="view-item a11y" accessibilityLabel="Nice TextView" accessibilityHint="Tell us about yourself Jane" />
-            <GridLayout rows="25" columns="*" class="view-item" accessibilityLabel="No can go GridLayout" accessibilityHint="A grid that will not get bigger when increasing accessible text size">
+            <GridLayout testID="testGridLayout1" rows="25" columns="*" class="view-item" accessibilityLabel="No can go GridLayout" accessibilityHint="A grid that will not get bigger when increasing accessible text size">
               <Label text="IN-Accessible Grid" class="view-item text-center" />
             </GridLayout>
             <GridLayout rows="25,25" columns="*,50" class="view-item a11y" accessibilityLabel="Yes an accessible GridLayout" accessibilityHint="A grid that WILL get bigger dynamically when increasing accessible text size">
@@ -33,7 +33,7 @@
               <Label row="1" text="With another item in a row" class="view-item text-center" />
               <Label rowSpan="2" col="1" text="Hi" />
             </GridLayout>
-            <Slider value="10" minValue="0" maxValue="100" class="view-item a11y" accessibilityLabel="Slider" accessibilityHint="A smooth slider" accessibilityValue="10" />
+            <Slider testID="testSlider" value="10" minValue="0" maxValue="100" class="view-item a11y" accessibilityLabel="Slider" accessibilityHint="A smooth slider" accessibilityValue="10" />
           </StackLayout>
       </ScrollView>
     </GridLayout>
diff --git a/packages/core/accessibility/index.android.ts b/packages/core/accessibility/index.android.ts
index d268265ff4..d7914af7a7 100644
--- a/packages/core/accessibility/index.android.ts
+++ b/packages/core/accessibility/index.android.ts
@@ -645,7 +645,9 @@ function applyContentDescription(view: Partial<View>, forceUpdate?: boolean) {
 
 	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
 
-	if (contentDescription) {
+	if (view.testID) {
+		// todo:?
+	} else if (contentDescription) {
 		if (Trace.isEnabled()) {
 			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);
 		}
diff --git a/packages/core/global-types.d.ts b/packages/core/global-types.d.ts
index 1272d24e0c..e63f296015 100644
--- a/packages/core/global-types.d.ts
+++ b/packages/core/global-types.d.ts
@@ -133,6 +133,7 @@ declare const __CSS_PARSER__: string;
 declare const __NS_WEBPACK__: boolean;
 declare const __UI_USE_EXTERNAL_RENDERER__: boolean;
 declare const __UI_USE_XML_PARSER__: boolean;
+declare const __USE_TEST_ID__: boolean | undefined;
 declare const __ANDROID__: boolean;
 declare const __IOS__: boolean;
 
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
index b3bd6b5ff7..30ac9b62a6 100644
--- a/packages/core/ui/core/view/index.android.ts
+++ b/packages/core/ui/core/view/index.android.ts
@@ -797,7 +797,20 @@ export class View extends ViewCommon {
 	}
 
 	[testIDProperty.setNative](value: string) {
-		this.nativeViewProtected.setContentDescription(value);
+		this.setTestID(this.nativeViewProtected, value);
+	}
+
+	setTestID(view, value) {
+		if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__) {
+			const id = Utils.ad.resources.getId(':id/nativescript_accessibility_id');
+
+			if (id) {
+				view.setTag(id, value);
+				view.setTag(value);
+			}
+
+			view.setContentDescription(value);
+		}
 	}
 
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
@@ -807,11 +820,15 @@ export class View extends ViewCommon {
 	}
 
 	[accessibilityIdentifierProperty.setNative](value: string): void {
-		const id = Utils.ad.resources.getId(':id/nativescript_accessibility_id');
+		if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__ && this.testID) {
+			// ignore when using testID;
+		} else {
+			const id = Utils.ad.resources.getId(':id/nativescript_accessibility_id');
 
-		if (id) {
-			this.nativeViewProtected.setTag(id, value);
-			this.nativeViewProtected.setTag(value);
+			if (id) {
+				this.nativeViewProtected.setTag(id, value);
+				this.nativeViewProtected.setTag(value);
+			}
 		}
 	}
 
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
index 2d815d4c13..b91bf1eb3c 100644
--- a/packages/core/ui/core/view/index.ios.ts
+++ b/packages/core/ui/core/view/index.ios.ts
@@ -573,7 +573,13 @@ export class View extends ViewCommon implements ViewDefinition {
 	}
 
 	[testIDProperty.setNative](value: string) {
-		this.nativeViewProtected.accessibilityIdentifier = value;
+		this.setTestID(this.nativeViewProtected, value);
+	}
+
+	public setTestID(view: any, value: string): void {
+		if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__) {
+			view.accessibilityIdentifier = value;
+		}
 	}
 
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
@@ -585,8 +591,13 @@ export class View extends ViewCommon implements ViewDefinition {
 	[accessibilityIdentifierProperty.getDefault](): string {
 		return this.nativeViewProtected.accessibilityLabel;
 	}
+
 	[accessibilityIdentifierProperty.setNative](value: string): void {
-		this.nativeViewProtected.accessibilityIdentifier = value;
+		if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__ && this.testID) {
+			// ignore when using testID
+		} else {
+			this.nativeViewProtected.accessibilityIdentifier = value;
+		}
 	}
 
 	[accessibilityRoleProperty.setNative](value: AccessibilityRole): void {
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
index 18bdc67db6..298faa451d 100644
--- a/packages/core/ui/core/view/view-common.ts
+++ b/packages/core/ui/core/view/view-common.ts
@@ -1121,6 +1121,10 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 	public accessibilityScreenChanged(): void {
 		return;
 	}
+
+	public setTestID(view: any, value: string) {
+		return;
+	}
 }
 
 export const originXProperty = new Property<ViewCommon, number>({
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
index 6e69665919..32944e514c 100644
--- a/packages/core/ui/text-base/index.android.ts
+++ b/packages/core/ui/text-base/index.android.ts
@@ -15,6 +15,7 @@ import { layout } from '../../utils';
 import { isString, isNullOrUndefined } from '../../utils/types';
 import { accessibilityIdentifierProperty } from '../../accessibility/accessibility-properties';
 import * as Utils from '../../utils';
+import { testIDProperty } from '../../ui/core/view';
 
 export * from './text-base-common';
 
@@ -443,13 +444,21 @@ export class TextBase extends TextBaseCommon {
 		org.nativescript.widgets.ViewHelper.setPaddingLeft(this.nativeTextViewProtected, Length.toDevicePixels(value, 0) + Length.toDevicePixels(this.style.borderLeftWidth, 0));
 	}
 
+	[testIDProperty.setNative](value: string): void {
+		this.setTestID(this.nativeTextViewProtected, value);
+	}
+
 	[accessibilityIdentifierProperty.setNative](value: string): void {
-		// we override the default setter to apply it on nativeTextViewProtected
-		const id = Utils.ad.resources.getId(':id/nativescript_accessibility_id');
+		if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__ && this.testID) {
+			// ignore when using testID;
+		} else {
+			// we override the default setter to apply it on nativeTextViewProtected
+			const id = Utils.ad.resources.getId(':id/nativescript_accessibility_id');
 
-		if (id) {
-			this.nativeTextViewProtected.setTag(id, value);
-			this.nativeTextViewProtected.setTag(value);
+			if (id) {
+				this.nativeTextViewProtected.setTag(id, value);
+				this.nativeTextViewProtected.setTag(value);
+			}
 		}
 	}
 

From 33e6dfbb4ac293750b6626cee0ab5bfe425ed646 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Mon, 7 Mar 2022 21:24:29 +0100
Subject: [PATCH 4/7] fix: make sure we have a defined id

---
 packages/core/platforms/android/res/values/ids.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/core/platforms/android/res/values/ids.xml

diff --git a/packages/core/platforms/android/res/values/ids.xml b/packages/core/platforms/android/res/values/ids.xml
new file mode 100644
index 0000000000..7a40388f1f
--- /dev/null
+++ b/packages/core/platforms/android/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="nativescript_accessibility_id"/>
+</resources>

From a188b5c4366374d839f1cf0a3c0aa2091fe4b172 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Tue, 8 Mar 2022 18:49:02 +0100
Subject: [PATCH 5/7] feat: --env.e2e to enable testID

---
 packages/core/accessibility/index.android.ts                | 2 +-
 .../configuration/__snapshots__/angular.spec.ts.snap        | 6 ++++--
 .../__tests__/configuration/__snapshots__/base.spec.ts.snap | 6 ++++--
 .../configuration/__snapshots__/javascript.spec.ts.snap     | 6 ++++--
 .../configuration/__snapshots__/react.spec.ts.snap          | 4 ++++
 .../configuration/__snapshots__/svelte.spec.ts.snap         | 6 ++++--
 .../configuration/__snapshots__/typescript.spec.ts.snap     | 6 ++++--
 .../__tests__/configuration/__snapshots__/vue.spec.ts.snap  | 6 ++++--
 packages/webpack5/src/configuration/base.ts                 | 3 +++
 packages/webpack5/src/index.ts                              | 1 +
 10 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/core/accessibility/index.android.ts b/packages/core/accessibility/index.android.ts
index d7914af7a7..2c3358527e 100644
--- a/packages/core/accessibility/index.android.ts
+++ b/packages/core/accessibility/index.android.ts
@@ -645,7 +645,7 @@ function applyContentDescription(view: Partial<View>, forceUpdate?: boolean) {
 
 	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
 
-	if (view.testID) {
+	if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__ && view.testID) {
 		// todo:?
 	} else if (contentDescription) {
 		if (Trace.isEnabled()) {
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
index d6ad598891..3528816862 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
@@ -351,7 +351,8 @@ exports[`angular configuration for android 1`] = `
         __IOS__: false,
         'global.isAndroid': true,
         'global.isIOS': false,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
@@ -774,7 +775,8 @@ exports[`angular configuration for ios 1`] = `
         __IOS__: true,
         'global.isAndroid': false,
         'global.isIOS': true,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
index e6e48102c1..751e44ec46 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
@@ -262,7 +262,8 @@ exports[`base configuration for android 1`] = `
         __IOS__: false,
         'global.isAndroid': true,
         'global.isIOS': false,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
@@ -582,7 +583,8 @@ exports[`base configuration for ios 1`] = `
         __IOS__: true,
         'global.isAndroid': false,
         'global.isIOS': true,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
index 098dd5a2e2..a72f3b8de2 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
@@ -262,7 +262,8 @@ exports[`javascript configuration for android 1`] = `
         __IOS__: false,
         'global.isAndroid': true,
         'global.isIOS': false,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
@@ -591,7 +592,8 @@ exports[`javascript configuration for ios 1`] = `
         __IOS__: true,
         'global.isAndroid': false,
         'global.isIOS': true,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
index 92c19dea88..f78fa4ae01 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
@@ -285,6 +285,7 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
         'global.isAndroid': true,
         'global.isIOS': false,
         process: 'global.process',
+        __USE_TEST_ID__: false,
         __TEST__: false,
         'process.env.NODE_ENV': '\\"development\\"'
       }
@@ -616,6 +617,7 @@ exports[`react configuration > android > base config 1`] = `
         'global.isAndroid': true,
         'global.isIOS': false,
         process: 'global.process',
+        __USE_TEST_ID__: false,
         __TEST__: false,
         'process.env.NODE_ENV': '\\"development\\"'
       }
@@ -954,6 +956,7 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena
         'global.isAndroid': false,
         'global.isIOS': true,
         process: 'global.process',
+        __USE_TEST_ID__: false,
         __TEST__: false,
         'process.env.NODE_ENV': '\\"development\\"'
       }
@@ -1286,6 +1289,7 @@ exports[`react configuration > ios > base config 1`] = `
         'global.isAndroid': false,
         'global.isIOS': true,
         process: 'global.process',
+        __USE_TEST_ID__: false,
         __TEST__: false,
         'process.env.NODE_ENV': '\\"development\\"'
       }
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
index 76398655ea..49d960c770 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
@@ -289,7 +289,8 @@ exports[`svelte configuration for android 1`] = `
         __IOS__: false,
         'global.isAndroid': true,
         'global.isIOS': false,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
@@ -630,7 +631,8 @@ exports[`svelte configuration for ios 1`] = `
         __IOS__: true,
         'global.isAndroid': false,
         'global.isIOS': true,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap
index fd5828fc14..5831fac294 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap
@@ -262,7 +262,8 @@ exports[`typescript configuration for android 1`] = `
         __IOS__: false,
         'global.isAndroid': true,
         'global.isIOS': false,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
@@ -591,7 +592,8 @@ exports[`typescript configuration for ios 1`] = `
         __IOS__: true,
         'global.isAndroid': false,
         'global.isIOS': true,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
diff --git a/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap b/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap
index f5c5ae2e39..9c21da6c74 100644
--- a/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap
+++ b/packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap
@@ -302,7 +302,8 @@ exports[`vue configuration for android 1`] = `
         __IOS__: false,
         'global.isAndroid': true,
         'global.isIOS': false,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
@@ -656,7 +657,8 @@ exports[`vue configuration for ios 1`] = `
         __IOS__: true,
         'global.isAndroid': false,
         'global.isIOS': true,
-        process: 'global.process'
+        process: 'global.process',
+        __USE_TEST_ID__: false
       }
     ),
     /* config.plugin('CopyWebpackPlugin') */
diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts
index 842f28ea4c..54930f5f05 100644
--- a/packages/webpack5/src/configuration/base.ts
+++ b/packages/webpack5/src/configuration/base.ts
@@ -420,6 +420,9 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
 			/* for compat only */ 'global.isIOS': platform === 'ios',
 			process: 'global.process',
 
+			// enable testID when using --env.e2e
+			__USE_TEST_ID__: !!env.e2e,
+
 			// todo: ?!?!
 			// profile: '() => {}',
 		},
diff --git a/packages/webpack5/src/index.ts b/packages/webpack5/src/index.ts
index eb77451cb5..f4c73e4d63 100644
--- a/packages/webpack5/src/index.ts
+++ b/packages/webpack5/src/index.ts
@@ -46,6 +46,7 @@ export interface IWebpackEnv {
 	// misc
 	replace?: string[] | string;
 	watchNodeModules?: boolean;
+	e2e?: boolean;
 }
 
 interface IChainEntry {

From 7c05076a9f73b0964ec5c9f98ffb4316bf2dcc97 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Tue, 8 Mar 2022 19:12:20 +0100
Subject: [PATCH 6/7] chore: return if using testID

---
 packages/core/accessibility/index.android.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/accessibility/index.android.ts b/packages/core/accessibility/index.android.ts
index 2c3358527e..07f9d95151 100644
--- a/packages/core/accessibility/index.android.ts
+++ b/packages/core/accessibility/index.android.ts
@@ -646,7 +646,8 @@ function applyContentDescription(view: Partial<View>, forceUpdate?: boolean) {
 	const contentDescription = contentDescriptionBuilder.join('. ').trim().replace(/^\.$/, '');
 
 	if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__ && view.testID) {
-		// todo:?
+		// ignore when testID is enabled
+		return;
 	} else if (contentDescription) {
 		if (Trace.isEnabled()) {
 			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);

From 7d8e945a70a62987a67f69cb6d2a2c53e5687570 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Tue, 8 Mar 2022 22:44:33 +0100
Subject: [PATCH 7/7] chore: cleanup

---
 packages/core/accessibility/index.android.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/core/accessibility/index.android.ts b/packages/core/accessibility/index.android.ts
index 07f9d95151..78d531c413 100644
--- a/packages/core/accessibility/index.android.ts
+++ b/packages/core/accessibility/index.android.ts
@@ -648,7 +648,9 @@ function applyContentDescription(view: Partial<View>, forceUpdate?: boolean) {
 	if (typeof __USE_TEST_ID__ !== 'undefined' && __USE_TEST_ID__ && view.testID) {
 		// ignore when testID is enabled
 		return;
-	} else if (contentDescription) {
+	}
+
+	if (contentDescription) {
 		if (Trace.isEnabled()) {
 			Trace.write(`${cls} - set to "${contentDescription}"`, Trace.categories.Accessibility);
 		}