Merge pull request #31 from th-ch/dependabot/npm_and_yarn/electron-8.2.4

Bump electron from 8.2.1 to 8.2.4

.travis.yml

@@ -9,6 +9,8 @@ jobs:
       osx_image: xcode11.3
     - os: linux
       dist: xenial
+      services:
+        - xvfb
 
 cache:
   yarn: false
@@ -18,6 +20,7 @@ cache:
 
 script:
   - |
+    yarn test
     if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       yarn run release:linux
     else

appveyor.yml

@@ -21,6 +21,11 @@ install:
 #   # https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
 #   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
+# @FIXME: tests disabled because app fails to launch on AppVeyor/Windows
+# os: unstable # https://github.com/electron-userland/spectron#on-appveyor
+# test_script:
+#   - yarn test
+
 build_script:
   - yarn run release:win
 

index.js

@@ -10,12 +10,15 @@ const {
 	autoUpdate,
 	getEnabledPlugins,
 	isAppVisible,
+	isTrayEnabled,
 	store,
 } = require("./store");
 const { fileExists, injectCSS } = require("./plugins/utils");
+const { isTesting } = require("./utils/testing");
 const { setUpTray } = require("./tray");
 
 const app = electron.app;
+app.allowRendererProcessReuse = true; // https://github.com/electron/electron/issues/18397
 
 // Adds debug features like hotkeys for triggering dev tools and reload
 require("electron-debug")();
