Merge branch 'master' into fix-relative-link-resolution

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs

@@ -141,14 +141,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Room createRoom(Action<Room> initFunc = null)
         {
-            var room = new Room();
-
-            room.Name.Value = "test room";
-            room.Playlist.Add(new PlaylistItem
+            var room = new Room
             {
-                Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
-                Ruleset = { Value = Ruleset.Value }
-            });
+                Name =
+                {
+                    Value = "test room"
+                },
+                Playlist =
+                {
+                    new PlaylistItem
+                    {
+                        Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
+                        Ruleset = { Value = Ruleset.Value }
+                    }
+                }
+            };
 
             initFunc?.Invoke(room);
             return room;

osu.Game.Tests/Visual/Online/TestSceneWikiHeader.cs

@@ -0,0 +1,102 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Wiki;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneWikiHeader : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Orange);
+
+        [Cached]
+        private readonly Bindable<APIWikiPage> wikiPageData = new Bindable<APIWikiPage>(new APIWikiPage
+        {
+            Title = "Main Page",
+            Path = "Main_Page",
+        });
+
+        private TestHeader header;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = header = new TestHeader
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                ShowIndexPage = dummyShowIndexPage,
+                ShowParentPage = dummyShowParentPage,
+            };
+            wikiPageData.BindTo(header.WikiPageData);
+        });
+
+        [Test]
+        public void TestWikiHeader()
+        {
+            AddAssert("Current is index", () => checkCurrent("index"));
+
+            AddStep("Change wiki page data", () => wikiPageData.Value = new APIWikiPage
+            {
+                Title = "Welcome",
+                Path = "Welcome"
+            });
+            AddAssert("Current is welcome", () => checkCurrent("Welcome"));
+            AddAssert("Check breadcrumb", checkBreadcrumb);
+
+            AddStep("Change current to index", () => header.Current.Value = "index");
+            AddAssert("Current is index", () => checkCurrent("index"));
+
+            AddStep("Change wiki page data", () => wikiPageData.Value = new APIWikiPage
+            {
+                Title = "Developers",
+                Path = "People/The_Team/Developers",
+                Subtitle = "The Team",
+            });
+            AddAssert("Current is 'Developers'", () => checkCurrent("Developers"));
+            AddAssert("Check breadcrumb", checkBreadcrumb);
+
+            AddStep("Change current to 'The Team'", () => header.Current.Value = "The Team");
+            AddAssert("Current is 'The Team'", () => checkCurrent("The Team"));
+            AddAssert("Check breadcrumb", checkBreadcrumb);
+        }
+
+        private bool checkCurrent(string expectedCurrent) => header.Current.Value == expectedCurrent;
+
+        private bool checkBreadcrumb()
+        {
+            var result = header.TabControlItems.Contains(wikiPageData.Value.Title);
+
+            if (wikiPageData.Value.Subtitle != null)
+                result = header.TabControlItems.Contains(wikiPageData.Value.Subtitle) && result;
+
+            return result;
+        }
+
+        private void dummyShowIndexPage() => wikiPageData.SetDefault();
+
+        private void dummyShowParentPage()
+        {
+            wikiPageData.Value = new APIWikiPage
+            {
+                Path = "People/The_Team",
+                Title = "The Team",
+                Subtitle = "People"
+            };
+        }
+
+        private class TestHeader : WikiHeader
+        {
+            public IReadOnlyList<string> TabControlItems => TabControl.Items;
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs

@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestLink()
         {
-            AddStep("set current path", () => markdownContainer.CurrentPath = "Article_styling_criteria/");
+            AddStep("set current path", () => markdownContainer.CurrentPath = $"{API.WebsiteRootUrl}/wiki/Article_styling_criteria/");
 
             AddStep("set '/wiki/Main_Page''", () => markdownContainer.Text = "[wiki main page](/wiki/Main_Page)");
             AddAssert("check url", () => markdownContainer.Link.Url == $"{API.WebsiteRootUrl}/wiki/Main_Page");
@@ -113,7 +113,7 @@ needs_cleanup: true
             AddStep("Add relative image", () =>
             {
                 markdownContainer.DocumentUrl = "https://dev.ppy.sh";
-                markdownContainer.CurrentPath = "Interface/";
+                markdownContainer.CurrentPath = $"{API.WebsiteRootUrl}/wiki/Interface/";
                 markdownContainer.Text = "![intro](img/intro-screen.jpg)";
             });
         }
@@ -124,7 +124,7 @@ needs_cleanup: true
             AddStep("Add paragraph with block image", () =>
             {
                 markdownContainer.DocumentUrl = "https://dev.ppy.sh";
-                markdownContainer.CurrentPath = "Interface/";
+                markdownContainer.CurrentPath = $"{API.WebsiteRootUrl}/wiki/Interface/";
                 markdownContainer.Text = @"Line before image
 
 ![play menu](img/play-menu.jpg ""Main Menu in osu!"")