From 12bdd70651dfed81b08daa7b0a59ef83d1d8721d Mon Sep 17 00:00:00 2001 From: Nikolay Vitkov <34244704+Lightning00Blade@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:06:23 +0200 Subject: [PATCH] chore: more BiDi Connection test to unit (#10839) --- .../src/common/bidi/Connection.test.ts | 59 +++++++++++++++++++ test/src/bidi/Connection.spec.ts | 59 ------------------- 2 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 packages/puppeteer-core/src/common/bidi/Connection.test.ts delete mode 100644 test/src/bidi/Connection.spec.ts diff --git a/packages/puppeteer-core/src/common/bidi/Connection.test.ts b/packages/puppeteer-core/src/common/bidi/Connection.test.ts new file mode 100644 index 00000000..35d9182d --- /dev/null +++ b/packages/puppeteer-core/src/common/bidi/Connection.test.ts @@ -0,0 +1,59 @@ +/** + * Copyright 2022 Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {describe, it} from 'node:test'; + +import expect from 'expect'; + +import {ConnectionTransport} from '../ConnectionTransport.js'; + +import {Connection} from './Connection.js'; + +describe('WebDriver BiDi Connection', () => { + class TestConnectionTransport implements ConnectionTransport { + sent: string[] = []; + closed = false; + + send(message: string) { + this.sent.push(message); + } + + close(): void { + this.closed = true; + } + } + + it('should work', async () => { + const transport = new TestConnectionTransport(); + const connection = new Connection('ws://127.0.0.1', transport); + const responsePromise = connection.send('session.new', { + capabilities: {}, + }); + expect(transport.sent).toEqual([ + `{"id":1,"method":"session.new","params":{"capabilities":{}}}`, + ]); + const id = JSON.parse(transport.sent[0]!).id; + const rawResponse = { + id, + result: {ready: false, message: 'already connected'}, + }; + (transport as ConnectionTransport).onmessage?.(JSON.stringify(rawResponse)); + const response = await responsePromise; + expect(response).toEqual(rawResponse); + connection.dispose(); + expect(transport.closed).toBeTruthy(); + }); +}); diff --git a/test/src/bidi/Connection.spec.ts b/test/src/bidi/Connection.spec.ts deleted file mode 100644 index 2554f26e..00000000 --- a/test/src/bidi/Connection.spec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright 2022 Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import expect from 'expect'; -import {Connection} from 'puppeteer-core/internal/common/bidi/Connection.js'; -import {ConnectionTransport} from 'puppeteer-core/internal/common/ConnectionTransport.js'; - -describe('WebDriver BiDi', () => { - describe('Connection', () => { - class TestConnectionTransport implements ConnectionTransport { - sent: string[] = []; - closed = false; - - send(message: string) { - this.sent.push(message); - } - - close(): void { - this.closed = true; - } - } - - it('should work', async () => { - const transport = new TestConnectionTransport(); - const connection = new Connection('ws://127.0.0.1', transport); - const responsePromise = connection.send('session.new', { - capabilities: {}, - }); - expect(transport.sent).toEqual([ - `{"id":1,"method":"session.new","params":{"capabilities":{}}}`, - ]); - const id = JSON.parse(transport.sent[0]!).id; - const rawResponse = { - id, - result: {ready: false, message: 'already connected'}, - }; - (transport as ConnectionTransport).onmessage?.( - JSON.stringify(rawResponse) - ); - const response = await responsePromise; - expect(response).toEqual(rawResponse); - connection.dispose(); - expect(transport.closed).toBeTruthy(); - }); - }); -});