h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-09 18:45:04 +08:00
Code Issues Releases Wiki Activity

Merge pull request #8431 from peppy/fix-intro-tests

Browse Source 
Fix intro tests not asserting pass or working at all
This commit is contained in:
Dan Balasescu 2020-03-25 19:25:26 +09:00 committed by GitHub
commit e7f32d951d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Menus/IntroTestScene.cs
View File

@ -64,6 +64,8 @@ namespace osu.Game.Tests.Visual.Menus
introStack.Push(CreateScreen()); introStack.Push(CreateScreen());
}); });
AddUntilStep("wait for menu", () => introStack.CurrentScreen is MainMenu);
} }
protected abstract IScreen CreateScreen(); protected abstract IScreen CreateScreen();

4
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -140,7 +140,7 @@ namespace osu.Game.Screens.Menu
preloadSongSelect(); preloadSongSelect();
} }
[Resolved] [Resolved(canBeNull: true)]
private OsuGame game { get; set; } private OsuGame game { get; set; }
private void confirmAndExit() private void confirmAndExit()
@ -148,7 +148,7 @@ namespace osu.Game.Screens.Menu
if (exitConfirmed) return; if (exitConfirmed) return;
exitConfirmed = true; exitConfirmed = true;
game.PerformFromScreen(menu => menu.Exit()); game?.PerformFromScreen(menu => menu.Exit());
} }
private void preloadSongSelect() private void preloadSongSelect()