Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-04-16 11:40:21 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-04-16 17:36:15 +0300
commit397fce560305d681948ad604ecfd85bd845ad407 (patch)
treec390750370d67e646446bdc64c22b430aeb1292c /hugolib
parent0093eaa6831f026af5cebefae8ab3cd04b677cfe (diff)
Fix MediaType when reading images from cache
Fixes #8931
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/integrationtest_builder.go22
1 files changed, 19 insertions, 3 deletions
diff --git a/hugolib/integrationtest_builder.go b/hugolib/integrationtest_builder.go
index e5c9a6856..58e751892 100644
--- a/hugolib/integrationtest_builder.go
+++ b/hugolib/integrationtest_builder.go
@@ -2,6 +2,7 @@ package hugolib
import (
"bytes"
+ "encoding/base64"
"fmt"
"io"
"os"
@@ -40,12 +41,13 @@ func NewIntegrationTestBuilder(conf IntegrationTestConfig) *IntegrationTestBuild
}
if conf.NeedsOsFS {
- doClean := true
tempDir, clean, err := htesting.CreateTempDir(hugofs.Os, "hugo-integration-test")
c.Assert(err, qt.IsNil)
conf.WorkingDir = filepath.Join(tempDir, conf.WorkingDir)
- if doClean {
+ if !conf.PrintAndKeepTempDir {
c.Cleanup(clean)
+ } else {
+ fmt.Println("\nUsing WorkingDir dir:", conf.WorkingDir)
}
} else if conf.WorkingDir == "" {
conf.WorkingDir = helpers.FilePathSeparator
@@ -278,10 +280,19 @@ func (s *IntegrationTestBuilder) initBuilder() {
logger := loggers.NewBasicLoggerForWriter(s.Cfg.LogLevel, &s.logBuff)
+ isBinaryRe := regexp.MustCompile(`^(.*)(\.png|\.jpg)$`)
+
for _, f := range s.data.Files {
filename := filepath.Join(s.Cfg.WorkingDir, f.Name)
+ data := bytes.TrimSuffix(f.Data, []byte("\n"))
+ if isBinaryRe.MatchString(filename) {
+ var err error
+ data, err = base64.StdEncoding.DecodeString(string(data))
+ s.Assert(err, qt.IsNil)
+
+ }
s.Assert(afs.MkdirAll(filepath.Dir(filename), 0777), qt.IsNil)
- s.Assert(afero.WriteFile(afs, filename, bytes.TrimSuffix(f.Data, []byte("\n")), 0666), qt.IsNil)
+ s.Assert(afero.WriteFile(afs, filename, data, 0666), qt.IsNil)
}
cfg, _, err := LoadConfig(
@@ -297,6 +308,8 @@ func (s *IntegrationTestBuilder) initBuilder() {
},
)
+ s.Assert(err, qt.IsNil)
+
cfg.Set("workingDir", s.Cfg.WorkingDir)
fs := hugofs.NewFrom(afs, cfg)
@@ -457,6 +470,9 @@ type IntegrationTestConfig struct {
// Whether it needs the real file system (e.g. for js.Build tests).
NeedsOsFS bool
+ // Do not remove the temp dir after the test.
+ PrintAndKeepTempDir bool
+
// Whether to run npm install before Build.
NeedsNpmInstall bool