generator-discord 1.3.3 → 1.3.4

package/templates/rust/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serenity = { version = "0.11.6", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
+serenity = { version = "0.11.7", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] }
 tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }

package/test/templates.test.ts

@@ -6,7 +6,7 @@ import path from 'path';
 import url from 'url';
 
 const __dirname = url.fileURLToPath(new URL('../', import.meta.url));
-const TIMEOUT = 30_000; // 30 seconds
+const DEFAULT_TIMEOUT = 60_000; // 1 minute
 
 dotenv.config();
 
@@ -38,14 +38,13 @@ describe('Check if the templates work', () => {
 			})
 			.withAnswers(defaultAnswers)
 			.then(async () => {
-				const result = await runBot('node', ['./dist/src/index.js'], resultRoot);
+				const result = await runBot('node', ['./dist/src/index.js'], resultRoot, DEFAULT_TIMEOUT);
 				expect(result).toContain(BOT_OUTPUT_START);
 			});
 
 		context.cleanup();
 	}, 120_000);
 
-	
 	test.skip('Should generate and run Python Discord Bot', async () => {
 		const context = createHelpers({}).run(moduleRoot);
 
@@ -55,44 +54,87 @@ describe('Check if the templates work', () => {
 			.onGenerator(generator => {
 				generator.destinationRoot(targetRoot);
 			})
-			.withAnswers({...defaultAnswers, botType: 'python' })
+			.withAnswers({ ...defaultAnswers, botType: 'python' })
 			.then(async () => {
 				// install dependencies 
 				await exec('pip3 install -r requirements.txt', { cwd: resultRoot });
 
-				const result = await runBot('python', ['main.py'], resultRoot);
+				const result = await runBot('python', ['./main.py'], resultRoot, DEFAULT_TIMEOUT);
 				expect(result).toContain(BOT_OUTPUT_START);
 			});
 
 		context.cleanup();
 	}, 120_000);
-});
 
+	test('Should generate and run JavaScript Discord Bot', async () => {
+		const context = createHelpers({}).run(moduleRoot);
+
+		context.targetDirectory = targetRoot;
+		context.cleanTestDirectory(true);
+		await context
+			.onGenerator(generator => {
+				generator.destinationRoot(targetRoot);
+			})
+			.withAnswers({ ...defaultAnswers, botType: 'javascript' })
+			.then(async () => {
+				const result = await runBot('node', ['./src/index.js'], resultRoot, DEFAULT_TIMEOUT);
+				expect(result).toContain(BOT_OUTPUT_START);
+			});
+
+		context.cleanup();
+	}, 120_000);
 
-async function runBot(command: string, args: string[], root: string): Promise<string> {
-	const childProcess = spawn(command, args, { cwd: root, stdio: 'pipe', timeout: TIMEOUT });
+	test('Should generate and run Rust Discord Bot', async () => {
+		const context = createHelpers({}).run(moduleRoot);
+
+		context.targetDirectory = targetRoot;
+		context.cleanTestDirectory(true);
+		await context
+			.onGenerator(generator => {
+				generator.destinationRoot(targetRoot);
+			})
+			.withAnswers({ ...defaultAnswers, botType: 'rust' })
+			.withArguments(['skip-build'])
+			.then(async () => {
+				const result = await runBot('cargo', ['run', '--release', '--quiet'] , resultRoot, 120_000); // 2 minutes
+				expect(result).toContain(BOT_OUTPUT_START);
+			});
+
+		context.cleanup();
+	}, 180_000); // 3 minutes
+});
+
+/** Run a command in a child process and return the output
+ * @param {string} command The command to run
+ * @param {string[]} args The arguments to pass to the command
+ * @param {string} root The root directory to run the command in
+ * @param {number} timeoutTime The time in milliseconds to wait before timing out
+ * @returns {Promise<string>} The output of the command
+*/
+async function runBot(command: string, args: string[], root: string, timeoutTime: number): Promise<string> {
+	const childProcess = spawn(command, args, { cwd: root, timeout: timeoutTime });
 
 	const result = await new Promise<string>((resolve) => {
 		// timeout
-		const timeout = setTimeout(() => {
+		const safetyTimeout = setTimeout(() => {
 			resolve('TIMEOUT');
-		}, TIMEOUT);
+		}, timeoutTime);
 
 		// output
 		childProcess.stdout.on('data', (data) => {
-			clearTimeout(timeout);
-			
+			clearTimeout(safetyTimeout);
+
 			resolve(data.toString());
 		});
 
 		childProcess.stderr.on('data', (data) => {
-			clearTimeout(timeout);
+			clearTimeout(safetyTimeout);
 
 			resolve(data.toString());
 		});
 
 		childProcess.on('close', () => {
-			clearTimeout(timeout);
+			clearTimeout(safetyTimeout);
 		});
 
 	});
@@ -102,4 +144,4 @@ async function runBot(command: string, args: string[], root: string): Promise<st
 }
 
 
-const BOT_OUTPUT_START = 'Bot is logged in as';
+const BOT_OUTPUT_START = 'Bot is logged in as';