From 50fbf93d647e3b488aae679ffe38d51f374406d0 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Mon, 18 Mar 2019 12:52:12 +0200
Subject: [PATCH] Move favicon.ico to the root folder

---
 client/{img/favicon-normal.ico => favicon.ico} | Bin
 client/index.html.tpl                          |   2 +-
 test/tests/build.js                            |  12 ++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 rename client/{img/favicon-normal.ico => favicon.ico} (100%)

diff --git a/client/img/favicon-normal.ico b/client/favicon.ico
similarity index 100%
rename from client/img/favicon-normal.ico
rename to client/favicon.ico
diff --git a/client/index.html.tpl b/client/index.html.tpl
index 4e4bc182..72b57a63 100644
--- a/client/index.html.tpl
+++ b/client/index.html.tpl
@@ -20,7 +20,7 @@
 	<title>The Lounge</title>
 
 	<!-- Browser tab icon -->
-	<link id="favicon" rel="icon" sizes="16x16 32x32 64x64" href="img/favicon-normal.ico" data-other="img/favicon-alerted.ico" type="image/x-icon">
+	<link id="favicon" rel="icon" sizes="16x16 32x32 64x64" href="favicon.ico" data-other="img/favicon-alerted.ico" type="image/x-icon">
 
 	<!-- Safari pinned tab icon -->
 	<link rel="mask-icon" href="img/icon-black-transparent-bg.svg" color="#415363">
diff --git a/test/tests/build.js b/test/tests/build.js
index 337ec5d7..fac21534 100644
--- a/test/tests/build.js
+++ b/test/tests/build.js
@@ -12,6 +12,13 @@ describe("public folder", function() {
 		expect(fs.existsSync(path.join(publicFolder, "fonts", "fa-solid-900.woff2"))).to.be.true;
 	});
 
+	it("files in root folder are copied", function() {
+		expect(fs.existsSync(path.join(publicFolder, "favicon.ico"))).to.be.true;
+		expect(fs.existsSync(path.join(publicFolder, "robots.txt"))).to.be.true;
+		expect(fs.existsSync(path.join(publicFolder, "service-worker.js"))).to.be.true;
+		expect(fs.existsSync(path.join(publicFolder, "thelounge.webmanifest"))).to.be.true;
+	});
+
 	it("index HTML file is not copied", function() {
 		expect(fs.existsSync(path.join(publicFolder, "index.html"))).to.be.false;
 		expect(fs.existsSync(path.join(publicFolder, "index.html.tpl"))).to.be.false;
@@ -22,6 +29,11 @@ describe("public folder", function() {
 		expect(fs.existsSync(path.join(publicFolder, "js", "bundle.vendor.js"))).to.be.true;
 	});
 
+	it("style files are built", function() {
+		expect(fs.existsSync(path.join(publicFolder, "css", "style.css"))).to.be.true;
+		expect(fs.existsSync(path.join(publicFolder, "css", "style.css.map"))).to.be.true;
+	});
+
 	it("javascript map is created", function() {
 		expect(fs.existsSync(path.join(publicFolder, "js", "bundle.js.map"))).to.be.true;
 	});