From 215a715ddd698731fd81aed9cfaf7e37826e2467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 9 Feb 2022 14:15:20 +0100 Subject: [PATCH] babel: Port integration tests to their own package --- hugolib/resource_chain_babel_test.go | 146 ------------------ .../babel/integration_test.go | 97 ++++++++++++ 2 files changed, 97 insertions(+), 146 deletions(-) delete mode 100644 hugolib/resource_chain_babel_test.go create mode 100644 resources/resource_transformers/babel/integration_test.go diff --git a/hugolib/resource_chain_babel_test.go b/hugolib/resource_chain_babel_test.go deleted file mode 100644 index 7a97e820a..000000000 --- a/hugolib/resource_chain_babel_test.go +++ /dev/null @@ -1,146 +0,0 @@ -// Copyright 2020 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 hugolib - -import ( - "bytes" - "os" - "path/filepath" - "testing" - - "github.com/gohugoio/hugo/config" - - jww "github.com/spf13/jwalterweatherman" - - "github.com/gohugoio/hugo/htesting" - - qt "github.com/frankban/quicktest" - - "github.com/gohugoio/hugo/hugofs" - - "github.com/gohugoio/hugo/common/loggers" -) - -func TestResourceChainBabel(t *testing.T) { - if !htesting.IsCI() { - t.Skip("skip (relative) long running modules test when running locally") - } - - wd, _ := os.Getwd() - defer func() { - os.Chdir(wd) - }() - - c := qt.New(t) - - packageJSON := `{ - "scripts": {}, - - "devDependencies": { - "@babel/cli": "7.8.4", - "@babel/core": "7.9.0", - "@babel/preset-env": "7.9.5" - } -} -` - - babelConfig := ` -console.error("Hugo Environment:", process.env.HUGO_ENVIRONMENT ); - -module.exports = { - presets: ["@babel/preset-env"], -}; - -` - - js := ` -/* A Car */ -class Car { - constructor(brand) { - this.carname = brand; - } -} -` - - js2 := ` -/* A Car2 */ -class Car2 { - constructor(brand) { - this.carname = brand; - } -} -` - - workDir, clean, err := htesting.CreateTempDir(hugofs.Os, "hugo-test-babel") - c.Assert(err, qt.IsNil) - defer clean() - - var logBuf bytes.Buffer - logger := loggers.NewBasicLoggerForWriter(jww.LevelInfo, &logBuf) - - v := config.New() - v.Set("workingDir", workDir) - v.Set("disableKinds", []string{"taxonomy", "term", "page"}) - v.Set("security", map[string]interface{}{ - "exec": map[string]interface{}{ - "allow": []string{"^npx$", "^babel$"}, - }, - }) - - b := newTestSitesBuilder(t).WithLogger(logger) - - // Need to use OS fs for this. - b.Fs = hugofs.NewDefault(v) - b.WithWorkingDir(workDir) - b.WithViper(v) - b.WithContent("p1.md", "") - - b.WithTemplates("index.html", ` -{{ $options := dict "noComments" true }} -{{ $transpiled := resources.Get "js/main.js" | babel -}} -Transpiled: {{ $transpiled.Content | safeJS }} - -{{ $transpiled := resources.Get "js/main2.js" | babel (dict "sourceMap" "inline") -}} -Transpiled2: {{ $transpiled.Content | safeJS }} - -{{ $transpiled := resources.Get "js/main2.js" | babel (dict "sourceMap" "external") -}} -Transpiled3: {{ $transpiled.Permalink }} - -`) - - jsDir := filepath.Join(workDir, "assets", "js") - b.Assert(os.MkdirAll(jsDir, 0777), qt.IsNil) - b.WithSourceFile("assets/js/main.js", js) - b.WithSourceFile("assets/js/main2.js", js2) - b.WithSourceFile("package.json", packageJSON) - b.WithSourceFile("babel.config.js", babelConfig) - - b.Assert(os.Chdir(workDir), qt.IsNil) - cmd := b.NpmInstall() - err = cmd.Run() - b.Assert(err, qt.IsNil) - - b.Build(BuildCfg{}) - - // Make sure Node sees this. - b.Assert(logBuf.String(), qt.Contains, "babel: Hugo Environment: production") - b.Assert(err, qt.IsNil) - - b.AssertFileContent("public/index.html", `var Car =`) - b.AssertFileContent("public/index.html", `var Car2 =`) - b.AssertFileContent("public/js/main2.js", `var Car2 =`) - b.AssertFileContent("public/js/main2.js.map", `{"version":3,`) - b.AssertFileContent("public/index.html", ` -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozL`) -} diff --git a/resources/resource_transformers/babel/integration_test.go b/resources/resource_transformers/babel/integration_test.go new file mode 100644 index 000000000..3fe3c17b1 --- /dev/null +++ b/resources/resource_transformers/babel/integration_test.go @@ -0,0 +1,97 @@ +// 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 babel_test + +import ( + "testing" + + qt "github.com/frankban/quicktest" + jww "github.com/spf13/jwalterweatherman" + + "github.com/gohugoio/hugo/htesting" + "github.com/gohugoio/hugo/hugolib" +) + +func TestTransformBabel(t *testing.T) { + if !htesting.IsCI() { + t.Skip("Skip long running test when running locally") + } + + c := qt.New(t) + + files := ` +-- assets/js/main.js -- +/* A Car */ +class Car { + constructor(brand) { + this.carname = brand; + } +} +-- assets/js/main2.js -- +/* A Car2 */ +class Car2 { + constructor(brand) { + this.carname = brand; + } +} +-- babel.config.js -- +console.error("Hugo Environment:", process.env.HUGO_ENVIRONMENT ); + +module.exports = { + presets: ["@babel/preset-env"], +}; +-- config.toml -- +disablekinds = ['taxonomy', 'term', 'page'] +[security] + [security.exec] + allow = ['^npx$', '^babel$'] +-- layouts/index.html -- +{{ $options := dict "noComments" true }} +{{ $transpiled := resources.Get "js/main.js" | babel -}} +Transpiled: {{ $transpiled.Content | safeJS }} + +{{ $transpiled := resources.Get "js/main2.js" | babel (dict "sourceMap" "inline") -}} +Transpiled2: {{ $transpiled.Content | safeJS }} + +{{ $transpiled := resources.Get "js/main2.js" | babel (dict "sourceMap" "external") -}} +Transpiled3: {{ $transpiled.Permalink }} +-- package.json -- +{ + "scripts": {}, + + "devDependencies": { + "@babel/cli": "7.8.4", + "@babel/core": "7.9.0", + "@babel/preset-env": "7.9.5" + } +} + + ` + + b := hugolib.NewIntegrationTestBuilder( + hugolib.IntegrationTestConfig{ + T: c, + TxtarString: files, + NeedsOsFS: true, + NeedsNpmInstall: true, + LogLevel: jww.LevelInfo, + }).Build() + + b.AssertLogContains("babel: Hugo Environment: production") + b.AssertFileContent("public/index.html", `var Car2 =`) + b.AssertFileContent("public/js/main2.js", `var Car2 =`) + b.AssertFileContent("public/js/main2.js.map", `{"version":3,`) + b.AssertFileContent("public/index.html", ` +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozL`) +}