fix: bug Client ConnectionState not set properly in Disconnect (#369)

* bug: client connectionState not properly set on Disconnect * fix: remove None state as its confusing and useless
MirageNet · Oct 2, 2020 · 74298c5 · 74298c5
1 parent 46b2115
commit 74298c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkClient.cs b/Assets/Mirror/Runtime/NetworkClient.cs
@@ -13,10 +13,9 @@ namespace Mirror
 
     public enum ConnectState
     {
-        None,
+        Disconnected,
         Connecting,
         Connected,
-        Disconnected
     }
 
     /// <summary>
@@ -64,7 +63,7 @@ public class NetworkClient : MonoBehaviour, INetworkClient
         /// </summary>
         public NetworkIdentity LocalPlayer => Connection?.Identity;
 
-        internal ConnectState connectState = ConnectState.None;
+        internal ConnectState connectState = ConnectState.Disconnected;
 
         /// <summary>
         /// active is true while a client is connecting/connected
@@ -337,7 +336,7 @@ void Cleanup()
             isSpawnFinished = false;
             hostServer = null;
 
-            connectState = ConnectState.None;
+            connectState = ConnectState.Disconnected;
 
             if (authenticator != null)
             {

diff --git a/Assets/Tests/Runtime/ClientServerComponentTests.cs b/Assets/Tests/Runtime/ClientServerComponentTests.cs
@@ -129,5 +129,13 @@ GameObject SpawnDelegateTest(Vector3 position, Guid assetId)
             }
             return null;
         }
+
+        [UnityTest]
+        public IEnumerator ClientDisconnectTest() => RunAsync(async () =>
+        {
+            client.Disconnect();
+
+            await WaitFor(() => client.connectState == ConnectState.Disconnected);
+        });
     }
 }
diff --git a/Assets/Tests/Runtime/NetworkClientTest.cs b/Assets/Tests/Runtime/NetworkClientTest.cs
@@ -142,5 +142,13 @@ public void GetNewConnectionTest()
         {
             Assert.That(client.GetNewConnection(Substitute.For<IConnection>()), Is.Not.Null);
         }
+
+        [UnityTest]
+        public IEnumerator ClientDisconnectTest() => RunAsync(async () =>
+        {
+            client.Disconnect();
+
+            await WaitFor(() => client.connectState == ConnectState.Disconnected);
+        });
     }
 }