Replace deprecated excludeFiles and includeFiles with files in tests

diff --git a/common/hugo/hugo.go b/common/hugo/hugo.go
index 6793216028073bc0cbcc8cdd9cd7daccbccd910d..fbb1e53a44751c5f63e0369145053d21ab42745f 100644 (file)
--- a/common/hugo/hugo.go
+++ b/common/hugo/hugo.go
@@ -334,6 +334,9 @@ func deprecateLevel(item, alternative, version string, level logg.Level) {
 
 // DeprecateLevel informs about a deprecation logging at the given level.
 func deprecateLevelWithLogger(item, alternative, version string, level logg.Level, log logg.Logger) {
+       //if strings.Contains(item, "module.mounts.lang") || strings.Contains(item, "includeFiles") {
+       // hdebug.Panicf("Deprecated")
+       //}
        var msg string
        if level == logg.LevelError {
                // Useful to debug deprecation errors that needs to be removedor fixed. Comment out when done debugging.

diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go
index 6f02f2c7f4fb754675e6af8eea06f857f757515c..5bc0393fe192fa00db9d2dcd6f5b06652975ca9c 100644 (file)
--- a/hugolib/filesystems/basefs_test.go
+++ b/hugolib/filesystems/basefs_test.go
@@ -227,11 +227,11 @@ disableWatch = true
 [[module.mounts]]
 source = 'content4'
 target = 'content/excludedsome'
-excludeFiles = 'p1.md'
+files = '! p1.md'
 [[module.mounts]]
 source = 'content5'
 target = 'content/excludedall'
-excludeFiles = '/**'
+files = '! /**'
 [[module.mounts]]
 source = "hugo_stats.json"
 target = "assets/watching/hugo_stats.json"

diff --git a/hugolib/hugo_modules_test.go b/hugolib/hugo_modules_test.go
index f2f365e50b31dd99699d10dd29349ed72189042f..512afb7078ba1f61a428fd7a27c3c73ef89a6849 100644 (file)
--- a/hugolib/hugo_modules_test.go
+++ b/hugolib/hugo_modules_test.go
@@ -51,13 +51,15 @@ path="a"
 [[module.imports.mounts]]
 source="myacontent"
 target="content/blog"
-lang="en"
+[module.imports.mounts.sites.matrix]
+languages  = "en"
 [[module.imports]]
 path="b"
 [[module.imports.mounts]]
 source="mybcontent"
 target="content/blog"
-lang="nn"
+[module.imports.mounts.sites.matrix]
+languages  = "nn"
 [[module.imports]]
 path="c"
 [[module.imports]]

diff --git a/hugolib/mount_filters_test.go b/hugolib/mount_filters_test.go
index 6bb4870a3028579aa12afffeebef4347790082cb..3443a43b7caa8818e990090d5c3820064b7040ac 100644 (file)
--- a/hugolib/mount_filters_test.go
+++ b/hugolib/mount_filters_test.go
@@ -27,22 +27,22 @@ baseURL = "http://example.com/"
 [[module.mounts]]
 source = 'content'
 target = 'content'
-excludeFiles = "/a/c/**"
+files = "! /a/c/**"
 [[module.mounts]]
 source = 'static'
 target = 'static'
 [[module.mounts]]
 source = 'layouts'
 target = 'layouts'
-excludeFiles = "/**/foo.html"
+files = "! /**/foo.html"
 [[module.mounts]]
 source = 'data'
 target = 'data'
-includeFiles = "/mydata/**"
+files = "/mydata/**"
 [[module.mounts]]
 source = 'assets'
 target = 'assets'
-excludeFiles = ["/**exclude.*", "/moooo.*"]
+files = ["! /**exclude.*", "! /moooo.*"]
 [[module.mounts]]
 source = 'i18n'
 target = 'i18n'