From effa6a4226214b10c1667aa79ed7e9d39656f11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 21 Dec 2022 09:17:51 +0100 Subject: [PATCH] tocss: Add some more test cases See #10555 --- .../tocss/dartsass/integration_test.go | 6 ++++-- .../resource_transformers/tocss/scss/integration_test.go | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/resource_transformers/tocss/dartsass/integration_test.go b/resources/resource_transformers/tocss/dartsass/integration_test.go index 083cef14f..3d7c07ba6 100644 --- a/resources/resource_transformers/tocss/dartsass/integration_test.go +++ b/resources/resource_transformers/tocss/dartsass/integration_test.go @@ -290,6 +290,7 @@ func TestOptionVars(t *testing.T) { body { body { background: url(vars.$image) no-repeat center/cover; + font-family: vars.$font; } } @@ -303,7 +304,8 @@ b { } -- layouts/index.html -- {{ $image := "images/hero.jpg" }} -{{ $vars := dict "$color1" "blue" "$color2" "green" "font_size" "24px" "image" $image }} +{{ $font := "Hugo's New Roman" }} +{{ $vars := dict "$color1" "blue" "$color2" "green" "font_size" "24px" "image" $image "font" $font }} {{ $cssOpts := (dict "transpiler" "dartsass" "outputStyle" "compressed" "vars" $vars ) }} {{ $r := resources.Get "scss/main.scss" | toCSS $cssOpts }} T1: {{ $r.Content }} @@ -316,7 +318,7 @@ T1: {{ $r.Content }} NeedsOsFS: true, }).Build() - b.AssertFileContent("public/index.html", `T1: body body{background:url(images/hero.jpg) no-repeat center/cover}p{color:blue;font-size:24px}b{color:green}`) + b.AssertFileContent("public/index.html", `T1: body body{background:url(images/hero.jpg) no-repeat center/cover;font-family:Hugo's New Roman}p{color:blue;font-size:24px}b{color:green}`) } func TestOptionVarsParams(t *testing.T) { diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go index 799c70ee5..d0dd65e20 100644 --- a/resources/resource_transformers/tocss/scss/integration_test.go +++ b/resources/resource_transformers/tocss/scss/integration_test.go @@ -263,6 +263,7 @@ func TestOptionVars(t *testing.T) { body { body { background: url($image) no-repeat center/cover; + font-family: $font; } } @@ -276,7 +277,8 @@ b { } -- layouts/index.html -- {{ $image := "images/hero.jpg" }} -{{ $vars := dict "$color1" "blue" "$color2" "green" "font_size" "24px" "image" $image }} +{{ $font := "Hugo's New Roman" }} +{{ $vars := dict "$color1" "blue" "$color2" "green" "font_size" "24px" "image" $image "font" $font }} {{ $cssOpts := (dict "transpiler" "libsass" "outputStyle" "compressed" "vars" $vars ) }} {{ $r := resources.Get "scss/main.scss" | toCSS $cssOpts }} T1: {{ $r.Content }} @@ -289,5 +291,5 @@ T1: {{ $r.Content }} NeedsOsFS: true, }).Build() - b.AssertFileContent("public/index.html", `T1: body body{background:url(images/hero.jpg) no-repeat center/cover}p{color:blue;font-size:var 24px}b{color:green}`) + b.AssertFileContent("public/index.html", `T1: body body{background:url(images/hero.jpg) no-repeat center/cover;font-family:Hugo's New Roman}p{color:blue;font-size:var 24px}b{color:green}`) }