--- a/hugolib/page_test.go +++ b/hugolib/page_test.go @@ -16,7 +16,6 @@ import ( "fmt" "html/template" - "os" "github.com/gohugoio/hugo/common/loggers" @@ -25,12 +24,9 @@ "testing" "time" - "github.com/gohugoio/hugo/hugofs" - "github.com/gohugoio/hugo/resources/page" "github.com/gohugoio/hugo/resources/resource" - "github.com/spf13/afero" "github.com/spf13/viper" "github.com/gohugoio/hugo/deps" @@ -760,63 +756,6 @@ d, _ := time.Parse(time.RFC3339, "2013-05-17T16:59:30Z") checkPageDate(t, p, d) -} - -func TestPageWithLastmodFromGitInfo(t *testing.T) { - assrt := require.New(t) - - // We need to use the OS fs for this. - cfg := viper.New() - fs := hugofs.NewFrom(hugofs.Os, cfg) - fs.Destination = &afero.MemMapFs{} - - cfg.Set("frontmatter", map[string]interface{}{ - "lastmod": []string{":git", "lastmod"}, - }) - cfg.Set("defaultContentLanguage", "en") - - langConfig := map[string]interface{}{ - "en": map[string]interface{}{ - "weight": 1, - "languageName": "English", - "contentDir": "content", - }, - "nn": map[string]interface{}{ - "weight": 2, - "languageName": "Nynorsk", - "contentDir": "content_nn", - }, - } - - cfg.Set("languages", langConfig) - cfg.Set("enableGitInfo", true) - - assrt.NoError(loadDefaultSettingsFor(cfg)) - assrt.NoError(loadLanguageSettings(cfg, nil)) - - wd, err := os.Getwd() - assrt.NoError(err) - cfg.Set("workingDir", filepath.Join(wd, "testsite")) - - h, err := NewHugoSites(deps.DepsCfg{Fs: fs, Cfg: cfg}) - - assrt.NoError(err) - assrt.Len(h.Sites, 2) - - require.NoError(t, h.Build(BuildCfg{SkipRender: true})) - - enSite := h.Sites[0] - assrt.Len(enSite.RegularPages(), 1) - - // 2018-03-11 is the Git author date for testsite/content/first-post.md - assrt.Equal("2018-03-11", enSite.RegularPages()[0].Lastmod().Format("2006-01-02")) - - nnSite := h.Sites[1] - assrt.Len(nnSite.RegularPages(), 1) - - // 2018-08-11 is the Git author date for testsite/content_nn/first-post.md - assrt.Equal("2018-08-11", nnSite.RegularPages()[0].Lastmod().Format("2006-01-02")) - } func TestPageWithFrontMatterConfig(t *testing.T) { diff --git a/releaser/git_test.go b/releaser/git_test.go deleted file mode 100644 index f0d6fd24..00000000 --- a/releaser/git_test.go +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2017-present 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 releaser - -import ( - "testing" - - "github.com/stretchr/testify/require" -) - -func TestGitInfos(t *testing.T) { - skipIfCI(t) - infos, err := getGitInfos("v0.20", "hugo", "", false) - - require.NoError(t, err) - require.True(t, len(infos) > 0) - -} - -func TestIssuesRe(t *testing.T) { - - body := ` -This is a commit message. - -Updates #123 -Fix #345 -closes #543 -See #456 - ` - - issues := extractIssues(body) - - require.Len(t, issues, 4) - require.Equal(t, 123, issues[0]) - require.Equal(t, 543, issues[2]) - -} - -func TestGitVersionTagBefore(t *testing.T) { - skipIfCI(t) - v1, err := gitVersionTagBefore("v0.18") - require.NoError(t, err) - require.Equal(t, "v0.17", v1) -} - -func TestTagExists(t *testing.T) { - skipIfCI(t) - b1, err := tagExists("v0.18") - require.NoError(t, err) - require.True(t, b1) - - b2, err := tagExists("adfagdsfg") - require.NoError(t, err) - require.False(t, b2) - -} - -func skipIfCI(t *testing.T) { - if isCI() { - // Travis has an ancient git with no --invert-grep: https://github.com/travis-ci/travis-ci/issues/6328 - // Also Travis clones very shallowly, making some of the tests above shaky. - t.Skip("Skip git test on Linux to make Travis happy.") - } -} -- 2.21.0