Merge branch 'master' into fix-ss-track-playback

This commit is contained in:
Dan Balasescu
2019-10-09 12:26:07 +09:00
committed by GitHub
42 changed files with 493 additions and 401 deletions

View File

@ -187,12 +187,10 @@ namespace osu.Game.Tests.Visual.SongSelect
}
[Test]
[Ignore("needs fixing")]
public void TestImportUnderDifferentRuleset()
{
createSongSelect();
changeRuleset(2);
addRulesetImportStep(0);
addRulesetImportStep(2);
AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmap == null);
}