Show remaining attempts again on playlist screen #15307
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Read the source and tested manually, seems fine. Would have preferred to have tests obviously but if it's prohibitively difficult to get them in place I'm not going to insist on it. |
|
Still aren't able to add tests for this, but here's a diff on top of #15316 for the display portion. Ready button still needs testing but I don't even want to start on that until the playlist online tests are in a better state. Still recommending this PR is merged as-is and tests are added as a follow-up, since it's a pretty annoying regression that I would like to get out in this week's release. diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistCreation.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistCreation.cs
index c4e6f41f27..8b07719d6b 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistCreation.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistCreation.cs
@@ -15,6 +15,7 @@
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Playlists;
using osu.Game.Screens.Play;
using osu.Game.Tests.Visual.OnlinePlay;
@@ -66,6 +67,32 @@ public void TestLoadSimpleMatch()
});
});
+ AddUntilStep("Progress details are hidden", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent.Alpha == 0);
+
+ AddStep("start match", () => match.ChildrenOfType<PlaylistsReadyButton>().First().TriggerClick());
+ AddUntilStep("player loader loaded", () => Stack.CurrentScreen is PlayerLoader);
+ }
+
+ [Test]
+ public void TestAttemptLimitedMatch()
+ {
+ setupAndCreateRoom(room =>
+ {
+ room.RoomID.Value = 1; // forces room creation.
+ room.Name.Value = "my awesome room";
+ room.MaxAttempts.Value = 5;
+ room.Host.Value = API.LocalUser.Value;
+ room.RecentParticipants.Add(room.Host.Value);
+ room.EndDate.Value = DateTimeOffset.Now.AddMinutes(5);
+ room.Playlist.Add(new PlaylistItem
+ {
+ Beatmap = { Value = importedBeatmap.Value.Beatmaps.First() },
+ Ruleset = { Value = new OsuRuleset().RulesetInfo }
+ });
+ });
+
+ AddUntilStep("Progress details are visible", () => match.ChildrenOfType<RoomLocalUserInfo>().FirstOrDefault()?.Parent.Alpha == 1);
+
AddStep("start match", () => match.ChildrenOfType<PlaylistsReadyButton>().First().TriggerClick());
AddUntilStep("player loader loaded", () => Stack.CurrentScreen is PlayerLoader);
} |
bdach
approved these changes
Oct 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also adds tooltips and disabled state to the ready button in the case of exhausted attempts.
No tests yet because the existing test scenes aren't flexible enough to add them. I'll look into adding tests later today unless it's deemed that they aren't required.
Closes #15274.