diff --git a/build/buildpipeline/osx.groovy b/build/buildpipeline/osx.groovy index 4b0a9ec8f1..5dfa3d8a48 100644 --- a/build/buildpipeline/osx.groovy +++ b/build/buildpipeline/osx.groovy @@ -1,2 +1,14 @@ @Library('dotnet-ci') _ +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches +// the label 'windows-with-vs' +simpleNode('OSX.1012.Amd64.Open') { + stage ('Checking out source') { + checkout scm + } + stage ('Build') { + def logFolder = getLogFolder() + def environment = "export ASPNETCORE_TEST_LOG_DIR=${WORKSPACE}/${logFolder}" + sh "${environment}&./build.sh -ci" + } +} diff --git a/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts b/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts index eca2b163f5..269e003f4a 100644 --- a/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts +++ b/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts @@ -79,7 +79,7 @@ export class MessagePackHubProtocol implements IHubProtocol { } const msgpack = msgpack5(); - const properties = msgpack.decode(new Buffer(input)); + const properties = msgpack.decode(Buffer.from(input)); if (properties.length === 0 || !(properties instanceof Array)) { throw new Error("Invalid payload."); } diff --git a/clients/ts/signalr/tests/WebSocketTransport.test.ts b/clients/ts/signalr/tests/WebSocketTransport.test.ts index 98996364fe..107cf88db2 100644 --- a/clients/ts/signalr/tests/WebSocketTransport.test.ts +++ b/clients/ts/signalr/tests/WebSocketTransport.test.ts @@ -6,7 +6,7 @@ import { TransferFormat } from "../src/ITransport"; import { WebSocketTransport } from "../src/WebSocketTransport"; import { VerifyLogger } from "./Common"; import { TestMessageEvent } from "./TestEventSource"; -import { TestCloseEvent, TestEvent, TestWebSocket } from "./TestWebSocket"; +import { TestCloseEvent, TestErrorEvent, TestEvent, TestWebSocket } from "./TestWebSocket"; describe("WebSocketTransport", () => { it("sets websocket binarytype to arraybuffer on Binary transferformat", async () => { @@ -40,7 +40,7 @@ describe("WebSocketTransport", () => { it("connect fails if there is error during connect", async () => { await VerifyLogger.run(async (logger) => { - (global as any).ErrorEvent = TestEvent; + (global as any).ErrorEvent = TestErrorEvent; const webSocket = new WebSocketTransport(undefined, logger, true, TestWebSocket); let connectComplete: boolean = false; @@ -56,7 +56,8 @@ describe("WebSocketTransport", () => { TestWebSocket.webSocket.onerror(new TestEvent()); await expect(connectPromise) - .rejects; + .rejects + .toBeNull(); expect(connectComplete).toBe(false); }); });