resources/images: Move golden test files to sub folders

And make some of the images smaller to save some space.

resources/images/images_golden_integration_test.go

@@ -69,8 +69,8 @@ func TestGoldenFiltersMisc(t *testing.T) {
 		t.Skip("Skip golden test on this architecture")
 	}
 
-	// Will be used to generate golden files.
-	name := "filters_misc"
+	// Will be used as the base folder for generated images.
+	name := "filters/misc"
 
 	files := `
 -- hugo.toml --
@@ -82,9 +82,9 @@ sourcefilename: ../testdata/sunset.jpg
 sourcefilename: ../testdata/gopher-hero8.png
 -- layouts/index.html --
 Home.
-{{ $sunset := resources.Get "sunset.jpg" }}
+{{ $sunset := (resources.Get "sunset.jpg").Resize "x300" }}
 {{ $sunsetGrayscale := $sunset.Filter (images.Grayscale) }}
-{{ $gopher := resources.Get "gopher.png" }}
+{{ $gopher := (resources.Get "gopher.png").Resize "x80" }}
 {{ $overlayFilter := images.Overlay $gopher 20 20 }}
 
 {{ $textOpts := dict
@@ -140,8 +140,8 @@ func TestGoldenFiltersMask(t *testing.T) {
 		t.Skip("Skip golden test on this architecture")
 	}
 
-	// Will be used to generate golden files.
-	name := "filters_mask"
+	// Will be used as the base folder for generated images.
+	name := "filters/mask"
 
 	files := `
 -- hugo.toml --
@@ -163,15 +163,20 @@ Home.
 {{ template "mask" (dict "name" "transparant.png" "base" $sunset  "mask" $mask) }}
 {{ template "mask" (dict "name" "yellow.jpg" "base" $sunset  "mask" $mask) }}
 {{ template "mask" (dict "name" "wide.jpg" "base" $sunset "mask" $mask "spec" "resize 600x200") }}
-
+{{/* This looks a little odd, but is correct and the recommended way to do this.
+This will 1. Scale the image to x300, 2. Apply the mask, 3. Create the final image with background color #323ea. 
+It's possible to have multiple images.Process filters in the chain, but for the options for the final image (target format, bgGolor etc.),
+the last entry will win.
+*/}}
+{{ template "mask" (dict "name" "blue.jpg" "base" $sunset "mask" $mask "spec" "resize x300 #323ea8") }}
 
 {{ define "mask"}}
 {{ $ext := path.Ext .name }}
 {{ if lt (len (path.Ext .name)) 4 }}
 	{{ errorf "No extension in %q" .name }}
 {{ end }}
 {{ $format := strings.TrimPrefix "." $ext }}
-{{ $spec := .spec | default (printf "resize 300x300 %s" $format) }}
+{{ $spec := .spec | default (printf "resize x300 %s" $format) }}
 {{ $filters := slice (images.Process $spec) (images.Mask .mask) }}
 {{ $name := printf "images/%s" .name  }}
 {{ $img := .base.Filter $filters }}
@@ -191,8 +196,8 @@ func TestGoldenFiltersText(t *testing.T) {
 		t.Skip("Skip golden test on this architecture")
 	}
 
-	// Will be used to generate golden files.
-	name := "filters_text"
+	// Will be used as the base folder for generated images.
+	name := "filters/text"
 
 	files := `
 -- hugo.toml --
@@ -240,8 +245,8 @@ func TestGoldenProcessMisc(t *testing.T) {
 		t.Skip("Skip golden test on this architecture")
 	}
 
-	// Will be used to generate golden files.
-	name := "process_misc"
+	// Will be used as the base folder for generated images.
+	name := "process/misc"
 
 	files := `
 -- hugo.toml --
@@ -287,8 +292,8 @@ func TestGoldenFuncs(t *testing.T) {
 		t.Skip("Skip golden test on this architecture")
 	}
 
-	// Will be used to generate golden files.
-	name := "funcs"
+	// Will be used as the base folder for generated images.
+	name := "funcs/misc"
 
 	files := `
 -- hugo.toml --
@@ -324,7 +329,7 @@ func runGolden(t testing.TB, name, files string) *hugolib.IntegrationTestBuilder
 
 	outputDir := filepath.Join(c.H.Conf.WorkingDir(), "public", "images")
 	goldenBaseDir := filepath.Join("testdata", "images_golden")
-	goldenDir := filepath.Join(goldenBaseDir, name)
+	goldenDir := filepath.Join(goldenBaseDir, filepath.FromSlash(name))
 	if goldenOpts.writeGoldenFiles {
 		c.Assert(htesting.IsRealCI(), qt.IsFalse)
 		c.Assert(os.MkdirAll(goldenBaseDir, 0o777), qt.IsNil)