From 6b1638dc9a32d62c08ef6ea2ae9bcd2f159b23e6 Mon Sep 17 00:00:00 2001
From: NikkelM <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:03:29 +0100
Subject: [PATCH 1/6] Updated readme with information for test commands

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index facaaf06..0094f0f7 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,15 @@ You may also test the extension with Firefox by running `npm run dev:firefox`, w
 - Run `npm run dev:android` to load the extension in Firefox for Android.
 - Your device or emulator should now open Firefox for Android with the extension loaded.
 
+### Testing
+
+The project contains a number of different test suites, for different environments and purposes:
+
+- All tests: Run with `npm run test:all`
+- Unit tests: Run with `npm run test`
+- "Compatibility tests": Run with `npm run test:compatibility` and optionally the `:headless` or `:headful` suffixes
+	- These tests are used to ensure that the extension runs as expected in a live browser environment, for Chrome only at the moment. They utilize `puppeteer` to start a browser session and interact with the extension.
+
 ### Versioning
 
 The `manifest.json` contains two version numbers: `version` and `version_name`.

From eeb8f0b17f47f070037a99adcc2dc7e4581a91e0 Mon Sep 17 00:00:00 2001
From: NikkelM <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:07:20 +0100
Subject: [PATCH 2/6] Bump webpack

---
 package-lock.json | 38 +++++++++++++-------------------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b82dae09..abd3ab47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "sinon": "^15.1.0",
         "sinon-chrome": "^3.0.1",
         "web-ext": "^8.0.0",
-        "webpack": "^5.73.0",
+        "webpack": "^5.95.0",
         "webpack-cli": "^4.10.0",
         "webpack-merge": "^5.8.0"
       }
@@ -3666,17 +3666,6 @@
         "@types/json-schema": "*"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -4256,10 +4245,10 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -6970,9 +6959,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz",
-      "integrity": "sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14020,22 +14009,21 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.91.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-      "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
+        "acorn-import-attributes": "^1.9.5",
         "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.16.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
diff --git a/package.json b/package.json
index 71d3b2ad..00827a20 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "sinon": "^15.1.0",
     "sinon-chrome": "^3.0.1",
     "web-ext": "^8.0.0",
-    "webpack": "^5.73.0",
+    "webpack": "^5.95.0",
     "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"
   },

From 49eb111d10f7230587b20cacf275cd094b27e3c9 Mon Sep 17 00:00:00 2001
From: NikkelM <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:17:57 +0100
Subject: [PATCH 3/6] Moved API quota info to advanced settings

---
 CHANGELOG.md            | 10 ++++++++--
 src/html/popup/popup.js | 11 ++++++-----
 static/html/popup.html  | 13 +++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 395b353a..7034d2b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
-## v3.1.10
+## v3.1.11
 
 <!--Releasenotes start-->
-- News page will no longer open after updating from v3.1.5 or an earlier version.
+- Changed the default settings to not open shuffled videos in a new tab.
+- Moved the informative text about remaining YouTube API quota to the advanced settings menu.
+- Updated the welcome page for a better experience.
 <!--Releasenotes end-->
 
+## v3.1.10
+
+- News page will no longer open after updating from v3.1.5 or an earlier version.
+
 ## v3.1.9
 
 - Temporarily disabled the news feature.
