mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-14 20:37:55 -05:00
all: Run gofumpt -l -w .
This commit is contained in:
parent
982d9513e7
commit
a795acbcd8
77 changed files with 102 additions and 203 deletions
4
cache/filecache/filecache_config.go
vendored
4
cache/filecache/filecache_config.go
vendored
|
@ -15,6 +15,7 @@
|
|||
package filecache
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"path"
|
||||
"path/filepath"
|
||||
|
@ -24,8 +25,6 @@ import (
|
|||
"github.com/gohugoio/hugo/common/maps"
|
||||
"github.com/gohugoio/hugo/config"
|
||||
|
||||
"errors"
|
||||
|
||||
"github.com/mitchellh/mapstructure"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
@ -225,7 +224,6 @@ func DecodeConfig(fs afero.Fs, bcfg config.BaseConfig, m map[string]any) (Config
|
|||
|
||||
// Resolves :resourceDir => /myproject/resources etc., :cacheDir => ...
|
||||
func resolveDirPlaceholder(fs afero.Fs, bcfg config.BaseConfig, placeholder string) (cacheDir string, isResource bool, err error) {
|
||||
|
||||
switch strings.ToLower(placeholder) {
|
||||
case ":resourcedir":
|
||||
return "", true, nil
|
||||
|
|
2
cache/filecache/filecache_pruner.go
vendored
2
cache/filecache/filecache_pruner.go
vendored
|
@ -60,7 +60,6 @@ func (c *Cache) Prune(force bool) (int, error) {
|
|||
counter := 0
|
||||
|
||||
err := afero.Walk(c.Fs, "", func(name string, info os.FileInfo, err error) error {
|
||||
|
||||
if info == nil {
|
||||
return nil
|
||||
}
|
||||
|
@ -69,7 +68,6 @@ func (c *Cache) Prune(force bool) (int, error) {
|
|||
|
||||
if info.IsDir() {
|
||||
f, err := c.Fs.Open(name)
|
||||
|
||||
if err != nil {
|
||||
// This cache dir may not exist.
|
||||
return nil
|
||||
|
|
|
@ -461,7 +461,6 @@ func collectMethodsRecursive(pkg string, f []*ast.Field) []string {
|
|||
pkg,
|
||||
tt.Methods.List)...)
|
||||
}
|
||||
|
||||
} else {
|
||||
// Embedded, but in a different file/package. Return the
|
||||
// package.Name and deal with that later.
|
||||
|
|
|
@ -55,7 +55,7 @@ func TestAppend(t *testing.T) {
|
|||
[]any{&tstSlicerIn1{"c"}},
|
||||
testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn1{"b"}, &tstSlicerIn1{"c"}},
|
||||
},
|
||||
//https://github.com/gohugoio/hugo/issues/5361
|
||||
// https://github.com/gohugoio/hugo/issues/5361
|
||||
{
|
||||
[]string{"a", "b"},
|
||||
[]any{tstSlicers{&tstSlicer{"a"}, &tstSlicer{"b"}}},
|
||||
|
@ -102,14 +102,16 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
|
|||
from []any
|
||||
expected any
|
||||
}{
|
||||
{[][]string{{"a", "b"}},
|
||||
{
|
||||
[][]string{{"a", "b"}},
|
||||
[]any{[]string{"c", "d"}},
|
||||
[][]string{
|
||||
{"a", "b"},
|
||||
{"c", "d"},
|
||||
},
|
||||
},
|
||||
{[][]string{{"a", "b"}},
|
||||
{
|
||||
[][]string{{"a", "b"}},
|
||||
[]any{[]string{"c", "d"}, []string{"e", "f"}},
|
||||
[][]string{
|
||||
{"a", "b"},
|
||||
|
@ -117,7 +119,8 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
|
|||
{"e", "f"},
|
||||
},
|
||||
},
|
||||
{[][]string{{"a", "b"}},
|
||||
{
|
||||
[][]string{{"a", "b"}},
|
||||
[]any{[]int{1, 2}},
|
||||
false,
|
||||
},
|
||||
|
@ -130,7 +133,6 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
|
|||
c.Assert(result, qt.DeepEquals, test.expected)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestAppendShouldMakeACopyOfTheInputSlice(t *testing.T) {
|
||||
|
|
|
@ -73,7 +73,6 @@ func StringSliceToInterfaceSlice(ss []string) []any {
|
|||
result[i] = s
|
||||
}
|
||||
return result
|
||||
|
||||
}
|
||||
|
||||
type SortedStringSlice []string
|
||||
|
|
|
@ -135,5 +135,4 @@ func TestSortedStringSlice(t *testing.T) {
|
|||
c.Assert(s.Count("b"), qt.Equals, 3)
|
||||
c.Assert(s.Count("z"), qt.Equals, 0)
|
||||
c.Assert(s.Count("a"), qt.Equals, 1)
|
||||
|
||||
}
|
||||
|
|
|
@ -19,11 +19,10 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"os"
|
||||
"os/exec"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/cli/safeexec"
|
||||
"github.com/gohugoio/hugo/config"
|
||||
|
@ -142,7 +141,6 @@ func (e *Exec) New(name string, arg ...any) (Runner, error) {
|
|||
}
|
||||
|
||||
return cm.command(arg...)
|
||||
|
||||
}
|
||||
|
||||
// Npx is a convenience method to create a Runner running npx --no-install <name> <args.
|
||||
|
|
|
@ -53,7 +53,6 @@ func TestTimeFormatter(t *testing.T) {
|
|||
c.Assert(f.Format(june06, ":time_long"), qt.Equals, "02:09:37 UTC")
|
||||
c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "02:09:37")
|
||||
c.Assert(f.Format(june06, ":time_short"), qt.Equals, "02:09")
|
||||
|
||||
})
|
||||
|
||||
c.Run("Custom layouts English", func(c *qt.C) {
|
||||
|
@ -68,7 +67,6 @@ func TestTimeFormatter(t *testing.T) {
|
|||
c.Assert(f.Format(june06, ":time_long"), qt.Equals, "2:09:37 am UTC")
|
||||
c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "2:09:37 am")
|
||||
c.Assert(f.Format(june06, ":time_short"), qt.Equals, "2:09 am")
|
||||
|
||||
})
|
||||
|
||||
c.Run("English", func(c *qt.C) {
|
||||
|
@ -107,9 +105,7 @@ func TestTimeFormatter(t *testing.T) {
|
|||
c.Assert(tr.MonthWide(date.Month()), qt.Equals, monthWideNorway)
|
||||
c.Assert(f.Format(date, "January"), qt.Equals, monthWideNorway)
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func BenchmarkTimeFormatter(b *testing.B) {
|
||||
|
|
|
@ -192,5 +192,4 @@ func TestLookupEqualFold(t *testing.T) {
|
|||
v, found = LookupEqualFold(m2, "b")
|
||||
c.Assert(found, qt.IsTrue)
|
||||
c.Assert(v, qt.Equals, "bv")
|
||||
|
||||
}
|
||||
|
|
|
@ -154,7 +154,6 @@ func TestParamsSetAndMerge(t *testing.T) {
|
|||
"a": "av",
|
||||
"c": "cv",
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func TestParamsIsZero(t *testing.T) {
|
||||
|
|
|
@ -163,7 +163,6 @@ func Uglify(in string) string {
|
|||
// If ParseRequestURI fails, the input is just converted to OS specific slashes and returned.
|
||||
func UrlToFilename(s string) (string, bool) {
|
||||
u, err := url.ParseRequestURI(s)
|
||||
|
||||
if err != nil {
|
||||
return filepath.FromSlash(s), false
|
||||
}
|
||||
|
|
|
@ -57,7 +57,6 @@ line 3`
|
|||
c := qt.New(t)
|
||||
|
||||
c.Assert(collected, qt.DeepEquals, []string{"line 1\n", "line 2\n", "\n", "line 3"})
|
||||
|
||||
}
|
||||
|
||||
func BenchmarkVisitLinesAfter(b *testing.B) {
|
||||
|
@ -68,9 +67,6 @@ func BenchmarkVisitLinesAfter(b *testing.B) {
|
|||
|
||||
for i := 0; i < b.N; i++ {
|
||||
VisitLinesAfter(lines, func(s string) {
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -80,7 +80,6 @@ func ToStringSlicePreserveStringE(v any) ([]string, error) {
|
|||
default:
|
||||
return nil, fmt.Errorf("failed to convert %T to a string slice", v)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// TypeToString converts v to a string if it's a valid string type.
|
||||
|
|
|
@ -45,5 +45,4 @@ func TestToDuration(t *testing.T) {
|
|||
c.Assert(ToDuration("200"), qt.Equals, 200*time.Millisecond)
|
||||
c.Assert(ToDuration("4m"), qt.Equals, 4*time.Minute)
|
||||
c.Assert(ToDuration("asdfadf"), qt.Equals, time.Duration(0))
|
||||
|
||||
}
|
||||
|
|
|
@ -79,5 +79,4 @@ func BenchmarkStringSort(b *testing.B) {
|
|||
})
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ weight = 3
|
|||
title = "Svenska"
|
||||
weight = 4
|
||||
`
|
||||
if err := os.WriteFile(configFilename, []byte(config), 0666); err != nil {
|
||||
if err := os.WriteFile(configFilename, []byte(config), 0o666); err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
d := ConfigSourceDescriptor{
|
||||
|
|
|
@ -208,7 +208,6 @@ func LoadConfigFromDir(sourceFs afero.Fs, configDir, environment string) (Provid
|
|||
}
|
||||
|
||||
return cfg, dirnames, nil
|
||||
|
||||
}
|
||||
|
||||
var keyAliases maps.KeyRenamer
|
||||
|
|
|
@ -370,7 +370,6 @@ func (c *defaultConfigProvider) SetDefaultMergeStrategy() {
|
|||
}
|
||||
return false
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func (c *defaultConfigProvider) getNestedKeyAndMap(key string, create bool) (string, maps.Params) {
|
||||
|
|
|
@ -49,7 +49,6 @@ func GetMemoryLimit() uint64 {
|
|||
if v := stringToGibabyte(mem); v > 0 {
|
||||
return v
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// There is a FreeMemory function, but as the kernel in most situations
|
||||
|
|
|
@ -43,5 +43,4 @@ func TestWhitelist(t *testing.T) {
|
|||
c.Assert(w.Accept("bar"), qt.IsTrue)
|
||||
c.Assert(w.Accept("mbar"), qt.IsFalse)
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -14,11 +14,10 @@
|
|||
package deploy
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
|
||||
"errors"
|
||||
|
||||
"github.com/gobwas/glob"
|
||||
"github.com/gohugoio/hugo/config"
|
||||
hglob "github.com/gohugoio/hugo/hugofs/glob"
|
||||
|
@ -132,7 +131,6 @@ var DefaultConfig = DeployConfig{
|
|||
|
||||
// DecodeConfig creates a config from a given Hugo configuration.
|
||||
func DecodeConfig(cfg config.Provider) (DeployConfig, error) {
|
||||
|
||||
dcfg := DefaultConfig
|
||||
|
||||
if !cfg.IsSet(deploymentConfigKey) {
|
||||
|
|
|
@ -20,12 +20,10 @@ import (
|
|||
)
|
||||
|
||||
func TestExtractMinorVersionFromGoTag(t *testing.T) {
|
||||
|
||||
c := qt.New(t)
|
||||
|
||||
c.Assert(extractMinorVersionFromGoTag("go1.17"), qt.Equals, 17)
|
||||
c.Assert(extractMinorVersionFromGoTag("go1.16.7"), qt.Equals, 16)
|
||||
c.Assert(extractMinorVersionFromGoTag("go1.17beta1"), qt.Equals, 17)
|
||||
c.Assert(extractMinorVersionFromGoTag("asdfadf"), qt.Equals, -1)
|
||||
|
||||
}
|
||||
|
|
|
@ -33,9 +33,7 @@ type DuplicatesReporter interface {
|
|||
ReportDuplicates() string
|
||||
}
|
||||
|
||||
var (
|
||||
_ FilesystemUnwrapper = (*createCountingFs)(nil)
|
||||
)
|
||||
var _ FilesystemUnwrapper = (*createCountingFs)(nil)
|
||||
|
||||
func NewCreateCountingFs(fs afero.Fs) afero.Fs {
|
||||
return &createCountingFs{Fs: fs, fileCount: make(map[string]int)}
|
||||
|
|
|
@ -75,7 +75,6 @@ func TestGetGlob(t *testing.T) {
|
|||
}
|
||||
|
||||
func BenchmarkGetGlob(b *testing.B) {
|
||||
|
||||
runBench := func(name string, cache *globCache, search string) {
|
||||
b.Run(name, func(b *testing.B) {
|
||||
g, err := GetGlob("**/foo")
|
||||
|
|
|
@ -41,8 +41,8 @@ Data: {{ len .Data }}|
|
|||
IntegrationTestConfig{
|
||||
T: t,
|
||||
TxtarString: files,
|
||||
//LogLevel: logg.LevelTrace,
|
||||
//Verbose: true,
|
||||
// LogLevel: logg.LevelTrace,
|
||||
// Verbose: true,
|
||||
},
|
||||
).Build()
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ module github.com/bep/mymod
|
|||
|
||||
tempDir := os.TempDir()
|
||||
cacheDir := filepath.Join(tempDir, "hugocache")
|
||||
if err := os.MkdirAll(cacheDir, 0777); err != nil {
|
||||
if err := os.MkdirAll(cacheDir, 0o777); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
cfg.Set("cacheDir", cacheDir)
|
||||
|
@ -168,11 +168,11 @@ module github.com/bep/mymod
|
|||
|
||||
fs := afero.NewOsFs()
|
||||
|
||||
if err := afero.WriteFile(fs, filepath.Join(tempDir, "hugo.toml"), []byte(configToml), 0644); err != nil {
|
||||
if err := afero.WriteFile(fs, filepath.Join(tempDir, "hugo.toml"), []byte(configToml), 0o644); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err := afero.WriteFile(fs, filepath.Join(tempDir, "go.mod"), []byte(goMod), 0644); err != nil {
|
||||
if err := afero.WriteFile(fs, filepath.Join(tempDir, "go.mod"), []byte(goMod), 0o644); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
@ -181,5 +181,4 @@ module github.com/bep/mymod
|
|||
return nil, err
|
||||
}
|
||||
return conf.Base, err
|
||||
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ import (
|
|||
func TestI18n(t *testing.T) {
|
||||
c := qt.New(t)
|
||||
|
||||
//https://github.com/gohugoio/hugo/issues/7804
|
||||
// https://github.com/gohugoio/hugo/issues/7804
|
||||
c.Run("pt-br should be case insensitive", func(c *qt.C) {
|
||||
b := newTestSitesBuilder(c)
|
||||
langCode := func() string {
|
||||
|
@ -76,12 +76,10 @@ name = "foo-a"
|
|||
|
||||
menus := b.H.Sites[0].Menus()
|
||||
c.Assert(menus, qt.HasLen, 1)
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
func TestLanguageNumberFormatting(t *testing.T) {
|
||||
|
||||
b := newTestSitesBuilder(t)
|
||||
b.WithConfigFile("toml", `
|
||||
baseURL = "https://example.org"
|
||||
|
|
|
@ -23,7 +23,6 @@ import (
|
|||
)
|
||||
|
||||
func TestCollator(t *testing.T) {
|
||||
|
||||
c := qt.New(t)
|
||||
|
||||
var wg sync.WaitGroup
|
||||
|
@ -43,7 +42,6 @@ func TestCollator(t *testing.T) {
|
|||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
}
|
||||
|
||||
func BenchmarkCollator(b *testing.B) {
|
||||
|
@ -75,5 +73,4 @@ func BenchmarkCollator(b *testing.B) {
|
|||
}
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -234,5 +234,4 @@ func TestResetError(t *testing.T) {
|
|||
r = true
|
||||
_, err = i.Do(context.Background())
|
||||
c.Assert(err, qt.IsNil)
|
||||
|
||||
}
|
||||
|
|
|
@ -71,7 +71,5 @@ func (t *Transformer) Transform(doc *ast.Document, reader text.Reader, pctx pars
|
|||
}
|
||||
|
||||
return ast.WalkContinue, nil
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ func (a *attrParser) Continue(node ast.Node, reader text.Reader, pc parser.Conte
|
|||
func (a *attrParser) Open(parent ast.Node, reader text.Reader, pc parser.Context) (ast.Node, parser.State) {
|
||||
if attrs, ok := parser.ParseAttributes(reader); ok {
|
||||
// add attributes
|
||||
var node = &attributesBlock{
|
||||
node := &attributesBlock{
|
||||
BaseBlock: ast.BaseBlock{},
|
||||
}
|
||||
for _, attr := range attrs {
|
||||
|
@ -95,7 +95,7 @@ func (a *attributesBlock) Kind() ast.NodeKind {
|
|||
type transformer struct{}
|
||||
|
||||
func (a *transformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
|
||||
var attributes = make([]ast.Node, 0, 500)
|
||||
attributes := make([]ast.Node, 0, 500)
|
||||
ast.Walk(node, func(node ast.Node, entering bool) (ast.WalkStatus, error) {
|
||||
if entering && node.Kind() == kindAttributesBlock {
|
||||
// Attributes for fenced code blocks are handled in their own extension,
|
||||
|
|
|
@ -13,7 +13,8 @@ import (
|
|||
func ExternallyRenderContent(
|
||||
cfg converter.ProviderConfig,
|
||||
ctx converter.DocumentContext,
|
||||
content []byte, binaryName string, args []string) ([]byte, error) {
|
||||
content []byte, binaryName string, args []string,
|
||||
) ([]byte, error) {
|
||||
logger := cfg.Logger
|
||||
|
||||
if strings.Contains(binaryName, "/") {
|
||||
|
|
|
@ -83,7 +83,5 @@ func TestConfig(t *testing.T) {
|
|||
c.Assert(err, qt.IsNil)
|
||||
c.Assert(conf.Goldmark.Extensions.Typographer.Disable, qt.Equals, false)
|
||||
c.Assert(conf.Goldmark.Extensions.Typographer.Ellipsis, qt.Equals, "…")
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -26,8 +26,7 @@ import (
|
|||
// Provider is the package entry point.
|
||||
var Provider converter.ProviderProvider = provider{}
|
||||
|
||||
type provider struct {
|
||||
}
|
||||
type provider struct{}
|
||||
|
||||
func (p provider) New(cfg converter.ProviderConfig) (converter.Provider, error) {
|
||||
return converter.NewProvider("pandoc", func(ctx converter.DocumentContext) (converter.Converter, error) {
|
||||
|
|
|
@ -30,8 +30,7 @@ import (
|
|||
// Provider is the package entry point.
|
||||
var Provider converter.ProviderProvider = provider{}
|
||||
|
||||
type provider struct {
|
||||
}
|
||||
type provider struct{}
|
||||
|
||||
func (p provider) New(cfg converter.ProviderConfig) (converter.Provider, error) {
|
||||
return converter.NewProvider("rst", func(ctx converter.DocumentContext) (converter.Converter, error) {
|
||||
|
|
|
@ -186,7 +186,6 @@ func TestTocMisc(t *testing.T) {
|
|||
}
|
||||
|
||||
func BenchmarkToc(b *testing.B) {
|
||||
|
||||
newTocs := func(n int) []*Fragments {
|
||||
var tocs []*Fragments
|
||||
for i := 0; i < n; i++ {
|
||||
|
@ -216,5 +215,4 @@ func BenchmarkToc(b *testing.B) {
|
|||
toc.ToHTML(1, -1, false)
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -51,58 +51,56 @@ type BuiltinTypes struct {
|
|||
OctetType Type
|
||||
}
|
||||
|
||||
var (
|
||||
Builtin = BuiltinTypes{
|
||||
CalendarType: Type{Type: "text/calendar"},
|
||||
CSSType: Type{Type: "text/css"},
|
||||
SCSSType: Type{Type: "text/x-scss"},
|
||||
SASSType: Type{Type: "text/x-sass"},
|
||||
CSVType: Type{Type: "text/csv"},
|
||||
HTMLType: Type{Type: "text/html"},
|
||||
JavascriptType: Type{Type: "text/javascript"},
|
||||
TypeScriptType: Type{Type: "text/typescript"},
|
||||
TSXType: Type{Type: "text/tsx"},
|
||||
JSXType: Type{Type: "text/jsx"},
|
||||
var Builtin = BuiltinTypes{
|
||||
CalendarType: Type{Type: "text/calendar"},
|
||||
CSSType: Type{Type: "text/css"},
|
||||
SCSSType: Type{Type: "text/x-scss"},
|
||||
SASSType: Type{Type: "text/x-sass"},
|
||||
CSVType: Type{Type: "text/csv"},
|
||||
HTMLType: Type{Type: "text/html"},
|
||||
JavascriptType: Type{Type: "text/javascript"},
|
||||
TypeScriptType: Type{Type: "text/typescript"},
|
||||
TSXType: Type{Type: "text/tsx"},
|
||||
JSXType: Type{Type: "text/jsx"},
|
||||
|
||||
JSONType: Type{Type: "application/json"},
|
||||
WebAppManifestType: Type{Type: "application/manifest+json"},
|
||||
RSSType: Type{Type: "application/rss+xml"},
|
||||
XMLType: Type{Type: "application/xml"},
|
||||
SVGType: Type{Type: "image/svg+xml"},
|
||||
TextType: Type{Type: "text/plain"},
|
||||
TOMLType: Type{Type: "application/toml"},
|
||||
YAMLType: Type{Type: "application/yaml"},
|
||||
JSONType: Type{Type: "application/json"},
|
||||
WebAppManifestType: Type{Type: "application/manifest+json"},
|
||||
RSSType: Type{Type: "application/rss+xml"},
|
||||
XMLType: Type{Type: "application/xml"},
|
||||
SVGType: Type{Type: "image/svg+xml"},
|
||||
TextType: Type{Type: "text/plain"},
|
||||
TOMLType: Type{Type: "application/toml"},
|
||||
YAMLType: Type{Type: "application/yaml"},
|
||||
|
||||
// Common image types
|
||||
PNGType: Type{Type: "image/png"},
|
||||
JPEGType: Type{Type: "image/jpeg"},
|
||||
GIFType: Type{Type: "image/gif"},
|
||||
TIFFType: Type{Type: "image/tiff"},
|
||||
BMPType: Type{Type: "image/bmp"},
|
||||
WEBPType: Type{Type: "image/webp"},
|
||||
// Common image types
|
||||
PNGType: Type{Type: "image/png"},
|
||||
JPEGType: Type{Type: "image/jpeg"},
|
||||
GIFType: Type{Type: "image/gif"},
|
||||
TIFFType: Type{Type: "image/tiff"},
|
||||
BMPType: Type{Type: "image/bmp"},
|
||||
WEBPType: Type{Type: "image/webp"},
|
||||
|
||||
// Common font types
|
||||
TrueTypeFontType: Type{Type: "font/ttf"},
|
||||
OpenTypeFontType: Type{Type: "font/otf"},
|
||||
// Common font types
|
||||
TrueTypeFontType: Type{Type: "font/ttf"},
|
||||
OpenTypeFontType: Type{Type: "font/otf"},
|
||||
|
||||
// Common document types
|
||||
PDFType: Type{Type: "application/pdf"},
|
||||
MarkdownType: Type{Type: "text/markdown"},
|
||||
// Common document types
|
||||
PDFType: Type{Type: "application/pdf"},
|
||||
MarkdownType: Type{Type: "text/markdown"},
|
||||
|
||||
// Common video types
|
||||
AVIType: Type{Type: "video/x-msvideo"},
|
||||
MPEGType: Type{Type: "video/mpeg"},
|
||||
MP4Type: Type{Type: "video/mp4"},
|
||||
OGGType: Type{Type: "video/ogg"},
|
||||
WEBMType: Type{Type: "video/webm"},
|
||||
GPPType: Type{Type: "video/3gpp"},
|
||||
// Common video types
|
||||
AVIType: Type{Type: "video/x-msvideo"},
|
||||
MPEGType: Type{Type: "video/mpeg"},
|
||||
MP4Type: Type{Type: "video/mp4"},
|
||||
OGGType: Type{Type: "video/ogg"},
|
||||
WEBMType: Type{Type: "video/webm"},
|
||||
GPPType: Type{Type: "video/3gpp"},
|
||||
|
||||
// Web assembly.
|
||||
WasmType: Type{Type: "application/wasm"},
|
||||
// Web assembly.
|
||||
WasmType: Type{Type: "application/wasm"},
|
||||
|
||||
OctetType: Type{Type: "application/octet-stream"},
|
||||
}
|
||||
)
|
||||
OctetType: Type{Type: "application/octet-stream"},
|
||||
}
|
||||
|
||||
var defaultMediaTypesConfig = map[string]any{
|
||||
"text/calendar": map[string]any{"suffixes": []string{"ics"}},
|
||||
|
|
|
@ -184,7 +184,6 @@ func TestDecodeConfigDecimalIsNowPrecision(t *testing.T) {
|
|||
conf := testconfig.GetTestConfigs(nil, v).Base.Minify
|
||||
|
||||
c.Assert(conf.Tdewolff.CSS.Precision, qt.Equals, 3)
|
||||
|
||||
}
|
||||
|
||||
// Issue 9456
|
||||
|
@ -209,7 +208,7 @@ func TestDecodeConfigKeepWhitespace(t *testing.T) {
|
|||
KeepDocumentTags: true,
|
||||
KeepEndTags: false,
|
||||
KeepQuotes: false,
|
||||
KeepWhitespace: false},
|
||||
KeepWhitespace: false,
|
||||
},
|
||||
)
|
||||
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@ import (
|
|||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
|
@ -46,8 +47,6 @@ import (
|
|||
|
||||
"github.com/gohugoio/hugo/common/hugio"
|
||||
|
||||
"errors"
|
||||
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
|
@ -199,7 +198,7 @@ func (c *Client) Vendor() error {
|
|||
if err := c.rmVendorDir(vendorDir); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := c.fs.MkdirAll(vendorDir, 0755); err != nil {
|
||||
if err := c.fs.MkdirAll(vendorDir, 0o755); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -260,7 +259,7 @@ func (c *Client) Vendor() error {
|
|||
} else {
|
||||
targetDir := filepath.Dir(targetFilename)
|
||||
|
||||
if err := c.fs.MkdirAll(targetDir, 0755); err != nil {
|
||||
if err := c.fs.MkdirAll(targetDir, 0o755); err != nil {
|
||||
return fmt.Errorf("failed to make target dir: %w", err)
|
||||
}
|
||||
|
||||
|
@ -303,7 +302,7 @@ func (c *Client) Vendor() error {
|
|||
}
|
||||
|
||||
if modulesContent.Len() > 0 {
|
||||
if err := afero.WriteFile(c.fs, filepath.Join(vendorDir, vendorModulesFilename), modulesContent.Bytes(), 0666); err != nil {
|
||||
if err := afero.WriteFile(c.fs, filepath.Join(vendorDir, vendorModulesFilename), modulesContent.Bytes(), 0o666); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -558,7 +557,7 @@ func (c *Client) rewriteGoMod(name string, isGoMod map[string]bool) error {
|
|||
return err
|
||||
}
|
||||
if data != nil {
|
||||
if err := afero.WriteFile(c.fs, filepath.Join(c.ccfg.WorkingDir, name), data, 0666); err != nil {
|
||||
if err := afero.WriteFile(c.fs, filepath.Join(c.ccfg.WorkingDir, name), data, 0o666); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -636,7 +635,8 @@ func (c *Client) rmVendorDir(vendorDir string) error {
|
|||
func (c *Client) runGo(
|
||||
ctx context.Context,
|
||||
stdout io.Writer,
|
||||
args ...string) error {
|
||||
args ...string,
|
||||
) error {
|
||||
if c.goBinaryStatus != 0 {
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -100,7 +100,6 @@ lang="en"
|
|||
c.Assert(imp.Mounts[1].Source, qt.Equals, "src/markdown/blog")
|
||||
c.Assert(imp.Mounts[1].Target, qt.Equals, "content/blog")
|
||||
c.Assert(imp.Mounts[1].Lang, qt.Equals, "en")
|
||||
|
||||
})
|
||||
|
||||
c.Run("Replacements", func(c *qt.C) {
|
||||
|
|
|
@ -25,7 +25,6 @@ import (
|
|||
var _ Module = (*moduleAdapter)(nil)
|
||||
|
||||
type Module interface {
|
||||
|
||||
// Optional config read from the configFilename above.
|
||||
Cfg() config.Provider
|
||||
|
||||
|
@ -157,7 +156,6 @@ func (m *moduleAdapter) Time() time.Time {
|
|||
}
|
||||
|
||||
return *m.gomod.Time
|
||||
|
||||
}
|
||||
|
||||
func (m *moduleAdapter) Watch() bool {
|
||||
|
|
|
@ -78,7 +78,7 @@ func PageMenusFromPage(p Page) (PageMenus, error) {
|
|||
return pm, nil
|
||||
}
|
||||
|
||||
var wrapErr = func(err error) error {
|
||||
wrapErr := func(err error) error {
|
||||
return fmt.Errorf("unable to process menus for page %q: %w", p.Path(), err)
|
||||
}
|
||||
|
||||
|
@ -109,7 +109,8 @@ func PageMenusFromPage(p Page) (PageMenus, error) {
|
|||
func NewMenuQueryProvider(
|
||||
pagem PageMenusGetter,
|
||||
sitem MenusGetter,
|
||||
p Page) MenuQueryProvider {
|
||||
p Page,
|
||||
) MenuQueryProvider {
|
||||
return &pageMenus{
|
||||
p: p,
|
||||
pagem: pagem,
|
||||
|
|
|
@ -41,7 +41,6 @@ func createLayoutExamples() any {
|
|||
name string
|
||||
d layouts.LayoutDescriptor
|
||||
}{
|
||||
|
||||
// Taxonomy layouts.LayoutDescriptor={categories category taxonomy en false Type Section
|
||||
{"Single page in \"posts\" section", layouts.LayoutDescriptor{Kind: "page", Type: "posts", OutputFormatName: "html", Suffix: "html"}},
|
||||
{"Base template for single page in \"posts\" section", layouts.LayoutDescriptor{Baseof: true, Kind: "page", Type: "posts", OutputFormatName: "html", Suffix: "html"}},
|
||||
|
|
|
@ -953,7 +953,6 @@ func TestLayout(t *testing.T) {
|
|||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -69,7 +69,6 @@ func TestDefaultTypes(t *testing.T) {
|
|||
c.Assert(CalendarFormat.IsHTML, qt.Equals, false)
|
||||
|
||||
c.Assert(len(DefaultFormats), qt.Equals, 11)
|
||||
|
||||
}
|
||||
|
||||
func TestGetFormatByName(t *testing.T) {
|
||||
|
|
|
@ -56,23 +56,26 @@ func TestUnmarshalXML(t *testing.T) {
|
|||
"guid": "https://example.com/2021/11/30/example-title/",
|
||||
"link": "https://example.com/2021/11/30/example-title/",
|
||||
"pubDate": "Tue, 30 Nov 2021 15:00:00 +0000",
|
||||
"title": "Example title"},
|
||||
"title": "Example title",
|
||||
},
|
||||
"language": "en-us",
|
||||
"lastBuildDate": "Fri, 08 Jan 2021 14:44:10 +0000",
|
||||
"link": []any{"https://example.com/", map[string]any{
|
||||
"-href": "https://example.com/feed.xml",
|
||||
"-rel": "self",
|
||||
"-type": "application/rss+xml"}},
|
||||
"-type": "application/rss+xml",
|
||||
}},
|
||||
"title": "Example feed",
|
||||
}}
|
||||
},
|
||||
}
|
||||
|
||||
d := Default
|
||||
|
||||
m, err := d.Unmarshal([]byte(xmlDoc), XML)
|
||||
c.Assert(err, qt.IsNil)
|
||||
c.Assert(m, qt.DeepEquals, expect)
|
||||
|
||||
}
|
||||
|
||||
func TestUnmarshalToMap(t *testing.T) {
|
||||
c := qt.New(t)
|
||||
|
||||
|
|
|
@ -46,5 +46,4 @@ func TestItemValTyped(t *testing.T) {
|
|||
c.Assert(Item{low: 0, high: len(source)}.ValTyped(source), qt.Equals, "truex")
|
||||
source = []byte("xtrue")
|
||||
c.Assert(Item{low: 0, high: len(source)}.ValTyped(source), qt.Equals, "xtrue")
|
||||
|
||||
}
|
||||
|
|
|
@ -22,7 +22,6 @@ type lexerShortcodeState struct {
|
|||
elementStepNum int // step number in element
|
||||
paramElements int // number of elements (name + value = 2) found first
|
||||
openShortcodes map[string]bool // set of shortcodes in open state
|
||||
|
||||
}
|
||||
|
||||
// Shortcode syntax
|
||||
|
|
|
@ -466,7 +466,6 @@ func parseStartTag(s string) string {
|
|||
}
|
||||
|
||||
return s
|
||||
|
||||
}
|
||||
|
||||
// isClosedByTag reports whether b ends with a closing tag for tagName.
|
||||
|
@ -523,7 +522,6 @@ LOOP:
|
|||
}
|
||||
|
||||
return bytes.EqualFold(tagName, b[lo:hi])
|
||||
|
||||
}
|
||||
|
||||
func isSpace(b byte) bool {
|
||||
|
|
|
@ -86,7 +86,8 @@ func TestClassCollector(t *testing.T) {
|
|||
}">
|
||||
</div>
|
||||
</body>`, f("body div", "class1 class2 class3", "")},
|
||||
{"AlpineJS bind 2", `<div x-bind:class="{ 'bg-black': filter.checked }" class="inline-block mr-1 mb-2 rounded bg-gray-300 px-2 py-2">FOO</div>`,
|
||||
{
|
||||
"AlpineJS bind 2", `<div x-bind:class="{ 'bg-black': filter.checked }" class="inline-block mr-1 mb-2 rounded bg-gray-300 px-2 py-2">FOO</div>`,
|
||||
f("div", "bg-black bg-gray-300 inline-block mb-2 mr-1 px-2 py-2 rounded", ""),
|
||||
},
|
||||
{"AlpineJS bind 3", `<div x-bind:class="{ 'text-gray-800': !checked, 'text-white': checked }"></div>`, f("div", "text-gray-800 text-white", "")},
|
||||
|
@ -130,7 +131,6 @@ func TestClassCollector(t *testing.T) {
|
|||
<div id="b" class="foo">d</div>`, f("div form", "foo", "a b")},
|
||||
{"Big input, multibyte runes", strings.Repeat(`神真美好 `, rnd.Intn(500)+1) + "<div id=\"神真美好\" class=\"foo\">" + strings.Repeat(`神真美好 `, rnd.Intn(100)+1) + " <span>神真美好</span>", f("div span", "foo", "神真美好")},
|
||||
} {
|
||||
|
||||
for _, variant := range []struct {
|
||||
minify bool
|
||||
}{
|
||||
|
@ -161,7 +161,6 @@ func TestClassCollector(t *testing.T) {
|
|||
})
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestEndsWithTag(t *testing.T) {
|
||||
|
@ -190,7 +189,6 @@ func TestEndsWithTag(t *testing.T) {
|
|||
c.Assert(got, qt.Equals, test.expect)
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func BenchmarkElementsCollectorWriter(b *testing.B) {
|
||||
|
@ -276,6 +274,5 @@ func BenchmarkElementsCollectorWriterPre(b *testing.B) {
|
|||
))
|
||||
for i := 0; i < b.N; i++ {
|
||||
fmt.Fprint(w, benchHTML)
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -118,7 +118,6 @@ func TestCardinalityThreshold(t *testing.T) {
|
|||
c.Assert(hasKeyword("tags", "b"), qt.Equals, false)
|
||||
c.Assert(hasKeyword("tags", "d"), qt.Equals, true)
|
||||
c.Assert(hasKeyword("keywords", "b"), qt.Equals, true)
|
||||
|
||||
}
|
||||
|
||||
func TestSearch(t *testing.T) {
|
||||
|
|
|
@ -50,7 +50,6 @@ func ColorToHexString(c color.Color) string {
|
|||
r, g, b, a := c.RGBA()
|
||||
rgba := color.RGBA{uint8(r), uint8(g), uint8(b), uint8(a)}
|
||||
return fmt.Sprintf("#%.2x%.2x%.2x", rgba.R, rgba.G, rgba.B)
|
||||
|
||||
}
|
||||
|
||||
func hexStringToColor(s string) (color.Color, error) {
|
||||
|
|
|
@ -28,8 +28,7 @@ func TestPageMatcher(t *testing.T) {
|
|||
developmentTestSite := testSite{h: hugo.NewInfo(testConfig{environment: "development"}, nil)}
|
||||
productionTestSite := testSite{h: hugo.NewInfo(testConfig{environment: "production"}, nil)}
|
||||
|
||||
p1, p2, p3 :=
|
||||
&testPage{path: "/p1", kind: "section", lang: "en", site: developmentTestSite},
|
||||
p1, p2, p3 := &testPage{path: "/p1", kind: "section", lang: "en", site: developmentTestSite},
|
||||
&testPage{path: "p2", kind: "page", lang: "no", site: productionTestSite},
|
||||
&testPage{path: "p3", kind: "page", lang: "en"}
|
||||
|
||||
|
@ -154,7 +153,6 @@ func TestDecodeCascadeConfig(t *testing.T) {
|
|||
got, err = DecodeCascadeConfig(nil)
|
||||
c.Assert(err, qt.IsNil)
|
||||
c.Assert(got, qt.IsNotNil)
|
||||
|
||||
}
|
||||
|
||||
type testConfig struct {
|
||||
|
|
|
@ -81,7 +81,6 @@ func TestDecodeRemoteOptions(t *testing.T) {
|
|||
c.Assert(err, isErr)
|
||||
c.Assert(got, qt.DeepEquals, test.want)
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -114,7 +113,6 @@ func TestOptionsNewRequest(t *testing.T) {
|
|||
c.Assert(err, qt.IsNil)
|
||||
c.Assert(req.Method, qt.Equals, "GET")
|
||||
c.Assert(req.Header["User-Agent"], qt.DeepEquals, []string{"foo"})
|
||||
|
||||
}
|
||||
|
||||
func TestCalculateResourceID(t *testing.T) {
|
||||
|
|
|
@ -293,7 +293,6 @@ T1: {{ $r.Content }}
|
|||
|
||||
b.AssertLogMatches(`Dart Sass: foo`)
|
||||
b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:1:0: bar`)
|
||||
|
||||
}
|
||||
|
||||
func TestTransformErrors(t *testing.T) {
|
||||
|
@ -347,7 +346,6 @@ T1: {{ $r.Content }}
|
|||
b.Assert(fe.ErrorContext(), qt.IsNotNil)
|
||||
b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{" $maincolor #eee;", "", "body {", "\tcolor: $maincolor;", "}"})
|
||||
b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
|
||||
|
||||
})
|
||||
|
||||
c.Run("error in import", func(c *qt.C) {
|
||||
|
@ -365,9 +363,7 @@ T1: {{ $r.Content }}
|
|||
b.Assert(fe.ErrorContext(), qt.IsNotNil)
|
||||
b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"})
|
||||
b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func TestOptionVars(t *testing.T) {
|
||||
|
@ -528,5 +524,4 @@ T1: {{ $r.Content }}
|
|||
b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:12:0: number`)
|
||||
b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:13:0: number`)
|
||||
b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:14:0: number`)
|
||||
|
||||
}
|
||||
|
|
|
@ -47,7 +47,6 @@ func (c *Client) ToCSS(res resources.ResourceTransformer, opts Options) (resourc
|
|||
}
|
||||
|
||||
return res.Transform(&toCSSTransformation{c: c, options: internalOptions})
|
||||
|
||||
}
|
||||
|
||||
type toCSSTransformation struct {
|
||||
|
|
|
@ -228,7 +228,6 @@ T1: {{ $r.Content }}
|
|||
b.Assert(fe.ErrorContext(), qt.IsNotNil)
|
||||
b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 4 */", "", "$maincolor #eee;", "", "body {"})
|
||||
b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
|
||||
|
||||
})
|
||||
|
||||
c.Run("error in import", func(c *qt.C) {
|
||||
|
@ -245,9 +244,7 @@ T1: {{ $r.Content }}
|
|||
b.Assert(fe.ErrorContext(), qt.IsNotNil)
|
||||
b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"})
|
||||
b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func TestOptionVars(t *testing.T) {
|
||||
|
|
|
@ -26,8 +26,7 @@ func New() *Namespace {
|
|||
}
|
||||
|
||||
// Namespace provides template functions for the "cast" namespace.
|
||||
type Namespace struct {
|
||||
}
|
||||
type Namespace struct{}
|
||||
|
||||
// ToInt converts v to an int.
|
||||
func (ns *Namespace) ToInt(v any) (int, error) {
|
||||
|
|
|
@ -14,14 +14,13 @@
|
|||
package collections
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"github.com/gohugoio/hugo/common/hreflect"
|
||||
"github.com/gohugoio/hugo/common/maps"
|
||||
|
||||
"errors"
|
||||
)
|
||||
|
||||
// Merge creates a copy of the final parameter in params and merges the preceding
|
||||
|
|
|
@ -14,11 +14,10 @@
|
|||
package collections
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
||||
"errors"
|
||||
|
||||
"github.com/mitchellh/hashstructure"
|
||||
)
|
||||
|
||||
|
|
|
@ -876,7 +876,7 @@ func BenchmarkWhereOps(b *testing.B) {
|
|||
j := rand.Intn(i + 1)
|
||||
seq[i], seq[j] = seq[j], seq[i]
|
||||
}
|
||||
//results, err = ns.Where(context.Background(), test.seq, test.key, test.op, test.match)
|
||||
// results, err = ns.Where(context.Background(), test.seq, test.key, test.op, test.match)
|
||||
runOps := func(b *testing.B, op, match string) {
|
||||
_, err := ns.Where(ctx, seq, "foo", op, match)
|
||||
if err != nil {
|
||||
|
@ -901,5 +901,4 @@ func BenchmarkWhereOps(b *testing.B) {
|
|||
runOps(b, "like", "^bar")
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -118,7 +118,7 @@ func (ns *Namespace) HMAC(h any, k any, m any, e ...any) (string, error) {
|
|||
return "", err
|
||||
}
|
||||
|
||||
var encoding = "hex"
|
||||
encoding := "hex"
|
||||
if len(e) > 0 && e[0] != nil {
|
||||
encoding, err = cast.ToStringE(e[0])
|
||||
if err != nil {
|
||||
|
@ -134,5 +134,4 @@ func (ns *Namespace) HMAC(h any, k any, m any, e ...any) (string, error) {
|
|||
default:
|
||||
return "", fmt.Errorf("%q is not a supported encoding method", encoding)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -12,8 +12,7 @@ import (
|
|||
const name = "css"
|
||||
|
||||
// Namespace provides template functions for the "css" namespace.
|
||||
type Namespace struct {
|
||||
}
|
||||
type Namespace struct{}
|
||||
|
||||
// Quoted returns a string that needs to be quoted in CSS.
|
||||
func (ns *Namespace) Quoted(v any) css.QuotedString {
|
||||
|
|
|
@ -72,7 +72,6 @@ func TestGetCSV(t *testing.T) {
|
|||
false,
|
||||
},
|
||||
} {
|
||||
|
||||
c.Run(test.url, func(c *qt.C) {
|
||||
msg := qt.Commentf("Test %d", i)
|
||||
|
||||
|
@ -119,7 +118,6 @@ func TestGetCSV(t *testing.T) {
|
|||
c.Assert(got, qt.Not(qt.IsNil), msg)
|
||||
c.Assert(got, qt.DeepEquals, test.expect, msg)
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -164,9 +162,7 @@ func TestGetJSON(t *testing.T) {
|
|||
map[string]any{"gomeetup": []any{"Sydney", "San Francisco", "Stockholm"}},
|
||||
},
|
||||
} {
|
||||
|
||||
c.Run(test.url, func(c *qt.C) {
|
||||
|
||||
msg := qt.Commentf("Test %d", i)
|
||||
ns := newTestNs()
|
||||
|
||||
|
@ -208,7 +204,6 @@ func TestGetJSON(t *testing.T) {
|
|||
c.Assert(int(ns.deps.Log.LoggCount(logg.LevelError)), qt.Equals, 0, msg)
|
||||
c.Assert(got, qt.Not(qt.IsNil), msg)
|
||||
c.Assert(got, qt.DeepEquals, test.expect)
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -263,9 +258,7 @@ func TestHeaders(t *testing.T) {
|
|||
},
|
||||
},
|
||||
} {
|
||||
|
||||
c.Run(test.name, func(c *qt.C) {
|
||||
|
||||
ns := newTestNs()
|
||||
|
||||
// Setup HTTP test server
|
||||
|
@ -275,7 +268,6 @@ func TestHeaders(t *testing.T) {
|
|||
c.Assert(r.URL.String(), qt.Equals, "http://gohugo.io/api?foo")
|
||||
w.Write([]byte("{}"))
|
||||
r.Header.Write(&headers)
|
||||
|
||||
})
|
||||
defer func() { srv.Close() }()
|
||||
|
||||
|
@ -296,9 +288,7 @@ func TestHeaders(t *testing.T) {
|
|||
_, err := ns.GetCSV(",", args...)
|
||||
return err
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,11 +15,10 @@
|
|||
package images
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"image"
|
||||
"sync"
|
||||
|
||||
"errors"
|
||||
|
||||
"github.com/bep/overlayfs"
|
||||
"github.com/gohugoio/hugo/resources/images"
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ func TestNSConfig(t *testing.T) {
|
|||
// cast path to string for afero.WriteFile
|
||||
sp, err := cast.ToStringE(test.path)
|
||||
c.Assert(err, qt.IsNil)
|
||||
afero.WriteFile(ns.deps.Fs.Source, filepath.Join(bcfg.WorkingDir(), sp), test.input, 0755)
|
||||
afero.WriteFile(ns.deps.Fs.Source, filepath.Join(bcfg.WorkingDir(), sp), test.input, 0o755)
|
||||
|
||||
result, err := ns.Config(test.path)
|
||||
|
||||
|
|
|
@ -20,8 +20,7 @@ import (
|
|||
qt "github.com/frankban/quicktest"
|
||||
)
|
||||
|
||||
type Test struct {
|
||||
}
|
||||
type Test struct{}
|
||||
|
||||
func (t *Test) MyTestMethod() string {
|
||||
return "abcde"
|
||||
|
|
|
@ -215,7 +215,6 @@ func (ns *Namespace) applyOpToScalarsOrSlices(opName string, op func(x, y float6
|
|||
return
|
||||
}
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
func (ns *Namespace) toFloatsE(v any) ([]float64, bool, error) {
|
||||
|
|
|
@ -154,7 +154,6 @@ func (ns *Namespace) Join(elements ...any) (string, error) {
|
|||
// extraneous slashes are removed.
|
||||
func (ns *Namespace) Clean(path any) (string, error) {
|
||||
spath, err := cast.ToStringE(path)
|
||||
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
|
|
@ -70,7 +70,6 @@ func (ns *Namespace) FindRESubmatch(expr string, content any, limit ...any) ([][
|
|||
}
|
||||
|
||||
return re.FindAllStringSubmatch(conv, n), nil
|
||||
|
||||
}
|
||||
|
||||
// ReplaceRE returns a copy of s, replacing all matches of the regular
|
||||
|
|
|
@ -83,6 +83,7 @@ func TestFindRESubmatch(t *testing.T) {
|
|||
c.Check(result, qt.DeepEquals, test.expect)
|
||||
}
|
||||
}
|
||||
|
||||
func TestReplaceRE(t *testing.T) {
|
||||
t.Parallel()
|
||||
c := qt.New(t)
|
||||
|
|
|
@ -111,5 +111,4 @@ func BenchmarkTruncate(b *testing.B) {
|
|||
ns.Truncate(10, "I have a <a href='/markdown'>Markdown link</a> inside")
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
@ -124,7 +124,7 @@ func TestFormat(t *testing.T) {
|
|||
}
|
||||
})
|
||||
|
||||
//Issue #9084
|
||||
// Issue #9084
|
||||
c.Run("TZ America/Los_Angeles", func(c *qt.C) {
|
||||
c.Parallel()
|
||||
|
||||
|
@ -136,9 +136,7 @@ func TestFormat(t *testing.T) {
|
|||
|
||||
c.Assert(err, qt.IsNil)
|
||||
c.Assert(d, qt.Equals, "11:00:00 am Pacific Daylight Time")
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func TestDuration(t *testing.T) {
|
||||
|
|
|
@ -23,7 +23,6 @@ import (
|
|||
const numTemplateVariants = 3
|
||||
|
||||
type shortcodeVariant struct {
|
||||
|
||||
// The possible variants: lang, outFormat, suffix
|
||||
// gtag
|
||||
// gtag.html
|
||||
|
|
|
@ -2,9 +2,8 @@ package transform
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"strings"
|
||||
|
||||
"errors"
|
||||
"strings"
|
||||
|
||||
"github.com/gohugoio/hugo/parser"
|
||||
"github.com/gohugoio/hugo/parser/metadecoders"
|
||||
|
|
|
@ -189,7 +189,6 @@ func (ns *Namespace) AbsLangURL(s any) (string, error) {
|
|||
// of any ./ or ../ elements. If the argument list is empty, JoinPath returns
|
||||
// an empty string.
|
||||
func (ns *Namespace) JoinPath(elements ...any) (string, error) {
|
||||
|
||||
if len(elements) == 0 {
|
||||
return "", nil
|
||||
}
|
||||
|
|
|
@ -248,7 +248,6 @@ func newItemToWatch(filename string) (*itemToWatch, error) {
|
|||
}
|
||||
|
||||
return &itemToWatch{filename: filename, left: r}, nil
|
||||
|
||||
}
|
||||
|
||||
func (item *itemToWatch) checkForChanges() ([]fsnotify.Event, error) {
|
||||
|
@ -298,7 +297,6 @@ func (item *itemToWatch) checkForChanges() ([]fsnotify.Event, error) {
|
|||
}
|
||||
|
||||
return evs, nil
|
||||
|
||||
}
|
||||
|
||||
func checkChange(fi1, fi2 os.FileInfo) fsnotify.Op {
|
||||
|
|
Loading…
Reference in a new issue