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-02-09 16:10:09 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-09 17:41:32 +0300
commit94f10cf4f92b176dcf7b8b74c266f4bfde224cc6 (patch)
treeaa17f1deffcefa3e282ec6e8d94e6f85703cc572
parentb06c2103b84dde1d757bf8efe894014b678f460f (diff)
minifier: Port integration tests to its package
-rw-r--r--hugolib/resource_chain_test.go23
-rw-r--r--resources/resource_transformers/minifier/integration_test.go47
2 files changed, 47 insertions, 23 deletions
diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index 39f867570..723a4b9d9 100644
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -930,26 +930,3 @@ XML: {{ $xml.Content | safeHTML }}|{{ $xml.RelPermalink }}
XML: <root> <foo> asdfasdf </foo> </root>|/xml/data.min.3be4fddd19aaebb18c48dd6645215b822df74701957d6d36e59f203f9c30fd9f.xml
`)
}
-
-// Issue 8954
-func TestMinifyWithError(t *testing.T) {
- b := newTestSitesBuilder(t).WithSimpleConfigFile()
- b.WithSourceFile(
- "assets/js/test.js", `
-new Date(2002, 04, 11)
-`,
- )
- b.WithTemplates("index.html", `
-{{ $js := resources.Get "js/test.js" | minify | fingerprint }}
-<script>
-{{ $js.Content }}
-</script>
-`)
- b.WithContent("page.md", "")
-
- err := b.BuildE(BuildCfg{})
-
- if err == nil || !strings.Contains(err.Error(), "04") {
- t.Fatalf("expected a message about a legacy octal number, but got: %v", err)
- }
-}
diff --git a/resources/resource_transformers/minifier/integration_test.go b/resources/resource_transformers/minifier/integration_test.go
new file mode 100644
index 000000000..fb4cc7a65
--- /dev/null
+++ b/resources/resource_transformers/minifier/integration_test.go
@@ -0,0 +1,47 @@
+// Copyright 2021 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package minifier_test
+
+import (
+ "testing"
+
+ qt "github.com/frankban/quicktest"
+ "github.com/gohugoio/hugo/hugolib"
+)
+
+// Issue 8954
+func TestTransformMinify(t *testing.T) {
+ c := qt.New(t)
+
+ files := `
+-- assets/js/test.js --
+new Date(2002, 04, 11)
+-- config.toml --
+-- layouts/index.html --
+{{ $js := resources.Get "js/test.js" | minify }}
+<script>
+{{ $js.Content }}
+</script>
+`
+
+ b, err := hugolib.NewIntegrationTestBuilder(
+ hugolib.IntegrationTestConfig{
+ T: c,
+ TxtarString: files,
+ },
+ ).BuildE()
+
+ b.Assert(err, qt.IsNotNil)
+ b.Assert(err, qt.ErrorMatches, "(?s).*legacy octal numbers.*line 1.*")
+}