From fe11426238eaf2713414ddc63b0499df4c4b66ba Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 15:35:44 +0200
Subject: [PATCH] Disable appearance of the stable import prompt waiting for
 user interaction in tests, which caused them to fail.

---
 .../Navigation/TestScenePerformFromScreen.cs  | 21 ++++++++++++-------
 osu.Game/Screens/Select/SongSelect.cs         |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 2791952b66..078bb817f8 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -37,17 +37,17 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestPerformAtSongSelect()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
-            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
+            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(TestPlaySongSelect) }));
             AddAssert("did perform", () => actionPerformed);
-            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is TestPlaySongSelect);
         }
 
         [Test]
         public void TestPerformAtMenuFromSongSelect()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
             AddUntilStep("returned to menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
@@ -57,18 +57,18 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestPerformAtSongSelectFromPlayerLoader()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
             PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
-            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
-            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(TestPlaySongSelect) }));
+            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is TestPlaySongSelect);
             AddAssert("did perform", () => actionPerformed);
         }
 
         [Test]
         public void TestPerformAtMenuFromPlayerLoader()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
             PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
@@ -187,5 +187,10 @@ namespace osu.Game.Tests.Visual.Navigation
                 return base.OnExiting(next);
             }
         }
+
+        public class TestPlaySongSelect : PlaySongSelect
+        {
+            protected override bool DisplayStableImportPrompt => false;
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d8ad752151..5a48ee7606 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
+        protected virtual bool DisplayStableImportPrompt => true;
+
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
         /// </summary>
@@ -282,7 +284,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable)
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable && DisplayStableImportPrompt)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {