From 7203a95a6069b09a7546e5b2e286abe6455df83a Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Thu, 25 Apr 2024 12:30:16 +0200 Subject: Fix rebuilds when running hugo -w This was partly broken in Hugo 0.123.0. We have two internal config options that gets set from the CLI: * Running; a web server is running * Watching; either set via `hugo -w` or `hugo server --watch=false` Part of the change detection code wrongly used the `Running` as a flag when `Watching` would be the correct. Fixes #12296 --- hugolib/rebuild_test.go | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'hugolib/rebuild_test.go') diff --git a/hugolib/rebuild_test.go b/hugolib/rebuild_test.go index ea7efcb6f..4336d8b61 100644 --- a/hugolib/rebuild_test.go +++ b/hugolib/rebuild_test.go @@ -121,14 +121,23 @@ func TestRebuildEditTextFileInBranchBundle(t *testing.T) { b.AssertRenderCountContent(1) } +func testRebuildBothWatchingAndRunning(t *testing.T, files string, withB func(b *IntegrationTestBuilder)) { + t.Helper() + for _, opt := range []TestOpt{TestOptWatching(), TestOptRunning()} { + b := Test(t, files, opt) + withB(b) + } +} + func TestRebuildRenameTextFileInLeafBundle(t *testing.T) { - b := TestRunning(t, rebuildFilesSimple) - b.AssertFileContent("public/mysection/mysectionbundle/index.html", "My Section Bundle Text 2 Content.", "Len Resources: 2|") + testRebuildBothWatchingAndRunning(t, rebuildFilesSimple, func(b *IntegrationTestBuilder) { + b.AssertFileContent("public/mysection/mysectionbundle/index.html", "My Section Bundle Text 2 Content.", "Len Resources: 2|") - b.RenameFile("content/mysection/mysectionbundle/mysectionbundletext.txt", "content/mysection/mysectionbundle/mysectionbundletext2.txt").Build() - b.AssertFileContent("public/mysection/mysectionbundle/index.html", "mysectionbundletext2", "My Section Bundle Text 2 Content.", "Len Resources: 2|") - b.AssertRenderCountPage(3) - b.AssertRenderCountContent(3) + b.RenameFile("content/mysection/mysectionbundle/mysectionbundletext.txt", "content/mysection/mysectionbundle/mysectionbundletext2.txt").Build() + b.AssertFileContent("public/mysection/mysectionbundle/index.html", "mysectionbundletext2", "My Section Bundle Text 2 Content.", "Len Resources: 2|") + b.AssertRenderCountPage(3) + b.AssertRenderCountContent(3) + }) } func TestRebuilEditContentFileInLeafBundle(t *testing.T) { @@ -367,8 +376,6 @@ My short. } func TestRebuildBaseof(t *testing.T) { - t.Parallel() - files := ` -- hugo.toml -- title = "Hugo Site" @@ -383,12 +390,13 @@ Baseof: {{ .Title }}| Home: {{ .Title }}|{{ .Content }}| {{ end }} ` - b := Test(t, files, TestOptRunning()) - b.AssertFileContent("public/index.html", "Baseof: Hugo Site|", "Home: Hugo Site||") - b.EditFileReplaceFunc("layouts/_default/baseof.html", func(s string) string { - return strings.Replace(s, "Baseof", "Baseof Edited", 1) - }).Build() - b.AssertFileContent("public/index.html", "Baseof Edited: Hugo Site|", "Home: Hugo Site||") + testRebuildBothWatchingAndRunning(t, files, func(b *IntegrationTestBuilder) { + b.AssertFileContent("public/index.html", "Baseof: Hugo Site|", "Home: Hugo Site||") + b.EditFileReplaceFunc("layouts/_default/baseof.html", func(s string) string { + return strings.Replace(s, "Baseof", "Baseof Edited", 1) + }).Build() + b.AssertFileContent("public/index.html", "Baseof Edited: Hugo Site|", "Home: Hugo Site||") + }) } func TestRebuildSingleWithBaseof(t *testing.T) { -- cgit v1.2.3