diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-10 21:05:17 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-12 13:26:32 +0200 |
commit | 9e571827055dedb46b78c5db3d17d6913f14870b (patch) | |
tree | f5f0108afe0c9385ff6dc27664943d9f719f57ad /hugolib/paths | |
parent | 6027ee11082d0b9d72de1d4d1980a702be294ad2 (diff) |
tests: Convert from testify to quicktest
Diffstat (limited to 'hugolib/paths')
-rw-r--r-- | hugolib/paths/baseURL_test.go | 43 | ||||
-rw-r--r-- | hugolib/paths/paths_test.go | 12 |
2 files changed, 28 insertions, 27 deletions
diff --git a/hugolib/paths/baseURL_test.go b/hugolib/paths/baseURL_test.go index 382a18314..77095bb7d 100644 --- a/hugolib/paths/baseURL_test.go +++ b/hugolib/paths/baseURL_test.go @@ -16,51 +16,52 @@ package paths import ( "testing" - "github.com/stretchr/testify/require" + qt "github.com/frankban/quicktest" ) func TestBaseURL(t *testing.T) { + c := qt.New(t) b, err := newBaseURLFromString("http://example.com") - require.NoError(t, err) - require.Equal(t, "http://example.com", b.String()) + c.Assert(err, qt.IsNil) + c.Assert(b.String(), qt.Equals, "http://example.com") p, err := b.WithProtocol("webcal://") - require.NoError(t, err) - require.Equal(t, "webcal://example.com", p) + c.Assert(err, qt.IsNil) + c.Assert(p, qt.Equals, "webcal://example.com") p, err = b.WithProtocol("webcal") - require.NoError(t, err) - require.Equal(t, "webcal://example.com", p) + c.Assert(err, qt.IsNil) + c.Assert(p, qt.Equals, "webcal://example.com") _, err = b.WithProtocol("mailto:") - require.Error(t, err) + c.Assert(err, qt.Not(qt.IsNil)) b, err = newBaseURLFromString("mailto:hugo@rules.com") - require.NoError(t, err) - require.Equal(t, "mailto:hugo@rules.com", b.String()) + c.Assert(err, qt.IsNil) + c.Assert(b.String(), qt.Equals, "mailto:hugo@rules.com") // These are pretty constructed p, err = b.WithProtocol("webcal") - require.NoError(t, err) - require.Equal(t, "webcal:hugo@rules.com", p) + c.Assert(err, qt.IsNil) + c.Assert(p, qt.Equals, "webcal:hugo@rules.com") p, err = b.WithProtocol("webcal://") - require.NoError(t, err) - require.Equal(t, "webcal://hugo@rules.com", p) + c.Assert(err, qt.IsNil) + c.Assert(p, qt.Equals, "webcal://hugo@rules.com") // Test with "non-URLs". Some people will try to use these as a way to get // relative URLs working etc. b, err = newBaseURLFromString("/") - require.NoError(t, err) - require.Equal(t, "/", b.String()) + c.Assert(err, qt.IsNil) + c.Assert(b.String(), qt.Equals, "/") b, err = newBaseURLFromString("") - require.NoError(t, err) - require.Equal(t, "", b.String()) + c.Assert(err, qt.IsNil) + c.Assert(b.String(), qt.Equals, "") // BaseURL with sub path b, err = newBaseURLFromString("http://example.com/sub") - require.NoError(t, err) - require.Equal(t, "http://example.com/sub", b.String()) - require.Equal(t, "http://example.com", b.HostURL()) + c.Assert(err, qt.IsNil) + c.Assert(b.String(), qt.Equals, "http://example.com/sub") + c.Assert(b.HostURL(), qt.Equals, "http://example.com") } diff --git a/hugolib/paths/paths_test.go b/hugolib/paths/paths_test.go index 95a8be782..59dbf0e00 100644 --- a/hugolib/paths/paths_test.go +++ b/hugolib/paths/paths_test.go @@ -18,13 +18,13 @@ import ( "github.com/gohugoio/hugo/langs" + qt "github.com/frankban/quicktest" "github.com/gohugoio/hugo/hugofs" "github.com/spf13/viper" - "github.com/stretchr/testify/require" ) func TestNewPaths(t *testing.T) { - assert := require.New(t) + c := qt.New(t) v := viper.New() fs := hugofs.NewMem(v) @@ -43,9 +43,9 @@ func TestNewPaths(t *testing.T) { langs.LoadLanguageSettings(v, nil) p, err := New(fs, v) - assert.NoError(err) + c.Assert(err, qt.IsNil) - assert.Equal(true, p.defaultContentLanguageInSubdir) - assert.Equal("no", p.DefaultContentLanguage) - assert.Equal(true, p.multilingual) + c.Assert(p.defaultContentLanguageInSubdir, qt.Equals, true) + c.Assert(p.DefaultContentLanguage, qt.Equals, "no") + c.Assert(p.multilingual, qt.Equals, true) } |