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

Merge branch 'master' into general-slider-improvements

Browse Source
This commit is contained in:
Dan Balasescu 2018-02-21 18:04:26 +09:00 committed by GitHub
commit e097d8dcd3
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-framework

@ -1 +1 @@
Subproject commit 458ebc2d4626c74bb8059cd28b44eb7adba74fbb Subproject commit f6fa5b80ed06f84c8fd25a2576eea8d51565785c

4
osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
View File

@ -60,7 +60,9 @@ namespace osu.Game.Tests.Visual
AddStep("Load Beatmaps", () => { carousel.BeatmapSets = beatmapSets; }); AddStep("Load Beatmaps", () => { carousel.BeatmapSets = beatmapSets; });
AddUntilStep(() => carousel.BeatmapSets.Any(), "Wait for load"); bool changed = false;
carousel.BeatmapSetsChanged = () => changed = true;
AddUntilStep(() => changed, "Wait for load");
testTraversal(); testTraversal();
testFiltering(); testFiltering();