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

Merge branch 'master' into add-slider-tail-todo

Browse Source
This commit is contained in:
Dan Balasescu 2019-10-09 11:53:27 +09:00 committed by GitHub
commit 34d50e3b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
View File

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

2
osu.Game.Tests/Visual/Editor/TestSceneWaveContainer.cs → osu.Game.Tests/Visual/UserInterface/TestSceneWaveContainer.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Graphics.Sprites;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
namespace osu.Game.Tests.Visual.Editor namespace osu.Game.Tests.Visual.UserInterface
{ {
[TestFixture] [TestFixture]
public class TestSceneWaveContainer : OsuTestScene public class TestSceneWaveContainer : OsuTestScene