diff --git a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts index 6e97bb96599..bc609af6a41 100644 --- a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts +++ b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts @@ -28,9 +28,6 @@ describe('DirectManipulationTest', () => { result.includes('width=50'), 'measureLayout response has correct width' ); - // https://github.com/microsoft/react-native-windows/issues/4122 - // Un-comment this when bug 4122 is fixed - // E2ETEST_OVERRIDE_4122 - // assert.ok(result.includes('x=20;'), 'measureLayout response x=20'); + assert.ok(result.includes('x=20;'), 'measureLayout response x=20'); }); }); diff --git a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs index 0a6a8c61fd0..d813eb85f37 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs +++ b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs @@ -56,12 +56,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e) base.OnLaunched(e); SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = AppViewBackButtonVisibility.Collapsed; ApplicationView.GetForCurrentView().TryResizeView(new Size(800, 600)); -#if !E2ETEST_OVERRIDE_4122 -#error [E2ETest] - There is a bug in Yoga with v142/VS2019 that makes the masters for this app different in Release|x64 than in other platforms. -#error However we want to test what people will be shipping. As a result, the tree dump output won't match the masters (which have the bug). -#error You can disable this warning by defining the constant E2ETEST_OVERRIDE_4122 in the project properties page under "Define Constants" -#error For more information see https://github.com/microsoft/react-native-windows/issues/4122 -#endif if (DisplayInformation.GetForCurrentView().ResolutionScale != ResolutionScale.Scale100Percent) { throw new Exception("A bug requires this app to run at 100% for accurate results - See https://github.com/microsoft/react-native-windows/issues/4619"); diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj index 6611c1e40c4..07275254969 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj +++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj @@ -81,7 +81,7 @@ bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;E2ETEST_OVERRIDE_4122 + TRACE;NETFX_CORE;WINDOWS_UWP; true ;2008 pdbonly