mirror of https://github.com/ppy/osu
Add test coverage of menu banner link opening
This commit is contained in:
parent
ed64bfff8d
commit
53b7c29488
|
@ -6,6 +6,7 @@
|
|||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Testing;
|
||||
using osu.Game.Online.API.Requests.Responses;
|
||||
using osu.Game.Overlays;
|
||||
using osu.Game.Screens.Menu;
|
||||
using osuTK.Input;
|
||||
|
||||
|
@ -15,8 +16,14 @@ public partial class TestSceneMainMenu : OsuGameTestScene
|
|||
{
|
||||
private OnlineMenuBanner onlineMenuBanner => Game.ChildrenOfType<OnlineMenuBanner>().Single();
|
||||
|
||||
public override void SetUpSteps()
|
||||
{
|
||||
base.SetUpSteps();
|
||||
AddStep("don't fetch online content", () => onlineMenuBanner.FetchOnlineContent = false);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestOnlineMenuBanner()
|
||||
public void TestOnlineMenuBannerTrusted()
|
||||
{
|
||||
AddStep("set online content", () => onlineMenuBanner.Current.Value = new APIMenuContent
|
||||
{
|
||||
|
@ -25,13 +32,51 @@ public void TestOnlineMenuBanner()
|
|||
new APIMenuImage
|
||||
{
|
||||
Image = @"https://assets.ppy.sh/main-menu/project-loved-2@2x.png",
|
||||
Url = @"https://osu.ppy.sh/home/news/2023-12-21-project-loved-december-2023",
|
||||
Url = $@"{API.WebsiteRootUrl}/home/news/2023-12-21-project-loved-december-2023",
|
||||
}
|
||||
}
|
||||
});
|
||||
AddAssert("system title not visible", () => onlineMenuBanner.State.Value, () => Is.EqualTo(Visibility.Hidden));
|
||||
AddStep("enter menu", () => InputManager.Key(Key.Enter));
|
||||
AddUntilStep("system title visible", () => onlineMenuBanner.State.Value, () => Is.EqualTo(Visibility.Visible));
|
||||
AddUntilStep("image loaded", () => onlineMenuBanner.ChildrenOfType<OnlineMenuBanner.MenuImage>().FirstOrDefault()?.IsLoaded, () => Is.True);
|
||||
|
||||
AddStep("click banner", () =>
|
||||
{
|
||||
InputManager.MoveMouseTo(onlineMenuBanner);
|
||||
InputManager.Click(MouseButton.Left);
|
||||
});
|
||||
|
||||
// Might not catch every occurrence due to async nature, but works in manual testing and saves annoying test setup.
|
||||
AddAssert("no dialog", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault()?.CurrentDialog == null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestOnlineMenuBannerUntrustedDomain()
|
||||
{
|
||||
AddStep("set online content", () => onlineMenuBanner.Current.Value = new APIMenuContent
|
||||
{
|
||||
Images = new[]
|
||||
{
|
||||
new APIMenuImage
|
||||
{
|
||||
Image = @"https://assets.ppy.sh/main-menu/project-loved-2@2x.png",
|
||||
Url = @"https://google.com",
|
||||
}
|
||||
}
|
||||
});
|
||||
AddAssert("system title not visible", () => onlineMenuBanner.State.Value, () => Is.EqualTo(Visibility.Hidden));
|
||||
AddStep("enter menu", () => InputManager.Key(Key.Enter));
|
||||
AddUntilStep("system title visible", () => onlineMenuBanner.State.Value, () => Is.EqualTo(Visibility.Visible));
|
||||
AddUntilStep("image loaded", () => onlineMenuBanner.ChildrenOfType<OnlineMenuBanner.MenuImage>().FirstOrDefault()?.IsLoaded, () => Is.True);
|
||||
|
||||
AddStep("click banner", () =>
|
||||
{
|
||||
InputManager.MoveMouseTo(onlineMenuBanner);
|
||||
InputManager.Click(MouseButton.Left);
|
||||
});
|
||||
|
||||
AddUntilStep("wait for dialog", () => Game.ChildrenOfType<DialogOverlay>().SingleOrDefault()?.CurrentDialog != null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -73,6 +73,9 @@ private void checkForUpdates()
|
|||
Task.Run(() => request.Perform())
|
||||
.ContinueWith(r =>
|
||||
{
|
||||
if (!FetchOnlineContent)
|
||||
return;
|
||||
|
||||
if (r.IsCompletedSuccessfully)
|
||||
Schedule(() => Current.Value = request.ResponseObject);
|
||||
|
||||
|
@ -170,6 +173,8 @@ public partial class MenuImage : OsuClickableContainer
|
|||
|
||||
private Sprite flash = null!;
|
||||
|
||||
public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
|
||||
|
||||
private ScheduledDelegate? openUrlAction;
|
||||
|
||||
public MenuImage(APIMenuImage image)
|
||||
|
|
Loading…
Reference in New Issue