Skip to content

Commit 4208989

Browse files
Exporting E2E Data as NuGet Package (#2459)
* Changing location of E2E constants from /apps/fluent-tester to /apps/E2E. This consolidates data specific to E2E testing * Creating new NuGet package containing all E2E testing data, while removing unnecessary bundles * Reverting WDIO config file specs path * Change files * Fixing prettier * Removing bundle verb from E2E (not needed anymore) * Renaming index.win32 to index.consts to better represent file * Removing old NuGet package and creating new one that contains E2E directory * Modifying .ado nuget publish pipeline to include new package * Resolve conflict with FocusZone version * Removing unwanted change in tsconfig * Adding back rnx-kit without bundle potion
1 parent 4cb077c commit 4208989

File tree

203 files changed

+328
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+328
-382
lines changed

.ado/templates/win32-nuget-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ steps:
2424

2525
# Pack the NuGet package
2626
- task: CmdLine@1
27-
displayName: 'Create NuGet package for win32 test specs.'
27+
displayName: 'Create NuGet package for E2E testing directory'
2828
inputs:
2929
filename: nuget
30-
arguments: 'pack Microsoft.FluentUI.Win32.E2E.Testing.Specs.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -OutputFileNamesWithoutVersion -Verbosity detailed -Version $(Build.BuildNumber) -properties CommitId=$(Build.SourceVersion)'
30+
arguments: 'pack Microsoft.FluentUI.E2E.Testing.Data.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -OutputFileNamesWithoutVersion -Verbosity detailed -Version $(Build.BuildNumber) -properties CommitId=$(Build.SourceVersion)'
3131
workingFolder: 'apps/E2E/nuget'
3232

3333
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
@@ -54,8 +54,8 @@ steps:
5454

5555
# Push the NuGet package
5656
- task: NuGetCommand@2
57-
displayName: 'NuGet push Win32 test specs'
57+
displayName: 'NuGet push E2E testing package'
5858
inputs:
5959
command: push
60-
packagesToPush: '$(Build.ArtifactStagingDirectory)/Microsoft.FluentUI.Win32.E2E.Testing.Specs.nupkg'
60+
packagesToPush: '$(Build.ArtifactStagingDirectory)/Microsoft.FluentUI.E2E.Testing.Data.nupkg'
6161
publishVstsFeed: Office

apps/E2E/metro.config.js

Lines changed: 0 additions & 22 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
4-
<id>Microsoft.FluentUI.Win32.E2E.Testing.Specs</id>
4+
<id>Microsoft.FluentUI.E2E.Testing.Data</id>
55
<version>1.0.0</version>
6-
<title>FluentUI React Native's E2E Testing Specs for Win32</title>
6+
<title>FluentUI React Native's E2E Testing Assets</title>
77
<authors>Microsoft Office CXE</authors>
88
<projectUrl>https://github.com/microsoft/fluentui-react-native.git</projectUrl>
9-
<description>This package contains a JS bundle of all Win32 E2E testing specs using WebDriverIO and Appium. This exports a JS bundle in a NuGet package because the consuming test infrastructure is setup to pull in NuGet packages, but does not yet support NPM packages.</description>
9+
<description>This package contains all E2E testing data in FURN that allows us to run UI manipulation tests with WebDriverIO and Appium.</description>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<repository type="git"
1212
url="https://github.com/microsoft/fluentui-react-native.git"
1313
commit="$CommitId$" />
1414
</metadata>
1515
<files>
16-
<file src="..\dist\**" target="win32\specs" />
16+
<file src="..\src\**" target="E2E" />
1717
</files>
1818
</package>

apps/E2E/package.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"license": "MIT",
66
"scripts": {
77
"build": "fluentui-scripts build",
8-
"bundle": "react-native rnx-bundle --dev false",
98
"e2etest:ios": "wdio run wdio.conf.ios.js",
109
"e2etest:macos": "wdio run wdio.conf.macos.js",
1110
"e2etest:windows": "rimraf errorShots/* reports/* && wdio run wdio.conf.windows.js"
@@ -49,25 +48,6 @@
4948
"rnx-kit": {
5049
"reactNativeVersion": "0.68",
5150
"kitType": "library",
52-
"bundle": [
53-
{
54-
"id": "win32_specs",
55-
"entryFile": "src/index.win32.ts",
56-
"bundleOutput": "dist/win32_specs.bundle.js",
57-
"sourcemapOutput": "dist/win32_specs.bundle.map",
58-
"assetsDest": "dist",
59-
"targets": [
60-
"native"
61-
],
62-
"detectCyclicDependencies": {
63-
"throwOnError": true
64-
},
65-
"detectDuplicateDependencies": {
66-
"throwOnError": false
67-
},
68-
"typescriptValidation": false
69-
}
70-
],
7151
"capabilities": [
7252
"core",
7353
"react",

apps/E2E/src/ActivityIndicator/pages/ActivityIndicatorPageObject.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
HOMEPAGE_ACTIVITY_INDICATOR_BUTTON,
3-
ACTIVITY_INDICATOR_TESTPAGE,
4-
ACTIVITY_INDICATOR_TEST_COMPONENT,
5-
} from '../../../../fluent-tester/src/TestComponents/ActivityIndicator/consts';
1+
import { HOMEPAGE_ACTIVITY_INDICATOR_BUTTON, ACTIVITY_INDICATOR_TESTPAGE, ACTIVITY_INDICATOR_TEST_COMPONENT } from '../consts';
62
import { BasePage, By } from '../../common/BasePage';
73

84
class ActivityIndicatorPageObject extends BasePage {

apps/E2E/src/Avatar/pages/AvatarPageObject.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
HOMEPAGE_AVATAR_BUTTON,
44
AVATAR_TEST_COMPONENT,
55
AVATAR_SECONDARY_TEST_COMPONENT,
6-
} from '../../../../fluent-tester/src/TestComponents/Avatar/consts';
6+
} from '../consts';
77
import { BasePage, By } from '../../common/BasePage';
88

99
export const enum AvatarComponentSelector {

apps/E2E/src/Avatar/specs/Avatar.spec.win.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
ACCESSIBILITY_ROLE_ATTRIBUTE,
1111
ACCESSIBILITY_ROLE_IMAGE,
1212
ACCESSIBILITY_ROLE_LINK,
13-
} from '../../../../fluent-tester/src/TestComponents/Avatar/consts';
13+
} from '../consts';
1414

1515
// Before testing begins, allow up to 60 seconds for app to open
1616
describe('Avatar Testing Initialization', function () {

0 commit comments

Comments
 (0)