Merge branch 'master' of github.com:doghappy/socket.io-client-csharp into master

Author: doghappy

src/SocketIOClient.Test/SocketIOTests/V2/ScoketIOV2Creator.cs

@@ -11,7 +11,8 @@ public SocketIO Create()
                 Query = new Dictionary<string, string>
                 {
                     { "token", Token }
-                }
+                },
+                EIO = 3
             });
         }
 

src/SocketIOClient.Test/SocketIOTests/V2/ScoketIOV2NspCreator.cs

@@ -11,7 +11,8 @@ public SocketIO Create()
                 Query = new Dictionary<string, string>
                 {
                     { "token", Token }
-                }
+                },
+                EIO = 3
             });
         }
 

src/SocketIOClient.Test/SocketIOTests/V3/ScoketIOV3Creator.cs

@@ -11,8 +11,7 @@ public SocketIO Create()
                 Query = new Dictionary<string, string>
                 {
                     { "token", Token }
-                },
-                EIO = EIO
+                }
             });
         }
 

src/SocketIOClient.Test/SocketIOTests/V3/ScoketIOV3NspCreator.cs

@@ -11,8 +11,7 @@ public SocketIO Create()
                 Query = new Dictionary<string, string>
                 {
                     { "token", Token }
-                },
-                EIO = EIO
+                }
             });
         }
 

src/SocketIOClient.Test/SocketIOTests/V4/ScoketIOV4Creator.cs

@@ -11,8 +11,7 @@ public SocketIO Create()
                 Query = new Dictionary<string, string>
                 {
                     { "token", Token }
-                },
-                EIO = EIO
+                }
             });
         }
 

src/SocketIOClient.Test/SocketIOTests/V4/ScoketIOV4NspCreator.cs

@@ -11,8 +11,7 @@ public SocketIO Create()
                 Query = new Dictionary<string, string>
                 {
                     { "token", Token }
-                },
-                EIO = EIO
+                }
             });
         }
 

src/SocketIOClient.Test/UrlConverterTest.cs

@@ -14,7 +14,7 @@ public void HttpWithPortTest()
             Uri httpUri = new Uri("http://localhost:3000");
             Uri wsUri = urlConverter.HttpToWs(httpUri, new SocketIOOptions());
 
-            Assert.AreEqual("ws://localhost:3000/socket.io/?EIO=3&transport=websocket", wsUri.ToString());
+            Assert.AreEqual("ws://localhost:3000/socket.io/?EIO=4&transport=websocket", wsUri.ToString());
         }
 
         [TestMethod]
@@ -24,7 +24,7 @@ public void HttpsWithPortTest()
             Uri httpUri = new Uri("https://localhost:3000");
             Uri wsUri = urlConverter.HttpToWs(httpUri, new SocketIOOptions());
 
-            Assert.AreEqual("wss://localhost:3000/socket.io/?EIO=3&transport=websocket", wsUri.ToString());
+            Assert.AreEqual("wss://localhost:3000/socket.io/?EIO=4&transport=websocket", wsUri.ToString());
         }
 
         [TestMethod]
@@ -34,7 +34,7 @@ public void HttpWithoutPortTest()
             Uri httpUri = new Uri("http://localhost");
             Uri wsUri = urlConverter.HttpToWs(httpUri, new SocketIOOptions());
 
-            Assert.AreEqual("ws://localhost/socket.io/?EIO=3&transport=websocket", wsUri.ToString());
+            Assert.AreEqual("ws://localhost/socket.io/?EIO=4&transport=websocket", wsUri.ToString());
         }
 
         [TestMethod]
@@ -44,7 +44,7 @@ public void HttpsWithoutPortTest()
             Uri httpUri = new Uri("https://localhost");
             Uri wsUri = urlConverter.HttpToWs(httpUri, new SocketIOOptions());
 
-            Assert.AreEqual("wss://localhost/socket.io/?EIO=3&transport=websocket", wsUri.ToString());
+            Assert.AreEqual("wss://localhost/socket.io/?EIO=4&transport=websocket", wsUri.ToString());
         }
 
         [TestMethod]
@@ -61,7 +61,7 @@ public void ParametersTest()
                 }
             });
 
-            Assert.AreEqual("wss://localhost/socket.io/?EIO=3&transport=websocket&uid=abc&pwd=123", wsUri.ToString());
+            Assert.AreEqual("wss://localhost/socket.io/?EIO=4&transport=websocket&uid=abc&pwd=123", wsUri.ToString());
         }
 
         [TestMethod]
@@ -79,7 +79,20 @@ public void CustomPathTest()
                 }
             });
 
-            Assert.AreEqual("wss://localhost/test/?EIO=3&transport=websocket&uid=abc&pwd=123", wsUri.ToString());
+            Assert.AreEqual("wss://localhost/test/?EIO=4&transport=websocket&uid=abc&pwd=123", wsUri.ToString());
+        }
+
+        [TestMethod]
+        public void EIO3Test()
+        {
+            var urlConverter = new UrlConverter();
+            Uri httpUri = new Uri("http://localhost:3000");
+            Uri wsUri = urlConverter.HttpToWs(httpUri, new SocketIOOptions
+            {
+                EIO = 3
+            });
+
+            Assert.AreEqual("ws://localhost:3000/socket.io/?EIO=3&transport=websocket", wsUri.ToString());
         }
     }
 }

src/SocketIOClient/SocketIOOptions.cs

@@ -9,7 +9,7 @@ public sealed class SocketIOOptions
         public SocketIOOptions()
         {
             RandomizationFactor = new Random().NextDouble();
-            EIO = 3;
+            EIO = 4;
         }
 
         public string Path { get; set; } = "/socket.io";