From 4b35f654a3ab9be6704ea5e9164399ae65b960a3 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 13:03:46 -0500
Subject: [PATCH] test: more test fixes

---
 test/build.js       |  7 +++----
 test/controllers.js | 31 ++-----------------------------
 test/utils.js       | 38 --------------------------------------
 3 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/test/build.js b/test/build.js
index 0727bc6d27..2f0789a702 100644
--- a/test/build.js
+++ b/test/build.js
@@ -137,9 +137,8 @@ describe('Build', (done) => {
 	it('should build requirejs modules', (done) => {
 		build.build(['requirejs modules'], (err) => {
 			assert.ifError(err);
-			const filename = path.join(__dirname, '../build/public/src/modules/Chart.js');
+			const filename = path.join(__dirname, '../build/public/src/modules/alerts.js');
 			assert(file.existsSync(filename));
-			assert(fs.readFileSync(filename).toString().startsWith('/*!\n * Chart.js'));
 			done();
 		});
 	});
@@ -147,7 +146,7 @@ describe('Build', (done) => {
 	it('should build client js bundle', (done) => {
 		build.build(['client js bundle'], (err) => {
 			assert.ifError(err);
-			const filename = path.join(__dirname, '../build/public/nodebb.min.js');
+			const filename = path.join(__dirname, '../build/public/client-scripts.min.js');
 			assert(file.existsSync(filename));
 			assert(fs.readFileSync(filename).length > 1000);
 			done();
@@ -157,7 +156,7 @@ describe('Build', (done) => {
 	it('should build admin js bundle', (done) => {
 		build.build(['admin js bundle'], (err) => {
 			assert.ifError(err);
-			const filename = path.join(__dirname, '../build/public/acp.min.js');
+			const filename = path.join(__dirname, '../build/public/acp-scripts.min.js');
 			assert(file.existsSync(filename));
 			assert(fs.readFileSync(filename).length > 1000);
 			done();
diff --git a/test/controllers.js b/test/controllers.js
index bb4aec7688..316bf3a151 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -720,7 +720,7 @@ describe('Controllers', () => {
 
 
 	it('should load nodebb.min.js', (done) => {
-		request(`${nconf.get('url')}/assets/nodebb.min.js`, (err, res, body) => {
+		request(`${nconf.get('url')}/dist/app.bundle.js`, (err, res, body) => {
 			assert.ifError(err);
 			assert.equal(res.statusCode, 200);
 			assert(body);
@@ -729,7 +729,7 @@ describe('Controllers', () => {
 	});
 
 	it('should load acp.min.js', (done) => {
-		request(`${nconf.get('url')}/assets/acp.min.js`, (err, res, body) => {
+		request(`${nconf.get('url')}/dist/admin.bundle.js`, (err, res, body) => {
 			assert.ifError(err);
 			assert.equal(res.statusCode, 200);
 			assert(body);
@@ -2004,33 +2004,6 @@ describe('Controllers', () => {
 		});
 	});
 
-	describe('timeago locales', () => {
-		it('should load timeago locale', (done) => {
-			request(`${nconf.get('url')}/assets/src/modules/timeago/locales/jquery.timeago.af.js`, (err, res, body) => {
-				assert.ifError(err);
-				assert.equal(res.statusCode, 200);
-				assert(body.includes('"gelede"'));
-				done();
-			});
-		});
-
-		it('should return not found if NodeBB language exists but timeago locale does not exist', (done) => {
-			request(`${nconf.get('url')}/assets/src/modules/timeago/locales/jquery.timeago.ms.js`, (err, res, body) => {
-				assert.ifError(err);
-				assert.equal(res.statusCode, 404);
-				done();
-			});
-		});
-
-		it('should return not found if NodeBB language does not exist', (done) => {
-			request(`${nconf.get('url')}/assets/src/modules/timeago/locales/jquery.timeago.muggle.js`, (err, res, body) => {
-				assert.ifError(err);
-				assert.equal(res.statusCode, 404);
-				done();
-			});
-		});
-	});
-
 	describe('category', () => {
 		let jar;
 		before(async () => {
diff --git a/test/utils.js b/test/utils.js
index 58d0ef2299..8454c4c9f1 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -15,47 +15,9 @@ describe('Utility Methods', () => {
 	global.jQuery = require('jquery');
 	global.$ = global.jQuery;
 	const { $ } = global;
-	require('jquery-deserialize');
-	require('jquery-serializeobject');
 
 	const utils = require('../public/src/utils');
 
-	it('should serialize/deserialize form data properly', () => {
-		const formSerialize = $(`
-			<form id="form-serialize">
-				<input name="a" value="1">
-				<input name="a" value="2">
-				<input name="bar" value="test">
-				<input name="check1" type="checkbox" checked>
-				<input name="check2" type="checkbox">
-			</form>
-		`);
-		const sampleData = {
-			a: ['1', '2'],
-			bar: 'test',
-			check1: 'on',
-		};
-		const data = formSerialize.serializeObject();
-		assert.deepStrictEqual(data, sampleData);
-
-		const formDeserialize = $(`
-			<form>
-				<input id="input1" name="a"/>
-				<input id="input2" name="a"/>
-				<input id="input3" name="bar"/>
-				<input id="input4" name="check1" type="checkbox">
-				<input id="input5" name="check2" type="checkbox">
-			</form>
-		`);
-
-		formDeserialize.deserialize(sampleData);
-		assert.strictEqual(formDeserialize.find('#input1').val(), sampleData.a[0]);
-		assert.strictEqual(formDeserialize.find('#input2').val(), sampleData.a[1]);
-		assert.strictEqual(formDeserialize.find('#input3').val(), sampleData.bar);
-		assert.strictEqual(formDeserialize.find('#input4').prop('checked'), true);
-		assert.strictEqual(formDeserialize.find('#input5').prop('checked'), false);
-	});
-
 	// https://github.com/jprichardson/string.js/blob/master/test/string.test.js
 	it('should decode HTML entities', (done) => {
 		assert.strictEqual(