From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 1 Feb 2021 09:23:28 +0000 (+0100)
Subject: github: Enable NPM tests on Windows
X-Git-Tag: v0.81.0~45
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=144943798c2a199ed256ae901a14d3c918055eba;p=brevno-suite%2Fhugo

github: Enable NPM tests on Windows

Fixes #8196
---

diff --git a/hugolib/js_test.go b/hugolib/js_test.go
index 4bb8bf17..cd0883fd 100644
--- a/hugolib/js_test.go
+++ b/hugolib/js_test.go
@@ -38,10 +38,6 @@ func TestJSBuildWithNPM(t *testing.T) {
 		t.Skip("skip (relative) long running modules test when running locally")
 	}
 
-	if runtime.GOOS == "windows" {
-		t.Skip("skip NPM test on Windows")
-	}
-
 	wd, _ := os.Getwd()
 	defer func() {
 		os.Chdir(wd)
diff --git a/hugolib/resource_chain_babel_test.go b/hugolib/resource_chain_babel_test.go
index 77c81f9c..61b2ef6d 100644
--- a/hugolib/resource_chain_babel_test.go
+++ b/hugolib/resource_chain_babel_test.go
@@ -17,7 +17,6 @@ import (
 	"bytes"
 	"os"
 	"path/filepath"
-	"runtime"
 	"testing"
 
 	"github.com/gohugoio/hugo/common/hexec"
@@ -40,10 +39,6 @@ func TestResourceChainBabel(t *testing.T) {
 		t.Skip("skip (relative) long running modules test when running locally")
 	}
 
-	if runtime.GOOS == "windows" {
-		t.Skip("skip npm test on Windows")
-	}
-
 	wd, _ := os.Getwd()
 	defer func() {
 		os.Chdir(wd)
diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index 3a1f1850..d9b09e2a 100644
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -23,7 +23,6 @@ import (
 	"github.com/gohugoio/hugo/resources/resource_transformers/tocss/dartsass"
 
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -925,10 +924,6 @@ func TestResourceChainPostCSS(t *testing.T) {
 		t.Skip("skip (relative) long running modules test when running locally")
 	}
 
-	if runtime.GOOS == "windows" {
-		t.Skip("skip npm test on Windows")
-	}
-
 	wd, _ := os.Getwd()
 	defer func() {
 		os.Chdir(wd)
@@ -1034,8 +1029,8 @@ class-in-b {
 
 	// Make sure Node sees this.
 	b.Assert(logBuf.String(), qt.Contains, "Hugo Environment: production")
-	b.Assert(logBuf.String(), qt.Contains, fmt.Sprintf("PostCSS Config File: %s/postcss.config.js", workDir))
-	b.Assert(logBuf.String(), qt.Contains, fmt.Sprintf("package.json: %s/package.json", workDir))
+	b.Assert(logBuf.String(), qt.Contains, filepath.FromSlash(fmt.Sprintf("PostCSS Config File: %s/postcss.config.js", workDir)))
+	b.Assert(logBuf.String(), qt.Contains, filepath.FromSlash(fmt.Sprintf("package.json: %s/package.json", workDir)))
 
 	b.AssertFileContent("public/index.html", `
 Styles RelPermalink: /css/styles.css