Merge pull request #130 from arachnys/v2.10.0

Upgrade Electron to v1.7.5

Makefile

@@ -29,7 +29,7 @@ buildcli:
 
 testcli:
 	@echo "  $(P) testcli"
-	@docker run --rm arachnysdocker/athenapdf athenapdf -S https://www.traviscistatus.com/ | grep -a "PDF-1.4"
+	@docker run --rm arachnysdocker/athenapdf athenapdf -S https://status.github.com/ | grep -a "PDF-1.4"
 	@echo "<h1>stdin test</h1>" | docker run --rm -i arachnysdocker/athenapdf athenapdf -S - | grep -a "PDF-1.4"
 
 buildservice:

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "athenapdf",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "description": "A simple CLI tool to convert HTML to PDF from a local file or a URL to a web page using Electron (Chromium).",
   "keywords": "electron, chrome, cli, html, pdf, converter, generate",
   "homepage": "https://www.athenapdf.com/",
@@ -19,12 +19,12 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "rm -rf build/",
     "build:prepare": "mkdir -p build/ && cp -r src/ build/artifacts/ && cp package.json build/artifacts/ && cd build/artifacts/ && npm i --production",
-    "build:linux": "electron-packager build/artifacts/ athenapdf --platform=linux --arch=x64 --version=1.6.11 --out=build/ --overwrite --asar=true",
+    "build:linux": "electron-packager build/artifacts/ athenapdf --platform=linux --arch=x64 --version=1.7.5 --out=build/ --overwrite --asar=true",
     "build": "npm run clean && npm run build:prepare && npm run build:linux"
   },
   "dependencies": {
     "commander": "^2.9.0",
-    "electron": "1.6.11",
+    "electron": "1.7.5",
     "rw": "^1.3.2"
   },
   "devDependencies": {

cli/src/athenapdf.js

@@ -28,7 +28,7 @@ const addHeader = (header, arr) => {
 }
 
 athena
-    .version("2.9.2")
+    .version("2.10.0")
     .description("convert HTML to PDF via stdin or a local / remote URI")
     .option("--debug", "show GUI", false)
     .option("-T, --timeout <seconds>", "seconds before timing out (default: 120)", parseInt)

weaver/middleware_test.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 )
@@ -111,8 +112,8 @@ func TestErrorMiddleware(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unable to read response body: %+v", err)
 	}
-	want := "{\"error\":\"PDF conversion failed due to an internal server error\"}\n"
-	if !reflect.DeepEqual(string(got), want) {
+	want := "{\"error\":\"PDF conversion failed due to an internal server error\"}"
+	if !reflect.DeepEqual(strings.TrimSpace(string(got)), want) {
 		t.Errorf("expected response body to be %s, got %s", want, got)
 	}
 }