diff --git a/src/html/popup/popup.js b/src/html/popup/popup.js
index c545657c..c9cb16d0 100644
--- a/src/html/popup/popup.js
+++ b/src/html/popup/popup.js
@@ -42,7 +42,7 @@ try {
 // --- Private ---
 // Get relevant DOM elements
 function getPopupDomElements() {
-	/* global reviewDonationDiv, reviewDiv, donationDiv, customApiKeyInputDiv, customApiKeyInputInfoDiv, shuffleNumVideosInPlaylistDiv, channelCustomOptionsDiv, channelCustomOptionsDropdownDiv, forYourInformationDiv, dailyQuotaNoticeDiv */
+	/* global reviewDonationDiv, reviewDiv, donationDiv, customApiKeyInputDiv, customApiKeyInputInfoDiv, shuffleNumVideosInPlaylistDiv, channelCustomOptionsDiv, channelCustomOptionsDropdownDiv, forYourInformationDiv, advancedSettingsDiv, dailyQuotaNoticeDiv */
 	/* eslint no-undef: "error" */
 	return {
 		body: document.body,
@@ -121,15 +121,16 @@ function getPopupDomElements() {
 		// Database sharing: Option toggle
 		dbSharingOptionToggle: document.getElementById("dbSharingOptionToggle"),
 
+		// Daily quota notice div
+		dailyQuotaNoticeDiv: advancedSettingsDiv.children.namedItem("dailyQuotaNoticeDiv"),
+		// Daily quota notice: Text
+		dailyQuotaNoticeText: dailyQuotaNoticeDiv.children.namedItem("dailyQuotaNoticeText"),
+
 		// FYI - FOR YOUR INFORMATION
 		// FYI div
 		forYourInformationDiv: document.getElementById("forYourInformationDiv"),
 		// FYI: Number of shuffled videos text
 		numberOfShuffledVideosText: forYourInformationDiv.children.namedItem("numberOfShuffledVideosText"),
-		// FYI: Daily quota notice div
-		dailyQuotaNoticeDiv: forYourInformationDiv.children.namedItem("dailyQuotaNoticeDiv"),
-		// Daily quota notice: Text
-		dailyQuotaNoticeText: dailyQuotaNoticeDiv.children.namedItem("dailyQuotaNoticeText"),
 
 		// FOOTER
 		// View changelog button
diff --git a/static/html/popup.html b/static/html/popup.html
index 5f59f1bb..474b13dd 100644
--- a/static/html/popup.html
+++ b/static/html/popup.html
@@ -200,13 +200,7 @@ <h3 id="channelCustomOptionsHeader">Channel settings</h3>
 					<br />
 					<button class="randomYoutubeVideoButton" id="customApiKeySubmitButton" type="button">Submit</button>
 				</div>
-			</div>
-			<!-- OPTIONS END -->
 
-			<!-- FYI -->
-			<div id="forYourInformationDiv">
-				<!-- Number of shuffled videos -->
-				<p id="numberOfShuffledVideosText" style="margin-bottom: 6px; margin-top: 6px">You have shuffled 0 times until now.</p>
 				<!-- Daily quota notice -->
 				<div
 					id="dailyQuotaNoticeDiv"
@@ -218,6 +212,13 @@ <h3 id="channelCustomOptionsHeader">Channel settings</h3>
 				</div>
 				<!-- Daily quota notice end -->
 			</div>
+			<!-- OPTIONS END -->
+
+			<!-- FYI -->
+			<div id="forYourInformationDiv">
+				<!-- Number of shuffled videos -->
+				<p id="numberOfShuffledVideosText" style="margin-bottom: 6px; margin-top: 6px">You have shuffled 0 times until now.</p>
+			</div>
 			<!-- FYI end -->
 
 			<footer id="randomYoutubeVideoFooter">

From 5e31b55dd2646008b3cdc60d0a6acec44d7330d8 Mon Sep 17 00:00:00 2001
From: NikkelM <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:18:12 +0100
Subject: [PATCH 4/6] Bumped version, updated default open in new tab option

---
 package.json             |  2 +-
 src/config.js            |  4 ++--
 static/html/welcome.html | 12 ++----------
 static/manifest.json     |  4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 00827a20..68a21a60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "random-youtube-video",
-  "version": "3.1.10",
+  "version": "3.1.11",
   "description": "Customize, shuffle and play random videos from any YouTube channel.",
   "scripts": {
     "dev": "concurrently \"npm run dev:chromium\" \"npm run dev:firefox\"",
diff --git a/src/config.js b/src/config.js
index baa46587..3a30433b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -9,8 +9,8 @@ export const configSyncDefaults = {
 	// If the user has enabled sharing video ID's with the database
 	"databaseSharingEnabledOption": true,
 	// These properties influence the behavior of the "Shuffle" button
-	"shuffleOpenInNewTabOption": true,
-	"shuffleReUseNewTabOption": true,
+	"shuffleOpenInNewTabOption": false,
+	"shuffleReUseNewTabOption": false,
 	// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
 	"shuffleIgnoreShortsOption": 1,
 	"shuffleOpenAsPlaylistOption": true,
diff --git a/static/html/welcome.html b/static/html/welcome.html
index dcd90f20..1bdfd638 100644
--- a/static/html/welcome.html
+++ b/static/html/welcome.html
@@ -23,13 +23,13 @@ <h3>To be able to use the extension, you <b>MUST</b></h3>
 				<br />
 				<br />
 				<h3>Before you can start and see 'Shuffle' buttons, you need to</h3>
-				<button id="reloadAllYouTubePagesButton" class="randomYoutubeVideoButton highlight-green" style="font-size: 20px">click me to reload all <i>YouTube.com</i> pages</button>
+				<button id="reloadAllYouTubePagesButton" class="randomYoutubeVideoButton highlight-green" style="font-size: 20px">click me to reload all <i>YouTube</i> pages</button>
 				<p>or do so manually.</p>
 				<p id="reloadText">
 					<br />
 					<br />
 					If you have any open YouTube pages, you will need to reload them to have 'Shuffle' buttons added to them.<br />
-					Don't have any videos running? Use the button above to automatically reload all YouTube pages open in your browser.
+					Use the button above to automatically reload all YouTube pages open in your browser, or do so manually.
 				</p>
 			</div>
 
@@ -38,16 +38,8 @@ <h3>Before you can start and see 'Shuffle' buttons, you need to</h3>
 			<h3>Customize your experience:</h3>
 			<button id="openOptionsPageButton" class="randomYoutubeVideoButton highlight-green" style="font-size: 20px">Open the options page</button>
 			<p>or open the popup for the same experience at any time.</p>
-			<br />
-			<p>
-				Some options are shown depending on the last channel you've visited - try opening the popup after doing so! <br />
-				Pin the popup to easily access the options at all times.
-			</p>
 
 			<br />
-			<br />
-			<p><i>Happy shuffling!</i></p>
-
 			<br />
 			<br />
 			<div id="shufflingHint">
diff --git a/static/manifest.json b/static/manifest.json
index c2ce548f..414ec9f0 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -1,8 +1,8 @@
 {
 	"name": "Random YouTube Video",
 	"description": "Customize, shuffle and play random videos from any YouTube channel.",
-	"version": "3.1.10",
-	"version_name": "3.1.10",
+	"version": "3.1.11",
+	"version_name": "3.1.11",
 	"manifest_version": 3,
 	"content_scripts": [
 		{

From d42ad6f1791583cb4b3c3d1252418c4a18dbe056 Mon Sep 17 00:00:00 2001
From: NikkelM <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:49:06 +0100
Subject: [PATCH 5/6] Added dedicated configSync defaults for tests

---
 test/chromeStorage.test.js   |  1 -
 test/playlistPermutations.js | 20 +++++----------
 test/testConfig.js           | 50 ++++++++++++++++++++++++++++++++++++
 test/testSetup.js            |  2 +-
 4 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 test/testConfig.js

diff --git a/test/chromeStorage.test.js b/test/chromeStorage.test.js
index 29ca63bf..cea0e7f3 100644
--- a/test/chromeStorage.test.js
+++ b/test/chromeStorage.test.js
@@ -18,7 +18,6 @@ describe('chromeStorage', function () {
 				for (let i = 0; i < Object.keys(configSyncDefaults).length; i++) {
 					expect(setArgs[i + 1]).to.eql([{ [Object.keys(configSyncDefaults)[i]]: Object.values(configSyncDefaults)[i] }]);
 				}
-				expect(setArgs[setArgs.length - 1]).to.eql([configSyncDefaults]);
 
 				expect(removeArgs).to.eql([["thisKeyShouldBeRemoved"]]);
 
diff --git a/test/playlistPermutations.js b/test/playlistPermutations.js
index 89dbf28d..5c14c948 100644
--- a/test/playlistPermutations.js
+++ b/test/playlistPermutations.js
@@ -1,4 +1,4 @@
-import { configSyncDefaults } from "../src/config.js";
+import { configSyncDefaults } from "./testConfig.js";
 
 // ---------- Constants used by the permutations ----------
 // Keep these in sync with the values compared against in the tests
@@ -19,12 +19,6 @@ export const times = {
 }
 
 // ---------- Config ----------
-// Any overrides to the default that needs to be different for the tests
-const overrides = {
-	shuffleOpenAsPlaylistOption: true
-};
-const configSyncTestDefaults = { ...configSyncDefaults, ...overrides };
-
 // The configSync should always be the default, with these settings being changed
 // This allows us to not have to define something for every setting
 const configSyncModifiers = [
@@ -123,7 +117,7 @@ for (const useCustomApiKeyOption of configSyncModifiers[0]) {
 			// Exclude invalid combinations
 			if (!useCustomApiKeyOption && (customYoutubeApiKey !== null || databaseSharingEnabledOption)) continue;
 
-			let modifiedConfigSync = deepCopy(configSyncTestDefaults);
+			let modifiedConfigSync = deepCopy(configSyncDefaults);
 			modifiedConfigSync.useCustomApiKeyOption = useCustomApiKeyOption;
 			modifiedConfigSync.customYoutubeApiKey = customYoutubeApiKey;
 			modifiedConfigSync.databaseSharingEnabledOption = databaseSharingEnabledOption;
@@ -142,7 +136,7 @@ for (const shuffleOpenInNewTabOption of configSyncModifiers[3]) {
 			if (!shuffleOpenInNewTabOption && shuffleReUseNewTabOption) continue;
 			if (!shuffleReUseNewTabOption && shuffleTabId !== null) continue;
 
-			let modifiedConfigSync = deepCopy(configSyncTestDefaults);
+			let modifiedConfigSync = deepCopy(configSyncDefaults);
 			modifiedConfigSync.shuffleOpenInNewTabOption = shuffleOpenInNewTabOption;
 			modifiedConfigSync.shuffleReUseNewTabOption = shuffleReUseNewTabOption;
 			modifiedConfigSync.shuffleTabId = shuffleTabId;
@@ -156,7 +150,7 @@ configSyncPermutations.openInNewTabPermutations = openInNewTabPermutations;
 // Ignore shorts
 const ignoreShortsPermutations = [];
 for (const shuffleIgnoreShortsOption of configSyncModifiers[6]) {
-	let modifiedConfigSync = deepCopy(configSyncTestDefaults);
+	let modifiedConfigSync = deepCopy(configSyncDefaults);
 	modifiedConfigSync.shuffleIgnoreShortsOption = shuffleIgnoreShortsOption;
 
 	ignoreShortsPermutations.push(modifiedConfigSync);
@@ -167,7 +161,7 @@ configSyncPermutations.ignoreShortsPermutations = ignoreShortsPermutations;
 const openAsPlaylistPermutations = [];
 for (const shuffleOpenAsPlaylistOption of configSyncModifiers[7]) {
 	for (const shuffleNumVideosInPlaylist of configSyncModifiers[8]) {
-		let modifiedConfigSync = deepCopy(configSyncTestDefaults);
+		let modifiedConfigSync = deepCopy(configSyncDefaults);
 		// Always open in a new tab, so we can check the stub
 		modifiedConfigSync.shuffleOpenInNewTabOption = true;
 
@@ -189,7 +183,7 @@ for (const activeOption of configSyncModifiers[9]) {
 		// The allVideosOption and percentageOption do not error out if no value is set
 		if (["allVideosOption", "percentageOption"].includes(activeOption) && channelSettingsPermutation.type === "empty") continue;
 
-		let modifiedConfigSync = deepCopy(configSyncTestDefaults);
+		let modifiedConfigSync = deepCopy(configSyncDefaults);
 		let usedChannelSettingsPermutation = deepCopy(channelSettingsPermutation);
 
 		usedChannelSettingsPermutation.template.activeOption = activeOption;
@@ -578,7 +572,7 @@ export function needsDBInteraction(permutation) {
 }
 
 // Determine whether or not a permutation needs to interact with the YouTube API
-export function needsYTAPIInteraction(permutation, configSync = configSyncTestDefaults) {
+export function needsYTAPIInteraction(permutation, configSync = configSyncDefaults) {
 	const databaseSharing = configSync.databaseSharingEnabledOption;
 	if (databaseSharing) {
 		return (needsDBInteraction(permutation) &&
diff --git a/test/testConfig.js b/test/testConfig.js
new file mode 100644
index 00000000..1d63b4f5
--- /dev/null
+++ b/test/testConfig.js
@@ -0,0 +1,50 @@
+// Contains configuration and other default values, changed to be used as the default in tests
+
+// All keys regarding user settings and their defaults
+export const configSyncDefaults = {
+	// If the user has enabled the custom API key option
+	"useCustomApiKeyOption": false,
+	// The custom API key the user has provided. This key is already validated.
+	"customYoutubeApiKey": null,
+	// If the user has enabled sharing video ID's with the database
+	"databaseSharingEnabledOption": true,
+	// These properties influence the behavior of the "Shuffle" button
+	"shuffleOpenInNewTabOption": true,
+	"shuffleReUseNewTabOption": true,
+	// 0 = only shorts, 1 = no option set (shorts are included), 2 = ignore shorts
+	"shuffleIgnoreShortsOption": 1,
+	"shuffleOpenAsPlaylistOption": true,
+	// How many random videos to add to a playlist (0-50)
+	"shuffleNumVideosInPlaylist": 10,
+	// If shuffled videos are opened in a new tab, save the tab ID of that tab here to reuse the tab when the user shuffles again
+	"shuffleTabId": null,
+	// channelSettings is a dictionary of channelID -> Dictionary of channel settings
+	"channelSettings": {},
+	// These two properties are used by the popup to determine which channel's settings to show
+	"currentChannelId": null,
+	"currentChannelName": null,
+	// The number of videos the user has shuffled so far
+	// Does not count multiple times if a playlist is shuffled, so is actually numShuffledTimesTotal
+	"numShuffledVideosTotal": 0,
+	// These two properties determine the amount of quota remaining today, and the time at which the quota will next reset (daily resets at midnight)
+	"userQuotaRemainingToday": 200,
+	// The default reset time is midnight of the next day
+	"userQuotaResetTime": new Date(new Date().setHours(24, 0, 0, 0)).getTime(),
+	// We want to regularly check if there are new API keys available (weekly)
+	"nextAPIKeysCheckTime": new Date(new Date().setHours(168, 0, 0, 0)).getTime(),
+	// The last version for which the user has viewed the changelog
+	"lastViewedChangelogVersion": "0",
+	// For april fools: Will be the number of the year in which the user was last rickrolled (we only want to rickroll the user once per year)
+	"wasLastRickRolledInYear": "1970",
+	// Used when updating the extension
+	"previousVersion": null,
+	// If the message asking for a review has been shown yet
+	"reviewMessageShown": false,
+	// If the message asking for a donation has been shown yet
+	"donationMessageShown": false,
+	// The id/date of the last viewed news article
+	"lastViewedNewsId": null,
+	// The next time we should check for news (once per day)
+	// We delay the first check by 24 hours to not immediately show the news after a user has installed the extension
+	"nextNewsCheckTime": new Date(new Date().setHours(24, 0, 0, 0)).getTime()
+};
diff --git a/test/testSetup.js b/test/testSetup.js
index 9991ba72..3a8b3457 100644
--- a/test/testSetup.js
+++ b/test/testSetup.js
@@ -1,6 +1,6 @@
 import sinonChrome from 'sinon-chrome';
 
-import { configSyncDefaults } from '../src/config.js';
+import { configSyncDefaults } from './testConfig.js';
 import { deepCopy, localPlaylistPermutations, databasePermutations } from './playlistPermutations.js';
 
 global.chrome = sinonChrome;

From 5b583229c5dc6354ccaa55ae9a0d09e271b466e9 Mon Sep 17 00:00:00 2001
From: NikkelM <57323886+NikkelM@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:58:47 +0100
Subject: [PATCH 6/6] Moved compatibility tests to their own folder

---
 README.md                                               | 2 +-
 package.json                                            | 8 ++++----
 test/{ => compatibility}/compatibility.headful.test.js  | 2 +-
 test/{ => compatibility}/compatibility.headless.test.js | 0
 test/{ => compatibility}/compatibility.test.js          | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename test/{ => compatibility}/compatibility.headful.test.js (97%)
 rename test/{ => compatibility}/compatibility.headless.test.js (100%)
 rename test/{ => compatibility}/compatibility.test.js (100%)

diff --git a/README.md b/README.md
index 0094f0f7..57c56c3d 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ You may also test the extension with Firefox by running `npm run dev:firefox`, w
 The project contains a number of different test suites, for different environments and purposes:
 
 - All tests: Run with `npm run test:all`
-- Unit tests: Run with `npm run test`
+- Unit tests: Run with `npm test`
 - "Compatibility tests": Run with `npm run test:compatibility` and optionally the `:headless` or `:headful` suffixes
 	- These tests are used to ensure that the extension runs as expected in a live browser environment, for Chrome only at the moment. They utilize `puppeteer` to start a browser session and interact with the extension.
 
diff --git a/package.json b/package.json
index 68a21a60..8e577593 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,11 @@
     "build:firefox": "webpack --env browser=firefox --config webpack.prod.cjs",
     "lint": "eslint --ext .ts,.js --max-warnings=0 . --ignore-path .eslintignore",
     "lint:firefox": "web-ext lint --source-dir ./dist/firefox",
-    "test": "c8 --reporter=lcov --reporter=text mocha ./test/testSetup.js ./test/chromeStorage.test.js ./test/**/*.test.js --exclude ./test/compatibility*.test.js --require mocha-suppress-logs",
+    "test": "c8 --reporter=lcov --reporter=text mocha ./test/testSetup.js ./test/chromeStorage.test.js ./test/*.test.js --require mocha-suppress-logs",
     "test:all": "npm run test && npm run test:compatibility",
-    "test:compatibility": "mocha ./test/testSetup.js ./test/compatibility*.test.js --require mocha-suppress-logs --retries 3",
-    "test:compatibility:headless": "mocha ./test/testSetup.js ./test/compatibility.test.js ./test/compatibility.headless.test.js --require mocha-suppress-logs --retries 3",
-    "test:compatibility:headful": "mocha ./test/testSetup.js ./test/compatibility.headful.test.js --require mocha-suppress-logs --retries 3"
+    "test:compatibility": "mocha ./test/testSetup.js ./test/compatibility/compatibility*.test.js --require mocha-suppress-logs --retries 3",
+    "test:compatibility:headless": "mocha ./test/testSetup.js ./test/compatibility/compatibility.test.js ./test/compatibility/compatibility.headless.test.js --require mocha-suppress-logs --retries 3",
+    "test:compatibility:headful": "mocha ./test/testSetup.js ./test/compatibility/compatibility.headful.test.js --require mocha-suppress-logs --retries 3"
   },
   "type": "module",
   "devDependencies": {
diff --git a/test/compatibility.headful.test.js b/test/compatibility/compatibility.headful.test.js
similarity index 97%
rename from test/compatibility.headful.test.js
rename to test/compatibility/compatibility.headful.test.js
index 74c75fcc..4eacce08 100644
--- a/test/compatibility.headful.test.js
+++ b/test/compatibility/compatibility.headful.test.js
@@ -13,7 +13,7 @@ describe("headful compatibility", function () {
 		let browser, page;
 
 		before(async () => {
-			const extensionPath = join(__dirname, "../dist/chromium");
+			const extensionPath = join(__dirname, "../../dist/chromium");
 
 			browser = await puppeteer.launch({
 				headless: false, // Extensions only work in head-full mode
diff --git a/test/compatibility.headless.test.js b/test/compatibility/compatibility.headless.test.js
similarity index 100%
rename from test/compatibility.headless.test.js
rename to test/compatibility/compatibility.headless.test.js
diff --git a/test/compatibility.test.js b/test/compatibility/compatibility.test.js
similarity index 100%
rename from test/compatibility.test.js
rename to test/compatibility/compatibility.test.js