From cb3472842113dbe8fa618570c1c1f8cf7c0b00b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 17 Feb 2022 22:10:33 -0500
Subject: [PATCH] test: maybe fix build test

---
 public/src/app.js |  4 ++--
 src/meta/js.js    | 10 +++-------
 test/build.js     | 31 +++++++++++++++++--------------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 912940c4f9..7bbf2dac9b 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -14,9 +14,9 @@ const Benchpress = require('benchpressjs');
 
 Benchpress.setGlobal('config', config);
 if (app.inAdmin) {
- 	require('../../build/public/acp-scripts.min');
+ 	require('../../build/public/scripts-admin.min');
 } else {
-	require('../../build/public/client-scripts.min');
+	require('../../build/public/scripts-client.min');
 }
 
 require('./sockets');
diff --git a/src/meta/js.js b/src/meta/js.js
index 1071122ad3..548b0d7f50 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -128,18 +128,14 @@ async function getBundleScriptList(target) {
 }
 
 JS.buildBundle = async function (target, fork) {
-	const fileNames = {
-		client: 'client-scripts.min.js',
-		admin: 'acp-scripts.min.js',
-	};
-
+	const filename = `scripts-${target}.min.js`;
 	const files = await getBundleScriptList(target);
 	const minify = process.env.NODE_ENV !== 'development';
-	const filePath = path.join(__dirname, '../../build/public', fileNames[target]);
+	const filePath = path.join(__dirname, '../../build/public', filename);
 
 	await minifier.js.bundle({
 		files: files,
-		filename: fileNames[target],
+		filename: filename,
 		destPath: filePath,
 	}, minify, fork);
 };
diff --git a/test/build.js b/test/build.js
index 6b521f2f4c..da761ddc93 100644
--- a/test/build.js
+++ b/test/build.js
@@ -6,7 +6,6 @@ const assert = require('assert');
 const mkdirp = require('mkdirp');
 const rimraf = require('rimraf');
 const async = require('async');
-const nconf = require('nconf');
 
 const db = require('./mocks/databasemock');
 const file = require('../src/file');
@@ -148,7 +147,7 @@ describe('Build', () => {
 	it('should build client js bundle', (done) => {
 		build.build(['client js bundle'], (err) => {
 			assert.ifError(err);
-			const filename = path.join(__dirname, '../build/public/client-scripts.min.js');
+			const filename = path.join(__dirname, '../build/public/scripts-client.min.js');
 			assert(file.existsSync(filename));
 			assert(fs.readFileSync(filename).length > 1000);
 			done();
@@ -158,7 +157,7 @@ describe('Build', () => {
 	it('should build admin js bundle', (done) => {
 		build.build(['admin js bundle'], (err) => {
 			assert.ifError(err);
-			const filename = path.join(__dirname, '../build/public/acp-scripts.min.js');
+			const filename = path.join(__dirname, '../build/public/scripts-admin.min.js');
 			assert(file.existsSync(filename));
 			assert(fs.readFileSync(filename).length > 1000);
 			done();
@@ -190,17 +189,21 @@ describe('Build', () => {
 		});
 	});
 
-	// TODO: doesn't work because plugins js modules are not loaded into build/public/src/modules
-	it('should build bundle files', async () => {
-		await build.buildAll();
-		assert(file.existsSync(path.join(__dirname, '../dist/app.bundle.js')));
-		assert(file.existsSync(path.join(__dirname, '../dist/admin.bundle.js')));
-		let { res, body } = await helpers.request('GET', `/dist/app.bundle.js`, {});
-		assert(res.statusCode, 200);
-		assert(body);
-		({ res, body } = await helpers.request('GET', `/dist/admin.bundle.js`, {}));
-		assert(res.statusCode, 200);
-		assert(body);
+
+	it('should build bundle files', function (done) {
+		this.timeout(0);
+		build.buildAll(async (err) => {
+			assert.ifError(err);
+			assert(file.existsSync(path.join(__dirname, '../build/webpack/nodebb.min.js')));
+			assert(file.existsSync(path.join(__dirname, '../build/webpack/admin.min.js')));
+			let { res, body } = await helpers.request('GET', `/assets/nodebb.min.js`, {});
+			assert(res.statusCode, 200);
+			assert(body);
+			({ res, body } = await helpers.request('GET', `/assets/admin.min.js`, {}));
+			assert(res.statusCode, 200);
+			assert(body);
+			done();
+		});
 	});
 
 	it('should build templates', function (done) {