fix: Fix tests failing due to repo restructure/protocol changes

Author: thebongy

test/gotham-node.test.ts

@@ -15,7 +15,7 @@ makeConnectionTests('Initalize Tests', function () {
 		await sleep(0);
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
-			type: 'moduleRegistration',
+			type: 1,
 			moduleId: 'test-module',
 			version: '1.0.0',
 			dependencies: {}
@@ -30,7 +30,7 @@ makeConnectionTests('Initalize Tests', function () {
 		await sleep(0);
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
-			type: 'moduleRegistration',
+			type: 1,
 			moduleId: 'test-module',
 			version: '1.0.0',
 			dependencies: {
@@ -40,31 +40,21 @@ makeConnectionTests('Initalize Tests', function () {
 		});
 	});
 
-	it('Does not allow to send other request without initializing', async function () {
-		await expect(
-			this.test.module.declareFunction('test', () => { })
-		).to.be.rejectedWith(Error);
-		await expect(
-			this.test.module.callFunction('test', {})
-		).to.be.rejectedWith(Error);
-		await expect(
-			this.test.module.registerHook('test', () => { })
-		).to.be.rejectedWith(Error);
-		await expect(
-			this.test.module.triggerHook('test')
-		).to.be.rejectedWith(Error);
-	});
-
 	it('Initialize resolves correctly/Cannot initalize twice', async function () {
 		const p = this.test.module.initialize('test-module1', '1.0.0', {});
 		await sleep(0);
 		const requestId = this.test.getLatestSent().requestId;
 		this.test.conn.sendResponse({
 			requestId,
-			type: 'moduleRegistered'
+			type: 2,
+		});
+		this.test.conn.sendResponse({
+			requestId: '123',
+			hook: "gotham.activated",
+			type: 8
 		});
 		expect(p).to.eventually.equal(true);
-		return await expect(
+		return expect(
 			this.test.module.initialize('test-module2', '1.0.0', {})
 		).to.be.rejectedWith(Error);
 	});
@@ -76,7 +66,7 @@ makeConnectionTests('Test if requests constructed correctly', function () {
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
 			function: "test_fn",
-			type: "declareFunction"
+			type: 9
 		});
 	});
 
@@ -86,7 +76,7 @@ makeConnectionTests('Test if requests constructed correctly', function () {
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
 			function: "module.test_fn",
-			type: "functionCall",
+			type: 3,
 			arguments: {}
 		});
 	});
@@ -99,7 +89,7 @@ makeConnectionTests('Test if requests constructed correctly', function () {
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
 			function: "module.test_fn",
-			type: "functionCall",
+			type: 3,
 			arguments: {
 				a: 1,
 				b: 2
@@ -112,16 +102,16 @@ makeConnectionTests('Test if requests constructed correctly', function () {
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
 			hook: "test_hook",
-			type: "registerHook",
+			type: 5,
 		});
 	});
 
 	it('triggerHook', function () {
 		this.test.module.triggerHook('test_hook');
 		const message = this.test.getLatestSent();
 		expect(message).excluding('requestId').to.deep.equal({
-			type: "triggerHook",
-			hook: 'test_hook'
+			type: 7,
+			hook: "test_hook",
 		});
 	});
 });
@@ -134,7 +124,7 @@ makeConnectionTests('Test if responses from gotham parsed correctly', async func
 		await sleep(0);
 		this.test.conn.sendResponse({
 			requestId,
-			type: 'functionDeclared',
+			type: 10,
 			function: 'test_fn'
 		});
 		return expect(p).to.eventually.equal(true);
@@ -145,7 +135,7 @@ makeConnectionTests('Test if responses from gotham parsed correctly', async func
 		const requestId = this.test.getLatestSent().requestId;
 		this.test.conn.sendResponse({
 			requestId,
-			type: 'hookRegistered',
+			type: 6,
 		});
 
 		return expect(p).to.eventually.equal(true);
@@ -157,7 +147,7 @@ makeConnectionTests('Test if responses from gotham parsed correctly', async func
 		await sleep(0);
 		this.test.conn.sendResponse({
 			requestId: '12345',
-			type: 'hookTriggered',
+			type: 8,
 			hook: 'test_hook'
 		});
 		// await sleep(0);
@@ -171,15 +161,15 @@ makeConnectionTests('Test if responses from gotham parsed correctly', async func
 
 		this.test.conn.sendResponse({
 			requestId: '12345',
-			type: 'functionCall',
+			type: 3,
 			function: 'test_fn'
 		});
 
 		assert(fn.calledOnce);
 
 		this.test.conn.sendResponse({
 			requestId: '12345',
-			type: 'functionCall',
+			type: 3,
 			function: 'test_fn',
 			arguments: {a : 1, b: 2}
 		});
@@ -194,7 +184,7 @@ makeConnectionTests('Test if responses from gotham parsed correctly', async func
 
 		this.test.conn.sendResponse({
 			requestId,
-			type: 'functionResponse',
+			type: 4,
 			data: {
 				a:1,
 				b: 2

test/helpers.ts

@@ -21,8 +21,10 @@ export class DummyGothamConnection extends BaseConnection {
 
 	}
 
-	sendResponse(message: any) {
-		this.dataListener(message);
+	sendResponse(message: object) {
+		this.onData(
+			Buffer.from(JSON.stringify(message))
+		);
 	}
 }
 
@@ -33,9 +35,9 @@ export function makeConnectionTests(name: string, tests: Function, initalizeModu
 			this.currentTest.sendFunc = sinon.fake();
 			this.currentTest.getLatestSent =  () => {
 				if (this.currentTest) {
-					return this.currentTest.sendFunc.getCall(0).args[0];
+					return JSON.parse(this.currentTest.sendFunc.getCall(0).args[0].toString());
 				} else {
-					return this.test.sendFunc.getCall(0).args[0];
+					return JSON.parse(this.test.sendFunc.getCall(0).args[0].toString());
 				}
 			}
 			sinon.replace(this.currentTest.conn, 'send', this.currentTest.sendFunc);
@@ -50,7 +52,12 @@ export function makeConnectionTests(name: string, tests: Function, initalizeModu
 				const requestId = this.currentTest.sendFunc.getCall(0).args[0].requestId;
 				this.currentTest.conn.sendResponse({
 					requestId,
-					type: 'moduleRegistered'
+					type: 2,
+				});
+				this.currentTest.conn.sendResponse({
+					requestId: '123',
+					hook: "gotham.activated",
+					type: 8
 				});
 				await sleep(0);
 				this.currentTest.sendFunc.resetHistory();