diff options
| author | Anthony Fok <foka@debian.org> | 2015-03-17 22:16:54 -0700 |
|---|---|---|
| committer | bep <bjorn.erik.pedersen@gmail.com> | 2015-03-18 11:30:37 +0100 |
| commit | 8b8fb417ae065954a056ea018bd092748cc9127c (patch) | |
| tree | a9160d1f6acc218bcb8728d729deaf1b532b56b3 /hugolib/pagination_test.go | |
| parent | ca69cad8aa5d8eefbce13abd97b2b979339a458c (diff) | |
More initialism corrections (golint)
Thanks to @bep's new, brilliant helpers.Deprecated() function,
the following functions or variables are transitioned to their
new names, preserving backward compatibility for v0.14
and warning the user of upcoming obsolescence in v0.15:
* .Url → .URL (for node, menu and paginator)
* .Site.BaseUrl → .Site.BaseURL
* .Site.Indexes → .Site.Taxonomies
* .Site.Recent → .Site.Pages
* getJson → getJSON
* getCsv → getCSV
* safeHtml → safeHTML
* safeCss → safeCSS
* safeUrl → safeURL
Also fix related initialisms in strings and comments.
Continued effort in fixing #959.
Diffstat (limited to 'hugolib/pagination_test.go')
| -rw-r--r-- | hugolib/pagination_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hugolib/pagination_test.go b/hugolib/pagination_test.go index 7d3b2ae72..b41cf4c35 100644 --- a/hugolib/pagination_test.go +++ b/hugolib/pagination_test.go @@ -43,7 +43,7 @@ func TestPager(t *testing.T) { assert.Equal(t, 5, paginator.TotalPages()) first := paginatorPages[0] - assert.Equal(t, "page/1/", first.Url()) + assert.Equal(t, "page/1/", first.URL()) assert.Equal(t, first, first.First()) assert.True(t, first.HasNext()) assert.Equal(t, paginatorPages[1], first.Next()) @@ -58,7 +58,7 @@ func TestPager(t *testing.T) { assert.Equal(t, paginatorPages[1], third.Prev()) last := paginatorPages[4] - assert.Equal(t, "page/5/", last.Url()) + assert.Equal(t, "page/5/", last.URL()) assert.Equal(t, last, last.Last()) assert.False(t, last.HasNext()) assert.Nil(t, last.Next()) @@ -97,7 +97,7 @@ func TestPagerNoPages(t *testing.T) { } -func TestPaginationUrlFactory(t *testing.T) { +func TestPaginationURLFactory(t *testing.T) { viper.Set("PaginatePath", "zoo") unicode := newPaginationURLFactory("новости проекта") fooBar := newPaginationURLFactory("foo", "bar") @@ -197,12 +197,12 @@ func createTestPages(num int) Pages { for i := 0; i < num; i++ { pages[i] = &Page{ Node: Node{ - UrlPath: UrlPath{ + URLPath: URLPath{ Section: "z", - Url: fmt.Sprintf("http://base/x/y/p%d.html", num), + URL: fmt.Sprintf("http://base/x/y/p%d.html", num), }, Site: &SiteInfo{ - BaseUrl: "http://base/", + BaseURL: "http://base/", }, }, Source: Source{File: *source.NewFile(filepath.FromSlash(fmt.Sprintf("/x/y/p%d.md", num)))}, |