fix: add client only test for FinishLoadScene (#262)

* fix: NRE when server is not present * fix: add test for FinishLoadScene Client Only
MirageNet · Jul 12, 2020 · 50e7fa6 · 50e7fa6
1 parent 7741fb1
commit 50e7fa6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/Assets/Mirror/Runtime/NetworkSceneManager.cs b/Assets/Mirror/Runtime/NetworkSceneManager.cs
@@ -133,7 +133,7 @@ internal void FinishLoadScene()
                 FinishLoadSceneHost();
             }
             // server-only mode?
-            else if (server.Active)
+            else if (server && server.Active)
             {
                 FinishLoadSceneServerOnly();
             }

diff --git a/Assets/Mirror/Tests/Runtime/NetworkSceneManagerTests.cs b/Assets/Mirror/Tests/Runtime/NetworkSceneManagerTests.cs
@@ -190,5 +190,29 @@ public void ClientSceneMessageExceptionTest()
                 client.sceneManager.ClientSceneMessage(null, new SceneMessage());
             });
         }
+
+        int onAuthInvokeCounter;
+        void TestOnAuthenticatedInvoke(INetworkConnection conn)
+        {
+            onAuthInvokeCounter++;
+        }
+
+        int onOnClientSceneChangedCounter;
+        void TestOnClientSceneChangedInvoke(INetworkConnection conn)
+        {
+            onOnClientSceneChangedCounter++;
+        }
+
+        [Test]
+        public void FinishLoadSceneHostTest()
+        {
+            client.Authenticated.AddListener(TestOnAuthenticatedInvoke);
+            client.sceneManager.ClientSceneChanged.AddListener(TestOnClientSceneChangedInvoke);
+
+            client.sceneManager.FinishLoadScene();
+
+            Assert.That(onAuthInvokeCounter, Is.EqualTo(1));
+            Assert.That(onOnClientSceneChangedCounter, Is.EqualTo(1));
+        }
     }
 }