diff --git a/apps/E2E/global.d.ts b/apps/E2E/global.d.ts deleted file mode 100644 index 933d1318f..000000000 --- a/apps/E2E/global.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type {BrowserCommands} from 'webdriverio' - -declare global { - const browser: BrowserCommands; - const driver: BrowserCommands.Driver; - const $: BrowserCommands.$; -} \ No newline at end of file diff --git a/apps/E2E/package.json b/apps/E2E/package.json index 08430e5f3..ed81b7f09 100644 --- a/apps/E2E/package.json +++ b/apps/E2E/package.json @@ -41,7 +41,9 @@ "@types/react": "^18.2.0", "@wdio/appium-service": "8.29.1", "@wdio/cli": "8.35.1", + "@wdio/globals": "8.35.1", "@wdio/jasmine-framework": "8.35.1", + "@wdio/json-reporter": "8.32.4", "@wdio/local-runner": "8.35.1", "@wdio/spec-reporter": "8.32.4", "appium": "^2.5.1", diff --git a/apps/E2E/src/common/BasePage.ts b/apps/E2E/src/common/BasePage.ts index 5e8b4cc15..06fc335e2 100644 --- a/apps/E2E/src/common/BasePage.ts +++ b/apps/E2E/src/common/BasePage.ts @@ -299,7 +299,7 @@ export abstract class BasePage { const scrollDownKeys = [Keys.PAGE_DOWN]; await browser.waitUntil( async () => { - await FocusButton.addValue(scrollDownKeys); + await FocusButton.addValue(scrollDownKeys.join()); scrollDownKeys.push(Keys.PAGE_DOWN); return await ComponentToScrollTo.isDisplayed(); }, @@ -313,7 +313,7 @@ export abstract class BasePage { ); // We have this extra scroll here to ensure the whole component is visible. - await FocusButton.addValue(scrollDownKeys); + await FocusButton.addValue(scrollDownKeys.join()); } /* Scrolls to the specified or primary UI test element until it is displayed. */ diff --git a/apps/E2E/tsconfig.json b/apps/E2E/tsconfig.json index 447e192ea..758cef9cb 100644 --- a/apps/E2E/tsconfig.json +++ b/apps/E2E/tsconfig.json @@ -8,7 +8,7 @@ "*": ["*", "*.win32", "./*"], "src/*": ["./src/*", "src"] }, - "types": ["./global", "webdriverio", "@wdio/jasmine-framework", "node", "@types/jasmine"] + "types": ["@types/jasmine", "@wdio/globals/types", "@wdio/jasmine-framework", "node"] }, "include": ["src"] } diff --git a/apps/component-generator/component-templates/ComponentTemplate/src/__tests__/__snapshots__/ComponentName.test.tsx.snap b/apps/component-generator/component-templates/ComponentTemplate/src/__tests__/__snapshots__/ComponentName.test.tsx.snap new file mode 100644 index 000000000..7095a3bf2 --- /dev/null +++ b/apps/component-generator/component-templates/ComponentTemplate/src/__tests__/__snapshots__/ComponentName.test.tsx.snap @@ -0,0 +1,34 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ComponentName component tests ComponentName default 1`] = ` + + + Default text + + Your component + +`; diff --git a/apps/fluent-tester/package.json b/apps/fluent-tester/package.json index aeb6160ef..3fc0850ee 100644 --- a/apps/fluent-tester/package.json +++ b/apps/fluent-tester/package.json @@ -107,6 +107,7 @@ "@rnx-kit/metro-config": "^1.3.1", "@types/jasmine": "5.1.4", "@wdio/cli": "8.35.1", + "@wdio/globals": "8.35.1", "@wdio/jasmine-framework": "8.35.1", "flow-bin": "^0.113.0", "metro-config": "^0.80.0", diff --git a/apps/fluent-tester/tsconfig.json b/apps/fluent-tester/tsconfig.json index ca1970f77..758cef9cb 100644 --- a/apps/fluent-tester/tsconfig.json +++ b/apps/fluent-tester/tsconfig.json @@ -8,7 +8,7 @@ "*": ["*", "*.win32", "./*"], "src/*": ["./src/*", "src"] }, - "types": ["../E2E/global", "webdriverio", "@wdio/jasmine-framework", "node", "@types/jasmine"] + "types": ["@types/jasmine", "@wdio/globals/types", "@wdio/jasmine-framework", "node"] }, "include": ["src"] } diff --git a/change/@fluentui-react-native-e2e-testing-e022d127-0016-4f43-b8b3-aa167c0e83dd.json b/change/@fluentui-react-native-e2e-testing-e022d127-0016-4f43-b8b3-aa167c0e83dd.json new file mode 100644 index 000000000..fd0db0bcf --- /dev/null +++ b/change/@fluentui-react-native-e2e-testing-e022d127-0016-4f43-b8b3-aa167c0e83dd.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Wdio to v8", + "packageName": "@fluentui-react-native/e2e-testing", + "email": "safreibe@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-native-tester-8c74c475-7f8d-4c6e-a621-d37730ba31eb.json b/change/@fluentui-react-native-tester-8c74c475-7f8d-4c6e-a621-d37730ba31eb.json new file mode 100644 index 000000000..4088bbcc4 --- /dev/null +++ b/change/@fluentui-react-native-tester-8c74c475-7f8d-4c6e-a621-d37730ba31eb.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "Remove unnecessary code in tsconfig", + "packageName": "@fluentui-react-native/tester", + "email": "safreibe@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/tester_deps/package.json b/tester_deps/package.json index 264892144..e7e1ebdfe 100644 --- a/tester_deps/package.json +++ b/tester_deps/package.json @@ -17,15 +17,15 @@ "@types/react": "^18.2.0", "@wdio/appium-service": "8.29.1", "@wdio/cli": "8.35.1", + "@wdio/globals": "8.35.1", "@wdio/jasmine-framework": "8.35.1", + "@wdio/json-reporter": "8.32.4", "@wdio/local-runner": "8.35.1", - "@wdio/logger": "8.28.0", "@wdio/spec-reporter": "8.32.4", "appium": "2.5.1", "appium-windows-driver": "^2.12.18", "ts-node": "^10.7.0", "typescript": "^4.9.4", - "wdio-json-reporter": "3.0.0", "webdriverio": "8.35.1" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index a867fd428..8edd88892 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3294,7 +3294,9 @@ __metadata: "@types/react": "npm:^18.2.0" "@wdio/appium-service": "npm:8.29.1" "@wdio/cli": "npm:8.35.1" + "@wdio/globals": "npm:8.35.1" "@wdio/jasmine-framework": "npm:8.35.1" + "@wdio/json-reporter": "npm:8.32.4" "@wdio/local-runner": "npm:8.35.1" "@wdio/spec-reporter": "npm:8.32.4" appium: "npm:^2.5.1" @@ -4623,6 +4625,7 @@ __metadata: "@types/jasmine": "npm:5.1.4" "@warren-ms/react-native-icons": "npm:^0.0.13" "@wdio/cli": "npm:8.35.1" + "@wdio/globals": "npm:8.35.1" "@wdio/jasmine-framework": "npm:8.35.1" flow-bin: "npm:^0.113.0" metro-config: "npm:^0.80.0" @@ -8255,6 +8258,16 @@ __metadata: languageName: node linkType: hard +"@wdio/json-reporter@npm:8.32.4": + version: 8.32.4 + resolution: "@wdio/json-reporter@npm:8.32.4" + dependencies: + "@wdio/reporter": "npm:8.32.4" + "@wdio/types": "npm:8.32.4" + checksum: 10c0/52f6243dc08c285653837333b623377fd42fbe217af7dcde9f6cba64e26c7d2727e4cc6e610a61632d39276c1e0536e551fea3df340174a4c1a4602acb72acc9 + languageName: node + linkType: hard + "@wdio/local-runner@npm:8.35.1": version: 8.35.1 resolution: "@wdio/local-runner@npm:8.35.1"