diff --git a/resources/images/images_golden_integration_test.go b/resources/images/images_golden_integration_test.go index 49d90a79394..12c5fef4558 100644 --- a/resources/images/images_golden_integration_test.go +++ b/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 -- @@ -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,7 +163,7 @@ 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") }} - +{{ template "mask" (dict "name" "blue.jpg" "base" $sunset "mask" $mask "spec" "resize x300 #323ea8") }} {{ define "mask"}} {{ $ext := path.Ext .name }} @@ -171,7 +171,7 @@ Home. {{ 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 +191,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 +240,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 +287,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 +324,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) diff --git a/resources/images/testdata/images_golden/filters/mask/blue.jpg b/resources/images/testdata/images_golden/filters/mask/blue.jpg new file mode 100644 index 00000000000..7c809774100 Binary files /dev/null and b/resources/images/testdata/images_golden/filters/mask/blue.jpg differ diff --git a/resources/images/testdata/images_golden/filters/mask/transparant.png b/resources/images/testdata/images_golden/filters/mask/transparant.png new file mode 100644 index 00000000000..4d8c57ace5c Binary files /dev/null and b/resources/images/testdata/images_golden/filters/mask/transparant.png differ diff --git a/resources/images/testdata/images_golden/filters_mask/wide.jpg b/resources/images/testdata/images_golden/filters/mask/wide.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_mask/wide.jpg rename to resources/images/testdata/images_golden/filters/mask/wide.jpg diff --git a/resources/images/testdata/images_golden/filters/mask/yellow.jpg b/resources/images/testdata/images_golden/filters/mask/yellow.jpg new file mode 100644 index 00000000000..e7b3073db21 Binary files /dev/null and b/resources/images/testdata/images_golden/filters/mask/yellow.jpg differ diff --git a/resources/images/testdata/images_golden/filters_misc/brightness-40.jpg b/resources/images/testdata/images_golden/filters/misc/brightness-40.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/brightness-40.jpg rename to resources/images/testdata/images_golden/filters/misc/brightness-40.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/colorbalance-180-50-20.jpg b/resources/images/testdata/images_golden/filters/misc/colorbalance-180-50-20.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/colorbalance-180-50-20.jpg rename to resources/images/testdata/images_golden/filters/misc/colorbalance-180-50-20.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/contrast-50.jpg b/resources/images/testdata/images_golden/filters/misc/contrast-50.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/contrast-50.jpg rename to resources/images/testdata/images_golden/filters/misc/contrast-50.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/dither-default.jpg b/resources/images/testdata/images_golden/filters/misc/dither-default.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/dither-default.jpg rename to resources/images/testdata/images_golden/filters/misc/dither-default.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/gamma-1.667.jpg b/resources/images/testdata/images_golden/filters/misc/gamma-1.667.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/gamma-1.667.jpg rename to resources/images/testdata/images_golden/filters/misc/gamma-1.667.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/gaussianblur-5.jpg b/resources/images/testdata/images_golden/filters/misc/gaussianblur-5.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/gaussianblur-5.jpg rename to resources/images/testdata/images_golden/filters/misc/gaussianblur-5.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/grayscale+colorize-180-50-20.jpg b/resources/images/testdata/images_golden/filters/misc/grayscale+colorize-180-50-20.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/grayscale+colorize-180-50-20.jpg rename to resources/images/testdata/images_golden/filters/misc/grayscale+colorize-180-50-20.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/grayscale.jpg b/resources/images/testdata/images_golden/filters/misc/grayscale.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/grayscale.jpg rename to resources/images/testdata/images_golden/filters/misc/grayscale.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/hue--15.jpg b/resources/images/testdata/images_golden/filters/misc/hue--15.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/hue--15.jpg rename to resources/images/testdata/images_golden/filters/misc/hue--15.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/invert.jpg b/resources/images/testdata/images_golden/filters/misc/invert.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/invert.jpg rename to resources/images/testdata/images_golden/filters/misc/invert.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/opacity-0.65.jpg b/resources/images/testdata/images_golden/filters/misc/opacity-0.65.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/opacity-0.65.jpg rename to resources/images/testdata/images_golden/filters/misc/opacity-0.65.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/overlay-20-20.jpg b/resources/images/testdata/images_golden/filters/misc/overlay-20-20.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/overlay-20-20.jpg rename to resources/images/testdata/images_golden/filters/misc/overlay-20-20.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/padding-20-40-#976941.jpg b/resources/images/testdata/images_golden/filters/misc/padding-20-40-#976941.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/padding-20-40-#976941.jpg rename to resources/images/testdata/images_golden/filters/misc/padding-20-40-#976941.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/pixelate-10.jpg b/resources/images/testdata/images_golden/filters/misc/pixelate-10.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/pixelate-10.jpg rename to resources/images/testdata/images_golden/filters/misc/pixelate-10.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/rotate270.jpg b/resources/images/testdata/images_golden/filters/misc/rotate270.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/rotate270.jpg rename to resources/images/testdata/images_golden/filters/misc/rotate270.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/saturation-65.jpg b/resources/images/testdata/images_golden/filters/misc/saturation-65.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/saturation-65.jpg rename to resources/images/testdata/images_golden/filters/misc/saturation-65.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/sepia-80.jpg b/resources/images/testdata/images_golden/filters/misc/sepia-80.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/sepia-80.jpg rename to resources/images/testdata/images_golden/filters/misc/sepia-80.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/sigmoid-0.6--4.jpg b/resources/images/testdata/images_golden/filters/misc/sigmoid-0.6--4.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/sigmoid-0.6--4.jpg rename to resources/images/testdata/images_golden/filters/misc/sigmoid-0.6--4.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/text.jpg b/resources/images/testdata/images_golden/filters/misc/text.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/text.jpg rename to resources/images/testdata/images_golden/filters/misc/text.jpg diff --git a/resources/images/testdata/images_golden/filters_misc/unsharpmask.jpg b/resources/images/testdata/images_golden/filters/misc/unsharpmask.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_misc/unsharpmask.jpg rename to resources/images/testdata/images_golden/filters/misc/unsharpmask.jpg diff --git a/resources/images/testdata/images_golden/filters_text/text_alignx-center.jpg b/resources/images/testdata/images_golden/filters/text/text_alignx-center.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_text/text_alignx-center.jpg rename to resources/images/testdata/images_golden/filters/text/text_alignx-center.jpg diff --git a/resources/images/testdata/images_golden/filters_text/text_alignx-left.jpg b/resources/images/testdata/images_golden/filters/text/text_alignx-left.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_text/text_alignx-left.jpg rename to resources/images/testdata/images_golden/filters/text/text_alignx-left.jpg diff --git a/resources/images/testdata/images_golden/filters_text/text_alignx-right.jpg b/resources/images/testdata/images_golden/filters/text/text_alignx-right.jpg similarity index 100% rename from resources/images/testdata/images_golden/filters_text/text_alignx-right.jpg rename to resources/images/testdata/images_golden/filters/text/text_alignx-right.jpg diff --git a/resources/images/testdata/images_golden/filters_mask/transparant.png b/resources/images/testdata/images_golden/filters_mask/transparant.png deleted file mode 100644 index ffbd84c9636..00000000000 Binary files a/resources/images/testdata/images_golden/filters_mask/transparant.png and /dev/null differ diff --git a/resources/images/testdata/images_golden/filters_mask/yellow.jpg b/resources/images/testdata/images_golden/filters_mask/yellow.jpg deleted file mode 100644 index a87123536ea..00000000000 Binary files a/resources/images/testdata/images_golden/filters_mask/yellow.jpg and /dev/null differ diff --git a/resources/images/testdata/images_golden/funcs/qr-default.png b/resources/images/testdata/images_golden/funcs/misc/qr-default.png similarity index 100% rename from resources/images/testdata/images_golden/funcs/qr-default.png rename to resources/images/testdata/images_golden/funcs/misc/qr-default.png diff --git a/resources/images/testdata/images_golden/funcs/qr-level-high_scale-6.png b/resources/images/testdata/images_golden/funcs/misc/qr-level-high_scale-6.png similarity index 100% rename from resources/images/testdata/images_golden/funcs/qr-level-high_scale-6.png rename to resources/images/testdata/images_golden/funcs/misc/qr-level-high_scale-6.png diff --git a/resources/images/testdata/images_golden/process_misc/crop-500x200-smart.jpg b/resources/images/testdata/images_golden/process/misc/crop-500x200-smart.jpg similarity index 100% rename from resources/images/testdata/images_golden/process_misc/crop-500x200-smart.jpg rename to resources/images/testdata/images_golden/process/misc/crop-500x200-smart.jpg diff --git a/resources/images/testdata/images_golden/process_misc/fill-500x200-smart.jpg b/resources/images/testdata/images_golden/process/misc/fill-500x200-smart.jpg similarity index 100% rename from resources/images/testdata/images_golden/process_misc/fill-500x200-smart.jpg rename to resources/images/testdata/images_golden/process/misc/fill-500x200-smart.jpg diff --git a/resources/images/testdata/images_golden/process_misc/fit-500x200-smart.jpg b/resources/images/testdata/images_golden/process/misc/fit-500x200-smart.jpg similarity index 100% rename from resources/images/testdata/images_golden/process_misc/fit-500x200-smart.jpg rename to resources/images/testdata/images_golden/process/misc/fit-500x200-smart.jpg diff --git a/resources/images/testdata/images_golden/process_misc/resize-100x100-gif.gif b/resources/images/testdata/images_golden/process/misc/resize-100x100-gif.gif similarity index 100% rename from resources/images/testdata/images_golden/process_misc/resize-100x100-gif.gif rename to resources/images/testdata/images_golden/process/misc/resize-100x100-gif.gif diff --git a/resources/images/testdata/images_golden/process_misc/resize-100x100-r180.png b/resources/images/testdata/images_golden/process/misc/resize-100x100-r180.png similarity index 100% rename from resources/images/testdata/images_golden/process_misc/resize-100x100-r180.png rename to resources/images/testdata/images_golden/process/misc/resize-100x100-r180.png diff --git a/resources/images/testdata/images_golden/process_misc/resize-300x300-jpg-b31280.jpg b/resources/images/testdata/images_golden/process/misc/resize-300x300-jpg-b31280.jpg similarity index 100% rename from resources/images/testdata/images_golden/process_misc/resize-300x300-jpg-b31280.jpg rename to resources/images/testdata/images_golden/process/misc/resize-300x300-jpg-b31280.jpg