github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

decaffeinate: Run post-processing cleanups on ApplyUpdateTests.coffee and 18 other files

Browse source
This commit is contained in:
decaffeinate 2020-06-23 18:30:34 +01:00 committed by Jakob Ackermann
parent d318e4fd0e
commit 5443450abb
19 changed files with 187 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/real-time/test/acceptance/coffee/ApplyUpdateTests.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from

13
services/real-time/test/acceptance/coffee/ClientTrackingTests.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from
@ -71,7 +78,7 @@ describe("clientTracking", function() {
row: (this.row = 42), row: (this.row = 42),
column: (this.column = 36), column: (this.column = 36),
doc_id: this.doc_id doc_id: this.doc_id
}, function(error) { }, (error) => {
if (error != null) { throw error; } if (error != null) { throw error; }
return setTimeout(cb, 300); return setTimeout(cb, 300);
}); });
@ -94,7 +101,7 @@ describe("clientTracking", function() {
return it("should record the update in getConnectedUsers", function(done) { return it("should record the update in getConnectedUsers", function(done) {
return this.clientB.emit("clientTracking.getConnectedUsers", (error, users) => { return this.clientB.emit("clientTracking.getConnectedUsers", (error, users) => {
for (let user of Array.from(users)) { for (const user of Array.from(users)) {
if (user.client_id === this.clientA.publicId) { if (user.client_id === this.clientA.publicId) {
expect(user.cursorData).to.deep.equal({ expect(user.cursorData).to.deep.equal({
row: this.row, row: this.row,
@ -167,7 +174,7 @@ describe("clientTracking", function() {
row: (this.row = 42), row: (this.row = 42),
column: (this.column = 36), column: (this.column = 36),
doc_id: this.doc_id doc_id: this.doc_id
}, function(error) { }, (error) => {
if (error != null) { throw error; } if (error != null) { throw error; }
return setTimeout(cb, 300); return setTimeout(cb, 300);
}); });

13
services/real-time/test/acceptance/coffee/DrainManagerTests.js
View file

@ -1,3 +1,8 @@
/* eslint-disable
camelcase,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -44,11 +49,11 @@ describe("DrainManagerTests", function() {
}); });
// trigger and check cleanup // trigger and check cleanup
it("should have disconnected all previous clients", done => RealTimeClient.getConnectedClients(function(error, data) { it("should have disconnected all previous clients", function(done) { return RealTimeClient.getConnectedClients((error, data) => {
if (error) { return done(error); } if (error) { return done(error); }
expect(data.length).to.equal(0); expect(data.length).to.equal(0);
return done(); return done();
})); }); });
return describe("with two clients in the project", function() { return describe("with two clients in the project", function() {
beforeEach(function(done) { beforeEach(function(done) {
@ -87,9 +92,9 @@ describe("DrainManagerTests", function() {
], done); ], done);
}); });
afterEach(done => drain(0, done)); // reset drain afterEach(function(done) { return drain(0, done); }); // reset drain
it("should not timeout", () => expect(true).to.equal(true)); it("should not timeout", function() { return expect(true).to.equal(true); });
return it("should not have disconnected", function() { return it("should not have disconnected", function() {
expect(this.clientA.socket.connected).to.equal(true); expect(this.clientA.socket.connected).to.equal(true);

16
services/real-time/test/acceptance/coffee/EarlyDisconnect.js
View file

@ -1,3 +1,9 @@
/* eslint-disable
camelcase,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from
@ -19,7 +25,7 @@ const rclientRT = redis.createClient(settings.redis.realtime);
const KeysRT = settings.redis.realtime.key_schema; const KeysRT = settings.redis.realtime.key_schema;
describe("EarlyDisconnect", function() { describe("EarlyDisconnect", function() {
before(done => MockDocUpdaterServer.run(done)); before(function(done) { return MockDocUpdaterServer.run(done); });
describe("when the client disconnects before joinProject completes", function() { describe("when the client disconnects before joinProject completes", function() {
before(function() { before(function() {
@ -51,7 +57,7 @@ describe("EarlyDisconnect", function() {
}, },
cb => { cb => {
this.clientA.emit("joinProject", {project_id: this.project_id}, (function() {})); this.clientA.emit("joinProject", {project_id: this.project_id}, (() => {}));
// disconnect before joinProject completes // disconnect before joinProject completes
this.clientA.on("disconnect", () => cb()); this.clientA.on("disconnect", () => cb());
return this.clientA.disconnect(); return this.clientA.disconnect();
@ -110,7 +116,7 @@ describe("EarlyDisconnect", function() {
}, },
cb => { cb => {
this.clientA.emit("joinDoc", this.doc_id, (function() {})); this.clientA.emit("joinDoc", this.doc_id, (() => {}));
// disconnect before joinDoc completes // disconnect before joinDoc completes
this.clientA.on("disconnect", () => cb()); this.clientA.on("disconnect", () => cb());
return this.clientA.disconnect(); return this.clientA.disconnect();
@ -182,7 +188,7 @@ describe("EarlyDisconnect", function() {
row: 42, row: 42,
column: 36, column: 36,
doc_id: this.doc_id doc_id: this.doc_id
}, (function() {})); }, (() => {}));
// disconnect before updateClientPosition completes // disconnect before updateClientPosition completes
this.clientA.on("disconnect", () => cb()); this.clientA.on("disconnect", () => cb());
return this.clientA.disconnect(); return this.clientA.disconnect();
@ -198,7 +204,7 @@ describe("EarlyDisconnect", function() {
// we can not force the race condition, so we have to try many times // we can not force the race condition, so we have to try many times
return Array.from(Array.from({length: 20}).map((_, i) => i+1)).map((attempt) => return Array.from(Array.from({length: 20}).map((_, i) => i+1)).map((attempt) =>
it(`should not show the client as connected (race ${attempt})`, function(done) { it(`should not show the client as connected (race ${attempt})`, function(done) {
rclientRT.smembers(KeysRT.clientsInProject({project_id: this.project_id}), function(err, results) { rclientRT.smembers(KeysRT.clientsInProject({project_id: this.project_id}), (err, results) => {
if (err) { return done(err); } if (err) { return done(err); }
expect(results).to.deep.equal([]); expect(results).to.deep.equal([]);
return done(); return done();

11
services/real-time/test/acceptance/coffee/HttpControllerTests.js
View file

@ -1,3 +1,8 @@
/* eslint-disable
camelcase,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -15,17 +20,17 @@ const RealTimeClient = require("./helpers/RealTimeClient");
const FixturesManager = require("./helpers/FixturesManager"); const FixturesManager = require("./helpers/FixturesManager");
describe('HttpControllerTests', function() { describe('HttpControllerTests', function() {
describe('without a user', () => it('should return 404 for the client view', function(done) { describe('without a user', function() { return it('should return 404 for the client view', function(done) {
const client_id = 'not-existing'; const client_id = 'not-existing';
return request.get({ return request.get({
url: `/clients/${client_id}`, url: `/clients/${client_id}`,
json: true json: true
}, function(error, response, data) { }, (error, response, data) => {
if (error) { return done(error); } if (error) { return done(error); }
expect(response.statusCode).to.equal(404); expect(response.statusCode).to.equal(404);
return done(); return done();
}); });
})); }); });
return describe('with a user and after joining a project', function() { return describe('with a user and after joining a project', function() {
before(function(done) { before(function(done) {

7
services/real-time/test/acceptance/coffee/JoinDocTests.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from

8
services/real-time/test/acceptance/coffee/JoinProjectTests.js
View file

@ -1,3 +1,9 @@
/* eslint-disable
camelcase,
handle-callback-err,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from
@ -79,7 +85,7 @@ describe("joinProject", function() {
return it("should have marked the user as connected", function(done) { return it("should have marked the user as connected", function(done) {
return this.client.emit("clientTracking.getConnectedUsers", (error, users) => { return this.client.emit("clientTracking.getConnectedUsers", (error, users) => {
let connected = false; let connected = false;
for (let user of Array.from(users)) { for (const user of Array.from(users)) {
if ((user.client_id === this.client.publicId) && (user.user_id === this.user_id)) { if ((user.client_id === this.client.publicId) && (user.user_id === this.user_id)) {
connected = true; connected = true;
break; break;

22
services/real-time/test/acceptance/coffee/LeaveDocTests.js
View file

@ -1,3 +1,11 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-return-assign,
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from
@ -73,7 +81,7 @@ describe("leaveDoc", function() {
describe("then leaving the doc", function() { describe("then leaving the doc", function() {
beforeEach(function(done) { beforeEach(function(done) {
return this.client.emit("leaveDoc", this.doc_id, function(error) { return this.client.emit("leaveDoc", this.doc_id, (error) => {
if (error != null) { throw error; } if (error != null) { throw error; }
return done(); return done();
}); });
@ -89,15 +97,15 @@ describe("leaveDoc", function() {
describe("when sending a leaveDoc request before the previous joinDoc request has completed", function() { describe("when sending a leaveDoc request before the previous joinDoc request has completed", function() {
beforeEach(function(done) { beforeEach(function(done) {
this.client.emit("leaveDoc", this.doc_id, function() {}); this.client.emit("leaveDoc", this.doc_id, () => {});
this.client.emit("joinDoc", this.doc_id, function() {}); this.client.emit("joinDoc", this.doc_id, () => {});
return this.client.emit("leaveDoc", this.doc_id, function(error) { return this.client.emit("leaveDoc", this.doc_id, (error) => {
if (error != null) { throw error; } if (error != null) { throw error; }
return done(); return done();
}); });
}); });
it("should not trigger an error", () => sinon.assert.neverCalledWith(logger.error, sinon.match.any, "not subscribed - shouldn't happen")); it("should not trigger an error", function() { return sinon.assert.neverCalledWith(logger.error, sinon.match.any, "not subscribed - shouldn't happen"); });
return it("should have left the doc room", function(done) { return it("should have left the doc room", function(done) {
return RealTimeClient.getConnectedClient(this.client.socket.sessionid, (error, client) => { return RealTimeClient.getConnectedClient(this.client.socket.sessionid, (error, client) => {
@ -109,13 +117,13 @@ describe("leaveDoc", function() {
return describe("when sending a leaveDoc for a room the client has not joined ", function() { return describe("when sending a leaveDoc for a room the client has not joined ", function() {
beforeEach(function(done) { beforeEach(function(done) {
return this.client.emit("leaveDoc", this.other_doc_id, function(error) { return this.client.emit("leaveDoc", this.other_doc_id, (error) => {
if (error != null) { throw error; } if (error != null) { throw error; }
return done(); return done();
}); });
}); });
return it("should trigger a low level message only", () => sinon.assert.calledWith(logger.log, sinon.match.any, "ignoring request from client to leave room it is not in")); return it("should trigger a low level message only", function() { return sinon.assert.calledWith(logger.log, sinon.match.any, "ignoring request from client to leave room it is not in"); });
}); });
}); });
}); });

11
services/real-time/test/acceptance/coffee/LeaveProjectTests.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-throw-literal,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from
@ -15,7 +22,7 @@ const redis = require("redis-sharelatex");
const rclient = redis.createClient(settings.redis.pubsub); const rclient = redis.createClient(settings.redis.pubsub);
describe("leaveProject", function() { describe("leaveProject", function() {
before(done => MockDocUpdaterServer.run(done)); before(function(done) { return MockDocUpdaterServer.run(done); });
describe("with other clients in the project", function() { describe("with other clients in the project", function() {
before(function(done) { before(function(done) {
@ -96,7 +103,7 @@ describe("leaveProject", function() {
it("should no longer list the client in connected users", function(done) { it("should no longer list the client in connected users", function(done) {
return this.clientB.emit("clientTracking.getConnectedUsers", (error, users) => { return this.clientB.emit("clientTracking.getConnectedUsers", (error, users) => {
for (let user of Array.from(users)) { for (const user of Array.from(users)) {
if (user.client_id === this.clientA.publicId) { if (user.client_id === this.clientA.publicId) {
throw "Expected clientA to not be listed in connected users"; throw "Expected clientA to not be listed in connected users";
} }

44
services/real-time/test/acceptance/coffee/PubSubRace.js
View file

@ -1,3 +1,9 @@
/* eslint-disable
camelcase,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -14,7 +20,7 @@ const redis = require("redis-sharelatex");
const rclient = redis.createClient(settings.redis.pubsub); const rclient = redis.createClient(settings.redis.pubsub);
describe("PubSubRace", function() { describe("PubSubRace", function() {
before(done => MockDocUpdaterServer.run(done)); before(function(done) { return MockDocUpdaterServer.run(done); });
describe("when the client leaves a doc before joinDoc completes", function() { describe("when the client leaves a doc before joinDoc completes", function() {
before(function(done) { before(function(done) {
@ -50,7 +56,7 @@ describe("PubSubRace", function() {
}, },
cb => { cb => {
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
// leave before joinDoc completes // leave before joinDoc completes
return this.clientA.emit("leaveDoc", this.doc_id, cb); return this.clientA.emit("leaveDoc", this.doc_id, cb);
}, },
@ -106,15 +112,15 @@ describe("PubSubRace", function() {
}, },
cb => { cb => {
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
return this.clientA.emit("leaveDoc", this.doc_id, cb); return this.clientA.emit("leaveDoc", this.doc_id, cb);
}, },
@ -169,14 +175,14 @@ describe("PubSubRace", function() {
}, },
cb => { cb => {
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
this.clientA.emit("joinDoc", this.doc_id, function() {}); this.clientA.emit("joinDoc", this.doc_id, () => {});
this.clientA.emit("leaveDoc", this.doc_id, function() {}); this.clientA.emit("leaveDoc", this.doc_id, () => {});
return this.clientA.emit("joinDoc", this.doc_id, cb); return this.clientA.emit("joinDoc", this.doc_id, cb);
}, },

7
services/real-time/test/acceptance/coffee/ReceiveUpdateTests.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns

11
services/real-time/test/acceptance/coffee/RouterTests.js
View file

@ -1,3 +1,8 @@
/* eslint-disable
camelcase,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -10,7 +15,7 @@ const RealTimeClient = require("./helpers/RealTimeClient");
const FixturesManager = require("./helpers/FixturesManager"); const FixturesManager = require("./helpers/FixturesManager");
describe("Router", () => describe("joinProject", function() { describe("Router", function() { return describe("joinProject", function() {
describe("when there is no callback provided", function() { describe("when there is no callback provided", function() {
after(function() { after(function() {
return process.removeListener('unhandledRejection', this.onUnhandled); return process.removeListener('unhandledRejection', this.onUnhandled);
@ -50,7 +55,7 @@ describe("Router", () => describe("joinProject", function() {
], done); ], done);
}); });
return it("should keep on going", () => expect('still running').to.exist); return it("should keep on going", function() { return expect('still running').to.exist; });
}); });
return describe("when there are too many arguments", function() { return describe("when there are too many arguments", function() {
@ -98,4 +103,4 @@ describe("Router", () => describe("joinProject", function() {
return expect(this.error.message).to.equal('unexpected arguments'); return expect(this.error.message).to.equal('unexpected arguments');
}); });
}); });
})); }); });

23
services/real-time/test/acceptance/coffee/SessionSocketsTests.js
View file

@ -1,3 +1,8 @@
/* eslint-disable
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -18,10 +23,10 @@ describe('SessionSockets', function() {
}); });
describe('without cookies', function() { describe('without cookies', function() {
before(() => RealTimeClient.cookie = null); before(function() { return RealTimeClient.cookie = null; });
return it('should return a lookup error', function(done) { return it('should return a lookup error', function(done) {
return this.checkSocket(function(error) { return this.checkSocket((error) => {
expect(error).to.exist; expect(error).to.exist;
expect(error.message).to.equal('invalid session'); expect(error.message).to.equal('invalid session');
return done(); return done();
@ -30,10 +35,10 @@ describe('SessionSockets', function() {
}); });
describe('with a different cookie', function() { describe('with a different cookie', function() {
before(() => RealTimeClient.cookie = "some.key=someValue"); before(function() { return RealTimeClient.cookie = "some.key=someValue"; });
return it('should return a lookup error', function(done) { return it('should return a lookup error', function(done) {
return this.checkSocket(function(error) { return this.checkSocket((error) => {
expect(error).to.exist; expect(error).to.exist;
expect(error.message).to.equal('invalid session'); expect(error.message).to.equal('invalid session');
return done(); return done();
@ -43,7 +48,7 @@ describe('SessionSockets', function() {
describe('with an invalid cookie', function() { describe('with an invalid cookie', function() {
before(function(done) { before(function(done) {
RealTimeClient.setSession({}, function(error) { RealTimeClient.setSession({}, (error) => {
if (error) { return done(error); } if (error) { return done(error); }
RealTimeClient.cookie = `${Settings.cookieName}=${ RealTimeClient.cookie = `${Settings.cookieName}=${
RealTimeClient.cookie.slice(17, 49) RealTimeClient.cookie.slice(17, 49)
@ -54,7 +59,7 @@ describe('SessionSockets', function() {
}); });
return it('should return a lookup error', function(done) { return it('should return a lookup error', function(done) {
return this.checkSocket(function(error) { return this.checkSocket((error) => {
expect(error).to.exist; expect(error).to.exist;
expect(error.message).to.equal('invalid session'); expect(error.message).to.equal('invalid session');
return done(); return done();
@ -63,10 +68,10 @@ describe('SessionSockets', function() {
}); });
describe('with a valid cookie and no matching session', function() { describe('with a valid cookie and no matching session', function() {
before(() => RealTimeClient.cookie = `${Settings.cookieName}=unknownId`); before(function() { return RealTimeClient.cookie = `${Settings.cookieName}=unknownId`; });
return it('should return a lookup error', function(done) { return it('should return a lookup error', function(done) {
return this.checkSocket(function(error) { return this.checkSocket((error) => {
expect(error).to.exist; expect(error).to.exist;
expect(error.message).to.equal('invalid session'); expect(error.message).to.equal('invalid session');
return done(); return done();
@ -81,7 +86,7 @@ describe('SessionSockets', function() {
}); });
return it('should not return an error', function(done) { return it('should not return an error', function(done) {
return this.checkSocket(function(error) { return this.checkSocket((error) => {
expect(error).to.not.exist; expect(error).to.not.exist;
return done(); return done();
}); });

12
services/real-time/test/acceptance/coffee/SessionTests.js
View file

@ -1,3 +1,9 @@
/* eslint-disable
handle-callback-err,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from
@ -12,7 +18,7 @@ const {
const RealTimeClient = require("./helpers/RealTimeClient"); const RealTimeClient = require("./helpers/RealTimeClient");
describe("Session", () => describe("with an established session", function() { describe("Session", function() { return describe("with an established session", function() {
before(function(done) { before(function(done) {
this.user_id = "mock-user-id"; this.user_id = "mock-user-id";
RealTimeClient.setSession({ RealTimeClient.setSession({
@ -38,7 +44,7 @@ describe("Session", () => describe("with an established session", function() {
return it("should appear in the list of connected clients", function(done) { return it("should appear in the list of connected clients", function(done) {
return RealTimeClient.getConnectedClients((error, clients) => { return RealTimeClient.getConnectedClients((error, clients) => {
let included = false; let included = false;
for (let client of Array.from(clients)) { for (const client of Array.from(clients)) {
if (client.client_id === this.client.socket.sessionid) { if (client.client_id === this.client.socket.sessionid) {
included = true; included = true;
break; break;
@ -48,4 +54,4 @@ describe("Session", () => describe("with an established session", function() {
return done(); return done();
}); });
}); });
})); }); });

6
services/real-time/test/acceptance/coffee/helpers/FixturesManager.js
View file

@ -1,3 +1,9 @@
/* eslint-disable
camelcase,
handle-callback-err,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns

15
services/real-time/test/acceptance/coffee/helpers/MockDocUpdaterServer.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -28,7 +35,7 @@ module.exports = (MockDocUpdaterServer = {
const {project_id, doc_id} = req.params; const {project_id, doc_id} = req.params;
let {fromVersion} = req.query; let {fromVersion} = req.query;
fromVersion = parseInt(fromVersion, 10); fromVersion = parseInt(fromVersion, 10);
return MockDocUpdaterServer.getDocument(project_id, doc_id, fromVersion, function(error, data) { return MockDocUpdaterServer.getDocument(project_id, doc_id, fromVersion, (error, data) => {
if (error != null) { return next(error); } if (error != null) { return next(error); }
return res.json(data); return res.json(data);
}); });
@ -36,7 +43,7 @@ module.exports = (MockDocUpdaterServer = {
deleteProjectRequest(req, res, next) { deleteProjectRequest(req, res, next) {
const {project_id} = req.params; const {project_id} = req.params;
return MockDocUpdaterServer.deleteProject(project_id, function(error) { return MockDocUpdaterServer.deleteProject(project_id, (error) => {
if (error != null) { return next(error); } if (error != null) { return next(error); }
return res.sendStatus(204); return res.sendStatus(204);
}); });
@ -51,10 +58,10 @@ module.exports = (MockDocUpdaterServer = {
const app = express(); const app = express();
app.get("/project/:project_id/doc/:doc_id", MockDocUpdaterServer.getDocumentRequest); app.get("/project/:project_id/doc/:doc_id", MockDocUpdaterServer.getDocumentRequest);
app.delete("/project/:project_id", MockDocUpdaterServer.deleteProjectRequest); app.delete("/project/:project_id", MockDocUpdaterServer.deleteProjectRequest);
return app.listen(3003, function(error) { return app.listen(3003, (error) => {
MockDocUpdaterServer.running = true; MockDocUpdaterServer.running = true;
return callback(error); return callback(error);
}).on("error", function(error) { }).on("error", (error) => {
console.error("error starting MockDocUpdaterServer:", error.message); console.error("error starting MockDocUpdaterServer:", error.message);
return process.exit(1); return process.exit(1);
}); });

13
services/real-time/test/acceptance/coffee/helpers/MockWebServer.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -32,7 +39,7 @@ module.exports = (MockWebServer = {
if (project_id === 'rate-limited') { if (project_id === 'rate-limited') {
return res.status(429).send(); return res.status(429).send();
} else { } else {
return MockWebServer.joinProject(project_id, user_id, function(error, project, privilegeLevel) { return MockWebServer.joinProject(project_id, user_id, (error, project, privilegeLevel) => {
if (error != null) { return next(error); } if (error != null) { return next(error); }
return res.json({ return res.json({
project, project,
@ -50,10 +57,10 @@ module.exports = (MockWebServer = {
} }
const app = express(); const app = express();
app.post("/project/:project_id/join", MockWebServer.joinProjectRequest); app.post("/project/:project_id/join", MockWebServer.joinProjectRequest);
return app.listen(3000, function(error) { return app.listen(3000, (error) => {
MockWebServer.running = true; MockWebServer.running = true;
return callback(error); return callback(error);
}).on("error", function(error) { }).on("error", (error) => {
console.error("error starting MockWebServer:", error.message); console.error("error starting MockWebServer:", error.message);
return process.exit(1); return process.exit(1);
}); });

11
services/real-time/test/acceptance/coffee/helpers/RealTimeClient.js
View file

@ -1,3 +1,10 @@
/* eslint-disable
camelcase,
handle-callback-err,
no-return-assign,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
@ -27,7 +34,7 @@ io.util.request = function() {
if (Client.cookie != null) { if (Client.cookie != null) {
return xhr.setRequestHeader("Cookie", Client.cookie); return xhr.setRequestHeader("Cookie", Client.cookie);
} }
}.bind(this); };
return xhr; return xhr;
}; };
@ -38,7 +45,7 @@ module.exports = (Client = {
if (callback == null) { callback = function(error) {}; } if (callback == null) { callback = function(error) {}; }
const sessionId = uid(24); const sessionId = uid(24);
session.cookie = {}; session.cookie = {};
return rclient.set("sess:" + sessionId, JSON.stringify(session), function(error) { return rclient.set("sess:" + sessionId, JSON.stringify(session), (error) => {
if (error != null) { return callback(error); } if (error != null) { return callback(error); }
const secret = Settings.security.sessionSecret; const secret = Settings.security.sessionSecret;
const cookieKey = 's:' + signature.sign(sessionId, secret); const cookieKey = 's:' + signature.sign(sessionId, secret);

5
services/real-time/test/acceptance/coffee/helpers/RealtimeServer.js
View file

@ -1,3 +1,8 @@
/* eslint-disable
handle-callback-err,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS101: Remove unnecessary use of Array.from * DS101: Remove unnecessary use of Array.from