Complete the Url-to-URL transition in tests

See #959

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 19df704d6c02d8ad98adbf645cb420075e337061..705abe0c1bf7577c8bbb2e82aa175930a448399c 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -279,26 +279,26 @@ func TestDraftAndFutureRender(t *testing.T) {
 // Issue #957
 func TestCrossrefs(t *testing.T) {
        hugofs.DestinationFS = new(afero.MemMapFs)
-       for _, uglyUrls := range []bool{true, false} {
+       for _, uglyURLs := range []bool{true, false} {
                for _, relative := range []bool{true, false} {
-                       doTestCrossrefs(t, relative, uglyUrls)
+                       doTestCrossrefs(t, relative, uglyURLs)
                }
        }
 }
 
-func doTestCrossrefs(t *testing.T, relative, uglyUrls bool) {
+func doTestCrossrefs(t *testing.T, relative, uglyURLs bool) {
        viper.Reset()
        defer viper.Reset()
 
-       baseUrl := "http://foo/bar"
+       baseURL := "http://foo/bar"
        viper.Set("DefaultExtension", "html")
-       viper.Set("baseurl", baseUrl)
-       viper.Set("UglyURLs", uglyUrls)
+       viper.Set("baseurl", baseURL)
+       viper.Set("UglyURLs", uglyURLs)
        viper.Set("verbose", true)
 
        var refShortcode string
        var expectedBase string
-       var expectedUrlSuffix string
+       var expectedURLSuffix string
        var expectedPathSuffix string
 
        if relative {
@@ -306,14 +306,14 @@ func doTestCrossrefs(t *testing.T, relative, uglyUrls bool) {
                expectedBase = "/bar"
        } else {
                refShortcode = "ref"
-               expectedBase = baseUrl
+               expectedBase = baseURL
        }
 
-       if uglyUrls {
-               expectedUrlSuffix = ".html"
+       if uglyURLs {
+               expectedURLSuffix = ".html"
                expectedPathSuffix = ".html"
        } else {
-               expectedUrlSuffix = "/"
+               expectedURLSuffix = "/"
                expectedPathSuffix = "/index.html"
        }
 
@@ -331,7 +331,7 @@ THE END.`, refShortcode))},
 
        s := &Site{
                Source:  &source.InMemorySource{ByteSource: sources},
-               Targets: targetList{Page: &target.PagePub{UglyURLs: uglyUrls}},
+               Targets: targetList{Page: &target.PagePub{UglyURLs: uglyURLs}},
        }
 
        s.initializeSiteInfo()
@@ -345,8 +345,8 @@ THE END.`, refShortcode))},
                doc      string
                expected string
        }{
-               {filepath.FromSlash(fmt.Sprintf("sect/doc1%s", expectedPathSuffix)), fmt.Sprintf("<p>Ref 2: %s/sect/doc2%s</p>\n", expectedBase, expectedUrlSuffix)},
-               {filepath.FromSlash(fmt.Sprintf("sect/doc2%s", expectedPathSuffix)), fmt.Sprintf("<p><strong>Ref 1:</strong></p>\n\n%s/sect/doc1%s\n\n<p>THE END.</p>\n", expectedBase, expectedUrlSuffix)},
+               {filepath.FromSlash(fmt.Sprintf("sect/doc1%s", expectedPathSuffix)), fmt.Sprintf("<p>Ref 2: %s/sect/doc2%s</p>\n", expectedBase, expectedURLSuffix)},
+               {filepath.FromSlash(fmt.Sprintf("sect/doc2%s", expectedPathSuffix)), fmt.Sprintf("<p><strong>Ref 1:</strong></p>\n\n%s/sect/doc1%s\n\n<p>THE END.</p>\n", expectedBase, expectedURLSuffix)},
        }
 
        for _, test := range tests {
@@ -366,14 +366,14 @@ THE END.`, refShortcode))},
 }
 
 // Issue #939
-func Test404ShouldAlwaysHaveUglyUrls(t *testing.T) {
+func Test404ShouldAlwaysHaveUglyURLs(t *testing.T) {
        hugofs.DestinationFS = new(afero.MemMapFs)
        for _, uglyURLs := range []bool{true, false} {
-               doTest404ShouldAlwaysHaveUglyUrls(t, uglyURLs)
+               doTest404ShouldAlwaysHaveUglyURLs(t, uglyURLs)
        }
 }
 
-func doTest404ShouldAlwaysHaveUglyUrls(t *testing.T, uglyURLs bool) {
+func doTest404ShouldAlwaysHaveUglyURLs(t *testing.T, uglyURLs bool) {
        viper.Reset()
        defer viper.Reset()
 
@@ -590,7 +590,7 @@ func TestSkipRender(t *testing.T) {
        }
 }
 
-func TestAbsUrlify(t *testing.T) {
+func TestAbsURLify(t *testing.T) {
        viper.Reset()
        defer viper.Reset()
 
@@ -648,7 +648,7 @@ func TestAbsUrlify(t *testing.T) {
                        }
 
                        if content != expected {
-                               t.Errorf("AbsUrlify content expected:\n%q\ngot\n%q", expected, content)
+                               t.Errorf("AbsURLify content expected:\n%q\ngot\n%q", expected, content)
                        }
                }
        }

diff --git a/utils/utils_test.go b/utils/utils_test.go
index 7c47ef9708787b595f164ac0dd2ca3ba38a396dc..4ec2a4eec0ce957a9ee77cddea23b794282c1693 100644 (file)
--- a/utils/utils_test.go
+++ b/utils/utils_test.go
@@ -10,7 +10,7 @@ func TestCutUsageMessage(t *testing.T) {
                cutMessage string
        }{
                {"", ""},
-               {" Usage of hugo: \n  -b, --baseUrl=...", ""},
+               {" Usage of hugo: \n  -b, --baseURL=...", ""},
                {"Some error Usage of hugo: \n", "Some error"},
                {"Usage of hugo: \n -b --baseU", ""},
                {"CRITICAL error for usage of hugo ", "CRITICAL error for usage of hugo"},