Skip to content

Commit

Permalink
minifier: Port integration tests to its package
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Feb 9, 2022
1 parent b06c210 commit 94f10cf
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 23 deletions.
23 changes: 0 additions & 23 deletions hugolib/resource_chain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
47 changes: 47 additions & 0 deletions resources/resource_transformers/minifier/integration_test.go
Original file line number Diff line number Diff line change
@@ -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.*")
}

0 comments on commit 94f10cf

Please sign in to comment.