Skip to content

Remove break for 4122 and reenable DManip test #4636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asklar merged 26 commits into from
Apr 19, 2020
Merged

Remove break for 4122 and reenable DManip test #4636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fdd1867
Publish fix
acoates-ms Apr 9, 2020
a53564d
Creating new Microsoft.ReactNative.sln (#4535)
jonthysell Apr 9, 2020
8bc5d3a
applying package updates ***NO_CI***
rnbot Apr 9, 2020
ddbfb04
Move playground app to use Microsoft.ReactNative (#4534)
acoates-ms Apr 9, 2020
59094fd
Bump beachball from 1.28.0 to 1.28.1 (#4539)
dependabot-preview[bot] Apr 9, 2020
f5db344
applying package updates ***NO_CI***
rnbot Apr 9, 2020
3ef811b
applying package updates ***NO_CI***
rnbot Apr 9, 2020
5201232
Enabling managed unit tests in CI loop (#4532)
jonthysell Apr 9, 2020
4aa64fa
applying package updates ***NO_CI***
rnbot Apr 9, 2020
ae4e4c9
Remove 'Delete Android SDK' from E2ETest (#4554)
jonthysell Apr 9, 2020
2f4fffa
Enable WebSocketModule unit tests (#4538)
JunielKatarn Apr 10, 2020
aa853d9
applying package updates ***NO_CI***
rnbot Apr 10, 2020
e10d541
Improve inner loop and error reporting (local CLI) (#4536)
asklar Apr 10, 2020
5bd5efb
applying package updates ***NO_CI***
rnbot Apr 10, 2020
f2a0d00
Don't set readyState on connection error (#4562)
JunielKatarn Apr 10, 2020
da695df
applying package updates ***NO_CI***
rnbot Apr 10, 2020
8fdada9
Bump @babel/core from 7.8.4 to 7.9.0 (#4565)
dependabot-preview[bot] Apr 10, 2020
e3449a3
Simplified C++ macros and improved their comments (#4568)
vmoroz Apr 10, 2020
380c1ad
applying package updates ***NO_CI***
rnbot Apr 10, 2020
cbe66c4
Merge branch 'master' of https://github.com/asklar/react-native-windows
asklar Apr 11, 2020
315810a
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
asklar Apr 14, 2020
901ffc9
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
asklar Apr 17, 2020
895c986
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
asklar Apr 17, 2020
7d894a7
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
asklar Apr 19, 2020
9a5f140
remove 4122 guard rail
Apr 19, 2020
ad88aef
re-enable dmanip test
asklar Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions packages/E2ETest/wdio/test/DirectManipulation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
6 changes: 0 additions & 6 deletions packages/E2ETest/windows/ReactUWPTestApp/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;E2ETEST_OVERRIDE_4122</DefineConstants>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
Expand Down