Upgrade Appium to v2 and Fix Local E2E Testing (#3072)

* Adding resolutions to specific packages with security vulnerabilities

* Remove

* Adding whitespace

* Revert

* Removing unused file

* Updating appium deps in /E2E

* Removing E2E testing assets from apps/win32. Will host in apps/e2e

* Moving wdio.win32 to apps/E2E

* No hoisting packages in apps/E2E so we can run Appium locally without extra setup

* Fixing pipeline to run win32 e2e tests

* Updating tester_deps packages

* Add extra wait command before returning element

* Change files

* Reverting change

* Locking down package

* Update package.json

* Updating yarn.lock

* Update package.json

.ado/templates/e2e-testing-win32.yml

@@ -27,13 +27,13 @@ steps:
 
   - script: |
       yarn appium driver install --source=npm appium-windows-driver
-    workingDirectory: apps/win32
+    workingDirectory: apps/E2E
     displayName: 'Install appium driver'
     condition: succeeded()
 
   - script: |
-      yarn e2etest
+      yarn e2etest:win32
-    workingDirectory: apps/win32
+    workingDirectory: apps/E2E
     displayName: 'run E2E Win32 tests'
     condition: succeeded()
 
@@ -42,4 +42,4 @@ steps:
       applicationType: win32
       platform: 'win32'
       buildArtifacts: variables['task.Build.status']
-      directory: $(Build.SourcesDirectory)/apps/win32
+      directory: $(Build.SourcesDirectory)/apps/E2E

apps/E2E/package.json

@@ -9,6 +9,7 @@
     "e2etest:android": "wdio run wdio.conf.android.js",
     "e2etest:ios": "wdio run wdio.conf.ios.js",
     "e2etest:macos": "wdio run wdio.conf.macos.js",
+    "e2etest:win32": "wdio run wdio.conf.win32.js",
     "e2etest:windows": "rimraf errorShots reports && wdio run wdio.conf.windows.js"
   },
   "repository": {
@@ -38,10 +39,10 @@
     "@wdio/jasmine-framework": "7.26.0",
     "@wdio/local-runner": "7.30.1",
     "@wdio/spec-reporter": "7.29.1",
-    "appium": "2.0.0-beta.55",
+    "appium": "2.0.0",
-    "appium-mac2-driver": "1.5.1",
+    "appium-mac2-driver": "^1.7.0",
-    "appium-uiautomator2-driver": "^2.12.3",
+    "appium-uiautomator2-driver": "^2.29.0",
-    "appium-windows-driver": "2.3.5",
+    "appium-windows-driver": "^2.12.0",
     "appium-xcuitest-driver": "4.16.12",
     "metro-config": "^0.73.7",
     "metro-react-native-babel-preset": "^0.73.7",
@@ -50,6 +51,9 @@
     "typescript": "4.9.4",
     "webdriverio": "7.30.1"
   },
+  "installConfig": {
+    "hoistingLimits": "dependencies"
+  },
   "rnx-kit": {
     "kitType": "app",
     "alignDeps": {

apps/E2E/wdio.conf.win32.js

@@ -2,7 +2,8 @@ const path = require('path');
 const fs = require('fs');
 
 const appPath = path.resolve(path.dirname(require.resolve('@office-iss/rex-win32/rex-win32.js')), 'ReactTest.exe');
-const appArgs = 'basePath ' + path.resolve('dist') + ' plugin defaultplugin bundle index.win32 component FluentTester';
+const appArgs =
+  'basePath ' + path.join(__dirname, '..', 'win32', 'dist') + ' plugin defaultplugin bundle index.win32 component FluentTester';
 const appDir = path.dirname(require.resolve('@office-iss/rex-win32/rex-win32.js'));
 
 const defaultWaitForTimeout = 20000;

apps/win32/package.json

@@ -21,7 +21,6 @@
     "run-win32-web": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useWebDebugger --windowTitle \"FluentUI Tester\" --useFastRefresh --pluginProps --debugBundlePath index --jsEngine v8",
     "run-win32-dev-web": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useDevMain --useWebDebugger --windowTitle \"FluentUI Tester\" --useFastRefresh --pluginProps --debugBundlePath index --jsEngine v8",
     "run-win32-devmain": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDevMain --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8",
-    "e2etest": "rimraf reports && wdio",
     "prettier": "fluentui-scripts prettier",
     "prettier-fix": "fluentui-scripts prettier --fix true"
   },
@@ -44,25 +43,14 @@
     "@office-iss/rex-win32": "0.71.15-devmain.16608.10000",
     "@rnx-kit/cli": "^0.16.2",
     "@rnx-kit/metro-config": "^1.3.1",
-    "@types/jasmine": "3.10.3",
     "@types/react": "^18.2.0",
-    "@wdio/allure-reporter": "7.30.1",
-    "@wdio/appium-service": "7.30.0",
-    "@wdio/cli": "7.30.1",
-    "@wdio/jasmine-framework": "7.26.0",
-    "@wdio/local-runner": "7.30.1",
-    "@wdio/spec-reporter": "7.29.1",
-    "allure-commandline": "2.13.0",
-    "appium": "2.0.0-beta.55",
-    "appium-windows-driver": "2.3.5",
     "metro-config": "^0.73.7",
     "metro-react-native-babel-preset": "^0.73.7",
     "react-native-svg-transformer": "^1.0.0",
     "react-test-renderer": "18.2.0",
     "rimraf": "^5.0.1",
     "ts-node": "^8.10.1",
-    "typescript": "4.9.4",
+    "typescript": "4.9.4"
-    "webdriverio": "7.30.1"
   },
   "jest": {
     "preset": "react-native"

apps/win32/tsconfig.json

@@ -7,7 +7,6 @@
       "*": ["*", "*.win32"],
       "src/*": ["./src/*"]
     },
-    "types": ["webdriverio/async", "@wdio/jasmine-framework", "node", "@types/jasmine"]
   },
-  "include": ["src", "../fluent-tester/src"]
+  "include": ["src"]
 }

change/@fluentui-react-native-e2e-testing-95451924-796d-4731-b3d5-79d887c10864.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Removing E2E testing assets from apps/win32. Will host in apps/e2e",
+  "packageName": "@fluentui-react-native/e2e-testing",
+  "email": "safreibe@microsoft.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-react-native-tester-win32-24f592f9-f6ca-4cbd-a95e-bc617b9dce7c.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Moving wdio.win32 to apps/E2E",
+  "packageName": "@fluentui-react-native/tester-win32",
+  "email": "safreibe@microsoft.com",
+  "dependentChangeType": "patch"
+}

tester_deps/package.json

@@ -20,8 +20,8 @@
     "@wdio/jasmine-framework": "7.26.0",
     "@wdio/local-runner": "7.30.1",
     "@wdio/spec-reporter": "7.29.1",
-    "appium": "2.0.0-beta.55",
+    "appium": "^2.0.0",
-    "appium-windows-driver": "2.3.5",
+    "appium-windows-driver": "^2.12.0",
     "ts-node": "^10.7.0",
     "typescript": "^4.9.4",
     "wdio-json-reporter": "3.0.0",