@@ -48,7 +51,7 @@ function createMainWindow() {
 		backgroundColor: "#000",
 		show: false,
 		webPreferences: {
-			nodeIntegration: false,
+			nodeIntegration: isTesting(), // Only necessary when testing with Spectron
 			preload: path.join(__dirname, "preload.js"),
 			nativeWindowOpen: true, // window.open return Window object(like in regular browsers), not BrowserWindowProxy
 			affinity: "main-window", // main window, and addition windows should work in one process
@@ -183,16 +186,20 @@ app.on("ready", () => {
 	}
 
 	// Optimized for Mac OS X
-	if (process.platform === "darwin") {
+	if (is.macOS()) {
 		if (!isAppVisible()) {
 			app.dock.hide();
 		}
+	}
 
-		var forceQuit = false;
+	var forceQuit = false;
-		app.on("before-quit", () => {
+	app.on("before-quit", () => {
-			forceQuit = true;
+		forceQuit = true;
-		});
+	});
+
+	if (is.macOS() || isTrayEnabled()) {
 		mainWindow.on("close", (event) => {
+			// Hide the window instead of quitting (quit is available in tray options)
 			if (!forceQuit) {
 				event.preventDefault();
 				mainWindow.hide();

jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+	globals: {
+		__APP__: undefined, // A different app will be launched in each test environment
+	},
+	testEnvironment: "./tests/environment",
+	testTimeout: 30000, // 30s
+};

menu.js

@@ -71,7 +71,7 @@ module.exports.mainMenuTemplate = mainMenuTemplate;
 module.exports.setApplicationMenu = () => {
 	const menuTemplate = [...mainMenuTemplate];
 	if (process.platform === "darwin") {
-		const name = app.getName();
+		const name = app.name;
 		menuTemplate.unshift({
 			label: name,
 			submenu: [

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "youtube-music",
 	"productName": "YouTube Music",
-	"version": "1.3.1",
+	"version": "1.3.3",
 	"description": "YouTube Music Desktop App - including custom plugins",
 	"license": "MIT",
 	"repository": "th-ch/youtube-music",
@@ -26,7 +26,7 @@
 		}
 	},
 	"scripts": {
-		"test": "xo",
+		"test": "jest",
 		"start": "electron .",
 		"icon": "rimraf assets/generated && electron-icon-maker --input=assets/youtube-music.png --output=assets/generated",
 		"generate:package": "node utils/generate-package-json.js",
@@ -46,22 +46,25 @@
 		"npm": "Please use yarn and not npm"
 	},
 	"dependencies": {
-		"@cliqz/adblocker-electron": "^1.14.1",
+		"@cliqz/adblocker-electron": "^1.15.0",
 		"YoutubeNonStop": "git://github.com/lawfx/YoutubeNonStop.git#v0.7.1",
-		"electron-debug": "^3.0.1",
+		"electron-debug": "^3.1.0",
 		"electron-is": "^3.0.0",
 		"electron-localshortcut": "^3.2.1",
-		"electron-store": "^5.1.1",
+		"electron-store": "^5.2.0",
-		"electron-updater": "^4.2.2",
+		"electron-updater": "^4.3.2",
 		"node-fetch": "^2.6.0"
 	},
 	"devDependencies": {
 		"devtron": "^1.4.0",
-		"electron": "^8.2.1",
+		"electron": "^8.2.4",
 		"electron-builder": "^22.4.1",
 		"electron-devtools-installer": "^3.0.0",
 		"electron-icon-maker": "0.0.4",
+		"get-port": "^5.1.1",
+		"jest": "^25.5.1",
 		"rimraf": "^3.0.2",
+		"spectron": "^10.0.1",
 		"xo": "^0.29.0"
 	},
 	"xo": {

readme.md

@@ -93,11 +93,19 @@ module.exports = () => {
 ## Build
 
 ```sh
-yarn run build
+yarn build
 ```
 
 Builds the app for macOS, Linux, and Windows, using [electron-builder](https://github.com/electron-userland/electron-builder).
 
+## Tests
+
+```sh
+yarn test
+```
+
+Uses [Spectron](https://www.electronjs.org/spectron) to test the app.
+
 ## License
 
 MIT © [th-ch](https://github.com/th-ch/youtube-music)

tests/environment.js

@@ -0,0 +1,47 @@
+const path = require("path");
+
+const getPort = require("get-port");
+const NodeEnvironment = require("jest-environment-node");
+const { Application } = require("spectron");
+
+class TestEnvironment extends NodeEnvironment {
+	constructor(config) {
+		super(config);
+	}
+
+	async setup() {
+		await super.setup();
+
+		const electronPath = path.resolve(
+			__dirname,
+			"..",
+			"node_modules",
+			".bin",
+			"electron"
+		);
+		const appPath = path.resolve(__dirname, "..");
+		const port = await getPort();
+
+		this.global.__APP__ = new Application({
+			path: electronPath,
+			args: [appPath],
+			port,
+		});
+		await this.global.__APP__.start();
+		const { client } = this.global.__APP__;
+		await client.waitUntilWindowLoaded();
+	}
+
+	async teardown() {
+		if (this.global.__APP__.isRunning()) {
+			await this.global.__APP__.stop();
+		}
+		await super.teardown();
+	}
+
+	runScript(script) {
+		return super.runScript(script);
+	}
+}
+
+module.exports = TestEnvironment;

tests/index.test.js

@@ -0,0 +1,20 @@
+describe("YouTube Music App", () => {
+	const app = global.__APP__;
+
+	test("With default settings, app is launched and visible", async () => {
+		expect(app.isRunning()).toBe(true);
+
+		const win = app.browserWindow;
+
+		const isVisible = await win.isVisible();
+		expect(isVisible).toBe(true);
+
+		const { width, height } = await win.getBounds();
+		expect(width).toBeGreaterThan(0);
+		expect(height).toBeGreaterThan(0);
+
+		const { client } = app;
+		const title = await client.getTitle();
+		expect(title).toEqual("YouTube Music");
+	});
+});

tray.js

@@ -22,6 +22,10 @@ module.exports.setUpTray = (app, win) => {
 	});
 	tray = new Tray(trayIcon);
 	tray.setToolTip("Youtube Music");
+	tray.setIgnoreDoubleClickEvents(true);
+	tray.on("click", () => {
+		win.isVisible() ? win.hide() : win.show();
+	});
 
 	const trayMenu = Menu.buildFromTemplate([
 		{

utils/testing.js

@@ -0,0 +1,3 @@
+const isTesting = () => process.env.NODE_ENV === "test";
+
+module.exports = { isTesting };