Improved testing.

Author: ionut.stan

tests/AllTests.js

@@ -76,6 +76,7 @@ class AllTests
 		this._serverAuthorizeAllPlugin = new JSONRPC.Plugins.Server.AuthorizeAll();
 
 		this._bWebSocketMode = !!bWebSocketMode;
+		this._bPreventHTTPAPIRequests = false;
 
 		Object.seal(this);
 	}
@@ -86,6 +87,9 @@ class AllTests
 	 */
 	async runTests()
 	{
+		this._bPreventHTTPAPIRequests = this._bWebSocketMode;
+
+
 		await this.triggerConnectionRefused();
 
 
@@ -233,7 +237,7 @@ class AllTests
 					return;
 				}
 				else if(
-					this._bWebSocketMode
+					this._bPreventHTTPAPIRequests
 					&& !incomingRequest.headers["sec-websocket-version"]
 					&& incomingRequest.method === "POST"
 					&& url.parse(incomingRequest.url).pathname.substr(0, 4) === "/api"
@@ -510,8 +514,7 @@ class AllTests
 	 */
 	async endpointNotFoundError()
 	{
-		const bWebSocketMode = this._bWebSocketMode;
-		this._bWebSocketMode = false;
+		this._bPreventHTTPAPIRequests = false;
 
 
 		console.log("[" + process.pid + "] endpointNotFoundError");
@@ -538,7 +541,7 @@ class AllTests
 		}
 
 
-		this._bWebSocketMode = bWebSocketMode;
+		this._bPreventHTTPAPIRequests = this._bWebSocketMode;
 	}
 
 

tests/Browser/main_server.js

@@ -20,6 +20,6 @@ process.on(
 		await allTests.setupWebsocketServerSiteA();
 		await allTests.disableServerSecuritySiteA();
 
-		console.log("Go to http://localhost:8324/tests/Browser/index.html");
+		console.log("Go to http://localhost:8324/tests/Browser/index.html?websocketmode=1");
 	}
 )();