mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: merge

Browse source
This commit is contained in:
hossein 2024-02-25 13:18:40 +03:30
parent 9307f66c27
commit c59c982ad3
4 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/package.json
View file

@ -114,13 +114,8 @@
},
"scripts": {
"lint": "eslint .",
<<<<<<< HEAD
"test": "mocha --import=tsx --timeout 990000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
"test-container": "mocha --import=tsx --timeout 99000 tests/container/specs/api",
=======
"test": "mocha --import=tsx --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
"test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api",
>>>>>>> 4d665edf5 (reset the test timeout)
"dev": "node --import tsx node/server.ts",
"prod": "node --import tsx node/server.ts",
"ts-check": "tsc --noEmit",

6
src/tests/backend/common.ts
View file

@ -191,17 +191,11 @@ exports.handshake = async (socket: any, padId:string, token = padutils.generateA
/**
* Convenience wrapper around `socket.send()` that waits for acknowledgement.
*/
<<<<<<< HEAD:src/tests/backend/common.ts
exports.sendMessage = async (socket: any, message:any) => await new Promise<void>((resolve, reject) => {
socket.emit('message', message, (errInfo:{
name: string,
message: string,
}) => {
=======
exports.sendMessage = async (socket, message) => await new Promise((resolve, reject) => {
if(message.type === "CHANGESET_REQ")
socket.emit('message', message, (errInfo) => {
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/tests/backend/common.js
if (errInfo != null) {
const {name, message} = errInfo;
const err = new Error(message);

4
src/tests/backend/specs/chat.ts
View file

@ -41,11 +41,7 @@ const checkHook = async (hookName: string, checkFn?:CheckFN) => {
});
};
<<<<<<< HEAD:src/tests/backend/specs/chat.ts
const sendMessage = (socket: any, data:any) => {
=======
const sendMessage = (socket, data) => {
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/tests/backend/specs/chat.js
socket.emit('message', {
type: 'COLLABROOM',
component: 'pad',

4
src/tests/backend/specs/socketio.ts
View file

@ -404,14 +404,10 @@ describe(__filename, function () {
constructor(name: string, ...args:any) { super(...args); this.name = name; }
};
socket.emit('message', message,
<<<<<<< HEAD:src/tests/backend/specs/socketio.ts
(errj: {
message: string,
name: string,
}, val: any) => errj != null ? reject(new AckErr(errj.name, errj.message)) : resolve(val));
=======
(errj, val) => errj != null ? reject(new AckErr(errj.name, errj.message)) : resolve(val));
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/tests/backend/specs/socketio.js
});
it('handleMessage with ack (success)', async function () {