diff --git a/eng/Build.props b/eng/Build.props
index 775c67197032..fd3736f50d0d 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -16,25 +16,25 @@
-
-
+
+
diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
index c964da91d929..9102baf5c706 100644
--- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
+++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
@@ -1,5 +1,4 @@
-
$(DefaultNetCoreTargetFramework)
@@ -17,10 +16,20 @@
-
+
+
+
-
diff --git a/src/Security/Authentication/test/CertificateTests.cs b/src/Security/Authentication/test/CertificateTests.cs
index e25bbafcd8f3..25c982a7c61f 100644
--- a/src/Security/Authentication/test/CertificateTests.cs
+++ b/src/Security/Authentication/test/CertificateTests.cs
@@ -330,7 +330,7 @@ public async Task VerifyClientCertWithUntrustedRootAndTrustedChainEndsUpInForbid
Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
}
- [Fact]
+ [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/39669")]
public async Task VerifyValidClientCertWithTrustedChainAuthenticates()
{
using var host = await CreateHost(
@@ -347,7 +347,7 @@ public async Task VerifyValidClientCertWithTrustedChainAuthenticates()
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
}
- [Fact]
+ [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/39669")]
public async Task VerifyValidClientCertWithAdditionalCertificatesAuthenticates()
{
using var host = await CreateHost(
diff --git a/src/Servers/HttpSys/test/NonHelixTests/Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj b/src/Servers/HttpSys/test/NonHelixTests/Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj
index 58ca1a4d3baa..43ed463c2449 100644
--- a/src/Servers/HttpSys/test/NonHelixTests/Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj
+++ b/src/Servers/HttpSys/test/NonHelixTests/Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj
@@ -1,5 +1,4 @@
-
$(DefaultNetCoreTargetFramework)
HttpSys.NonHelixTests
@@ -25,6 +24,9 @@
+
-
diff --git a/src/SignalR/clients/ts/FunctionalTests/EchoConnectionHandler.cs b/src/SignalR/clients/ts/FunctionalTests/EchoConnectionHandler.cs
index d2c0b1df43a9..e58bbc9d9339 100644
--- a/src/SignalR/clients/ts/FunctionalTests/EchoConnectionHandler.cs
+++ b/src/SignalR/clients/ts/FunctionalTests/EchoConnectionHandler.cs
@@ -4,7 +4,6 @@
using System.Buffers;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections;
-using Microsoft.AspNetCore.Http.Connections;
namespace FunctionalTests
{
@@ -12,13 +11,6 @@ public class EchoConnectionHandler : ConnectionHandler
{
public override async Task OnConnectedAsync(ConnectionContext connection)
{
- var context = connection.GetHttpContext();
- // The 'withCredentials' tests wont send a cookie for cross-site requests
- if (!context.WebSockets.IsWebSocketRequest && !context.Request.Cookies.ContainsKey("testCookie"))
- {
- return;
- }
-
while (true)
{
var result = await connection.Transport.Input.ReadAsync();
diff --git a/src/SignalR/clients/ts/FunctionalTests/ts/ConnectionTests.ts b/src/SignalR/clients/ts/FunctionalTests/ts/ConnectionTests.ts
index 464bc7a92a09..9d2d6bf42357 100644
--- a/src/SignalR/clients/ts/FunctionalTests/ts/ConnectionTests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/ts/ConnectionTests.ts
@@ -185,6 +185,8 @@ describe("connection", () => {
await connection.start(TransferFormat.Text);
+ await connection.stop();
+
await closePromise;
});
}
diff --git a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
index 4a9032b3afc3..c463fb7096b6 100644
--- a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
@@ -40,16 +40,17 @@ function getConnectionBuilder(transportType?: HttpTransportType, url?: string, o
describe("hubConnection", () => {
eachTransportAndProtocolAndHttpClient((transportType, protocol, httpClient) => {
describe("using " + protocol.name + " over " + HttpTransportType[transportType] + " transport", () => {
- it("can invoke server method and receive result", async (done) => {
+ it("can invoke server method and receive result", async () => {
const message = "你好，世界！";
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBeUndefined();
- done();
+ closePromise.resolve();
});
await hubConnection.start();
@@ -57,20 +58,21 @@ describe("hubConnection", () => {
expect(result).toBe(message);
await hubConnection.stop();
- done();
+ await closePromise;
});
if (shouldRunHttpsTests) {
- it("using https, can invoke server method and receive result", async (done) => {
+ it("using https, can invoke server method and receive result", async () => {
const message = "你好，世界！";
const hubConnection = getConnectionBuilder(transportType, TESTHUBENDPOINT_HTTPS_URL, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBeUndefined();
- done();
+ closePromise.resolve();
});
await hubConnection.start();
@@ -78,30 +80,31 @@ describe("hubConnection", () => {
expect(result).toBe(message);
await hubConnection.stop();
- done();
+ await closePromise;
});
}
- it("can invoke server method non-blocking and not receive result", async (done) => {
+ it("can invoke server method non-blocking and not receive result", async () => {
const message = "你好，世界！";
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
await hubConnection.start();
await hubConnection.send("Echo", message);
await hubConnection.stop();
- done();
+ await closePromise;
});
- it("can invoke server method structural object and receive structural result", async (done) => {
+ it("can invoke server method structural object and receive structural result", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -112,23 +115,26 @@ describe("hubConnection", () => {
await hubConnection.stop();
});
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
await hubConnection.start();
await hubConnection.send("SendCustomObject", { Name: "test", Value: 42 });
+ await closePromise;
});
- it("can stream server method and receive result", async (done) => {
+ it("can stream server method and receive result", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
const received: string[] = [];
@@ -146,16 +152,18 @@ describe("hubConnection", () => {
received.push(item);
},
});
+ await closePromise;
});
- it("can stream server method and cancel stream", async (done) => {
+ it("can stream server method and cancel stream", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
hubConnection.on("StreamCanceled", async () => {
@@ -175,9 +183,10 @@ describe("hubConnection", () => {
});
subscription.dispose();
+ await closePromise;
});
- it("rethrows an exception from the server when invoking", async (done) => {
+ it("rethrows an exception from the server when invoking", async () => {
const errorMessage = "An unexpected error occurred invoking 'ThrowException' on the server. InvalidOperationException: An error occurred.";
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
@@ -193,10 +202,9 @@ describe("hubConnection", () => {
}
await hubConnection.stop();
- done();
});
- it("throws an exception when invoking streaming method with invoke", async (done) => {
+ it("throws an exception when invoking streaming method with invoke", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -212,10 +220,9 @@ describe("hubConnection", () => {
}
await hubConnection.stop();
- done();
});
- it("throws an exception when receiving a streaming result for method called with invoke", async (done) => {
+ it("throws an exception when receiving a streaming result for method called with invoke", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -231,15 +238,15 @@ describe("hubConnection", () => {
}
await hubConnection.stop();
- done();
});
- it("rethrows an exception from the server when streaming", async (done) => {
+ it("rethrows an exception from the server when streaming", async () => {
const errorMessage = "An unexpected error occurred invoking 'StreamThrowException' on the server. InvalidOperationException: An error occurred.";
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
await hubConnection.start();
hubConnection.stream("StreamThrowException", "An error occurred.").subscribe({
async complete() {
@@ -249,20 +256,22 @@ describe("hubConnection", () => {
async error(err) {
expect(err.message).toEqual(errorMessage);
await hubConnection.stop();
- done();
+ closePromise.resolve();
},
async next() {
await hubConnection.stop();
fail();
},
});
+ await closePromise;
});
- it("throws an exception when invoking hub method with stream", async (done) => {
+ it("throws an exception when invoking hub method with stream", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
await hubConnection.start();
hubConnection.stream("Echo", "42").subscribe({
async complete() {
@@ -272,16 +281,18 @@ describe("hubConnection", () => {
async error(err) {
expect(err.message).toEqual("The client attempted to invoke the non-streaming 'Echo' method with a streaming invocation.");
await hubConnection.stop();
- done();
+ closePromise.resolve();
},
async next() {
await hubConnection.stop();
fail();
},
});
+
+ await closePromise;
});
- it("can receive server calls", async (done) => {
+ it("can receive server calls", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -305,10 +316,9 @@ describe("hubConnection", () => {
expect(receiveMsg).toBe(message);
await hubConnection.stop();
- done();
});
- it("can receive server calls without rebinding handler when restarted", async (done) => {
+ it("can receive server calls without rebinding handler when restarted", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -323,6 +333,7 @@ describe("hubConnection", () => {
let closeCount = 0;
let invocationCount = 0;
+ const closePromise = new PromiseSource();
hubConnection.onclose(async (e) => {
expect(e).toBeUndefined();
closeCount += 1;
@@ -333,7 +344,7 @@ describe("hubConnection", () => {
await hubConnection.stop();
} else {
expect(invocationCount).toBe(2);
- done();
+ closePromise.resolve();
}
});
@@ -345,37 +356,41 @@ describe("hubConnection", () => {
await hubConnection.start();
await hubConnection.invoke("InvokeWithString", message);
await hubConnection.stop();
+ await closePromise;
});
- it("closed with error or start fails if hub cannot be created", async (done) => {
+ it("closed with error or start fails if hub cannot be created", async () => {
const hubConnection = getConnectionBuilder(transportType, ENDPOINT_BASE_URL + "/uncreatable", { httpClient })
.withHubProtocol(protocol)
.build();
const expectedErrorMessage = "Server returned an error on close: Connection closed with an error. InvalidOperationException: Unable to resolve service for type 'System.Object' while attempting to activate 'FunctionalTests.UncreatableHub'.";
+ const closePromise = new PromiseSource();
// Either start will fail or onclose will be called. Never both.
hubConnection.onclose((error) => {
expect(error!.message).toEqual(expectedErrorMessage);
- done();
+ closePromise.resolve();
});
try {
await hubConnection.start();
} catch (error) {
expect(error!.message).toEqual(expectedErrorMessage);
- done();
+ closePromise.resolve();
}
+ await closePromise;
});
- it("can handle different types", async (done) => {
+ it("can handle different types", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
const complexObject = {
@@ -395,16 +410,18 @@ describe("hubConnection", () => {
expect(value).toEqual(complexObject);
await hubConnection.stop();
+ await closePromise;
});
- it("can receive different types", async (done) => {
+ it("can receive different types", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
const complexObject = {
@@ -424,9 +441,10 @@ describe("hubConnection", () => {
expect(value).toEqual(complexObject);
await hubConnection.stop();
+ await closePromise;
});
- it("can be restarted", async (done) => {
+ it("can be restarted", async () => {
const message = "你好，世界！";
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
@@ -434,6 +452,7 @@ describe("hubConnection", () => {
.build();
let closeCount = 0;
+ const closePromise = new PromiseSource();
hubConnection.onclose(async (error) => {
expect(error).toBe(undefined);
@@ -445,7 +464,7 @@ describe("hubConnection", () => {
expect(value).toBe(message);
await hubConnection.stop();
} else {
- done();
+ closePromise.resolve();
}
});
@@ -454,9 +473,10 @@ describe("hubConnection", () => {
expect(result).toBe(message);
await hubConnection.stop();
+ await closePromise;
});
- it("can stream from client to server with rxjs", async (done) => {
+ it("can stream from client to server with rxjs", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -470,10 +490,9 @@ describe("hubConnection", () => {
subject.complete();
expect(await resultPromise).toBe("Hello world!");
await hubConnection.stop();
- done();
});
- it("can stream from client to server and close with error with rxjs", async (done) => {
+ it("can stream from client to server and close with error with rxjs", async () => {
const hubConnection = getConnectionBuilder(transportType, undefined, { httpClient })
.withHubProtocol(protocol)
.build();
@@ -493,7 +512,6 @@ describe("hubConnection", () => {
} finally {
await hubConnection.stop();
}
- done();
});
});
});
@@ -501,7 +519,7 @@ describe("hubConnection", () => {
eachTransport((transportType) => {
describe("over " + HttpTransportType[transportType] + " transport", () => {
- it("can connect to hub with authorization", async (done) => {
+ it("can connect to hub with authorization", async () => {
const message = "你好，世界！";
try {
@@ -511,9 +529,10 @@ describe("hubConnection", () => {
accessTokenFactory: () => jwtToken,
}).build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
await hubConnection.start();
const response = await hubConnection.invoke("Echo", message);
@@ -522,14 +541,13 @@ describe("hubConnection", () => {
await hubConnection.stop();
- done();
+ await closePromise;
} catch (err) {
fail(err);
- done();
}
});
- it("can connect to hub with authorization using async token factory", async (done) => {
+ it("can connect to hub with authorization using async token factory", async () => {
const message = "你好，世界！";
try {
@@ -537,9 +555,10 @@ describe("hubConnection", () => {
accessTokenFactory: () => getJwtToken(ENDPOINT_BASE_URL + "/generateJwtToken"),
}).build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
+ closePromise.resolve();
});
await hubConnection.start();
const response = await hubConnection.invoke("Echo", message);
@@ -548,20 +567,18 @@ describe("hubConnection", () => {
await hubConnection.stop();
- done();
+ await closePromise;
} catch (err) {
fail(err);
- done();
}
});
- it("can get error from unauthorized hub connection", async (done) => {
+ it("can get error from unauthorized hub connection", async () => {
try {
const hubConnection = getConnectionBuilder(transportType, ENDPOINT_BASE_URL + "/authorizedhub").build();
hubConnection.onclose((error) => {
expect(error).toBe(undefined);
- done();
});
await hubConnection.start();
@@ -569,17 +586,17 @@ describe("hubConnection", () => {
fail("shouldn't reach here");
} catch (err) {
expect(err).toEqual(new Error("Failed to complete negotiation with the server: Error: Unauthorized: Status code '401'"));
- done();
}
});
if (transportType !== HttpTransportType.LongPolling) {
- it("terminates if no messages received within timeout interval", async (done) => {
+ it("terminates if no messages received within timeout interval", async () => {
const hubConnection = getConnectionBuilder(transportType).build();
+ const closePromise = new PromiseSource();
hubConnection.onclose((error) => {
expect(error).toEqual(new Error("Server timeout elapsed without receiving a message from the server."));
- done();
+ closePromise.resolve();
});
await hubConnection.start();
@@ -589,30 +606,31 @@ describe("hubConnection", () => {
// invoke a method with a response to reset the timeout using the new value
await hubConnection.invoke("Echo", "");
+ await closePromise;
});
}
- it("preserves cookies between requests", async (done) => {
- const hubConnection = getConnectionBuilder(transportType, HTTPORHTTPS_TESTHUBENDPOINT_URL).build();
- await hubConnection.start();
- const cookieValue = await hubConnection.invoke("GetCookie", "testCookie");
- const cookieValue2 = await hubConnection.invoke("GetCookie", "testCookie2");
- expect(cookieValue).toEqual("testValue");
- expect(cookieValue2).toEqual("testValue2");
- await hubConnection.stop();
- done();
- });
+ if (shouldRunHttpsTests) {
+ it("preserves cookies between requests", async () => {
+ const hubConnection = getConnectionBuilder(transportType, HTTPORHTTPS_TESTHUBENDPOINT_URL).build();
+ await hubConnection.start();
+ const cookieValue = await hubConnection.invoke("GetCookie", "testCookie");
+ const cookieValue2 = await hubConnection.invoke("GetCookie", "testCookie2");
+ expect(cookieValue).toEqual("testValue");
+ expect(cookieValue2).toEqual("testValue2");
+ await hubConnection.stop();
+ });
+ }
- it("expired cookies are not preserved", async (done) => {
+ it("expired cookies are not preserved", async () => {
const hubConnection = getConnectionBuilder(transportType, HTTPORHTTPS_TESTHUBENDPOINT_URL).build();
await hubConnection.start();
const cookieValue = await hubConnection.invoke("GetCookie", "expiredCookie");
expect(cookieValue).toBeNull();
await hubConnection.stop();
- done();
});
- it("can reconnect", async (done) => {
+ it("can reconnect", async () => {
try {
const reconnectingPromise = new PromiseSource();
const reconnectedPromise = new PromiseSource();
@@ -645,16 +663,13 @@ describe("hubConnection", () => {
expect(response).toEqual("test");
await hubConnection.stop();
-
- done();
} catch (err) {
fail(err);
- done();
}
});
});
- it("can change url in reconnecting state", async (done) => {
+ it("can change url in reconnecting state", async () => {
try {
const reconnectingPromise = new PromiseSource();
const hubConnection = getConnectionBuilder(transportType)
@@ -676,16 +691,13 @@ describe("hubConnection", () => {
expect(hubConnection.baseUrl).toBe("http://example123.com");
await hubConnection.stop();
-
- done();
} catch (err) {
fail(err);
- done();
}
});
});
- it("can reconnect after negotiate redirect", async (done) => {
+ it("can reconnect after negotiate redirect", async () => {
try {
const reconnectingPromise = new PromiseSource();
const reconnectedPromise = new PromiseSource();
@@ -723,15 +735,12 @@ describe("hubConnection", () => {
expect(postReconnectRedirects).toBeGreaterThan(preReconnectRedirects);
await hubConnection.stop();
-
- done();
} catch (err) {
fail(err);
- done();
}
});
- it("can reconnect after skipping negotiation", async (done) => {
+ it("can reconnect after skipping negotiation", async () => {
try {
const reconnectingPromise = new PromiseSource();
const reconnectedPromise = new PromiseSource();
@@ -766,15 +775,12 @@ describe("hubConnection", () => {
expect(response).toEqual("test");
await hubConnection.stop();
-
- done();
} catch (err) {
fail(err);
- done();
}
});
- it("connection id matches server side connection id", async (done) => {
+ it("connection id matches server side connection id", async () => {
try {
const reconnectingPromise = new PromiseSource();
const reconnectedPromise = new PromiseSource();
@@ -813,15 +819,12 @@ describe("hubConnection", () => {
await hubConnection.stop();
expect(hubConnection.connectionId).toBeNull();
-
- done();
} catch (err) {
fail(err);
- done();
}
});
- it("connection id is alwys null is negotiation is skipped", async (done) => {
+ it("connection id is alwys null is negotiation is skipped", async () => {
try {
const hubConnection = getConnectionBuilder(
HttpTransportType.WebSockets,
@@ -839,16 +842,13 @@ describe("hubConnection", () => {
await hubConnection.stop();
expect(hubConnection.connectionId).toBeNull();
-
- done();
} catch (err) {
fail(err);
- done();
}
});
if (typeof EventSource !== "undefined") {
- it("allows Server-Sent Events when negotiating for JSON protocol", async (done) => {
+ it("allows Server-Sent Events when negotiating for JSON protocol", async () => {
const hubConnection = getConnectionBuilder(undefined, TESTHUB_NOWEBSOCKETS_ENDPOINT_URL)
.withHubProtocol(new JsonHubProtocol())
.build();
@@ -860,14 +860,13 @@ describe("hubConnection", () => {
expect(await hubConnection.invoke("GetActiveTransportName")).toEqual("ServerSentEvents");
await hubConnection.stop();
- done();
} catch (e) {
fail(e);
}
});
}
- it("skips Server-Sent Events when negotiating for MessagePack protocol", async (done) => {
+ it("skips Server-Sent Events when negotiating for MessagePack protocol", async () => {
const hubConnection = getConnectionBuilder(undefined, TESTHUB_NOWEBSOCKETS_ENDPOINT_URL)
.withHubProtocol(new MessagePackHubProtocol())
.build();
@@ -879,16 +878,14 @@ describe("hubConnection", () => {
expect(await hubConnection.invoke("GetActiveTransportName")).toEqual("LongPolling");
await hubConnection.stop();
- done();
} catch (e) {
fail(e);
}
});
- it("transport falls back from WebSockets to SSE or LongPolling", async (done) => {
+ it("transport falls back from WebSockets to SSE or LongPolling", async () => {
// Skip test on Node as there will always be a WebSockets implementation on Node
if (typeof window === "undefined") {
- done();
return;
}
@@ -914,11 +911,10 @@ describe("hubConnection", () => {
fail(e);
} finally {
(window as any).WebSocket = oldWebSocket;
- done();
}
});
- it("over LongPolling it sends DELETE request and waits for poll to terminate", async (done) => {
+ it("over LongPolling it sends DELETE request and waits for poll to terminate", async () => {
// Create an HTTP client to capture the poll
const defaultClient = new DefaultHttpClient(TestLogger.instance);
@@ -966,14 +962,12 @@ describe("hubConnection", () => {
} catch (e) {
fail(e);
} finally {
- done();
}
});
- it("populates the Content-Type header when sending XMLHttpRequest", async (done) => {
+ it("populates the Content-Type header when sending XMLHttpRequest", async () => {
// Skip test on Node as this header isn't set (it was added for React-Native)
if (typeof window === "undefined") {
- done();
return;
}
const hubConnection = getConnectionBuilder(HttpTransportType.LongPolling, TESTHUB_NOWEBSOCKETS_ENDPOINT_URL)
@@ -989,14 +983,13 @@ describe("hubConnection", () => {
expect(await hubConnection.invoke("GetContentTypeHeader")).toEqual("text/plain;charset=UTF-8");
await hubConnection.stop();
- done();
} catch (e) {
fail(e);
}
});
eachTransport((t) => {
- it("sets the user agent header", async (done) => {
+ it("sets the user agent header", async () => {
const hubConnection = getConnectionBuilder(t, TESTHUBENDPOINT_URL)
.withHubProtocol(new JsonHubProtocol())
.build();
@@ -1015,13 +1008,12 @@ describe("hubConnection", () => {
}
await hubConnection.stop();
- done();
} catch (e) {
fail(e);
}
});
- it("overwrites library headers with user headers", async (done) => {
+ it("overwrites library headers with user headers", async () => {
const [name] = getUserAgentHeader();
const headers = { [name]: "Custom Agent", "X-HEADER": "VALUE" };
const hubConnection = getConnectionBuilder(t, TESTHUBENDPOINT_URL, { headers })
@@ -1043,7 +1035,6 @@ describe("hubConnection", () => {
}
await hubConnection.stop();
- done();
} catch (e) {
fail(e);
}
diff --git a/src/SignalR/clients/ts/signalr/src/Utils.ts b/src/SignalR/clients/ts/signalr/src/Utils.ts
index 90eb0cc59ced..c5d19bfa9105 100644
--- a/src/SignalR/clients/ts/signalr/src/Utils.ts
+++ b/src/SignalR/clients/ts/signalr/src/Utils.ts
@@ -288,7 +288,7 @@ export function getErrorString(e: any): string {
}
/** @private */
-export function getGlobalThis() {
+export function getGlobalThis(): unknown {
// globalThis is semi-new and not available in Node until v12
if (typeof globalThis !== "undefined") {
return globalThis;