Fix buggy Menu.Limit() - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 7c3dceeaedada1f4e7650864d8e23044c6129e46
DIR parent a95426d40cf74d87fab793daf1aef375243bfb89
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 6 Feb 2016 22:53:59 +0100
Fix buggy Menu.Limit()
Diffstat:
M hugolib/menu.go | 2 +-
M hugolib/menu_test.go | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
---
DIR diff --git a/hugolib/menu.go b/hugolib/menu.go
@@ -157,7 +157,7 @@ func (m Menu) Sort() {
}
func (m Menu) Limit(n int) Menu {
- if len(m) < n {
+ if len(m) > n {
return m[0:n]
}
return m
DIR diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go
@@ -480,6 +480,23 @@ func TestTaxonomyNodeMenu(t *testing.T) {
}
}
+func TestMenuLimit(t *testing.T) {
+ viper.Reset()
+ defer viper.Reset()
+
+ s := setupMenuTests(t, MENU_PAGE_SOURCES)
+ m := *s.Menus["main"]
+
+ // main menu has 4 entries
+ firstTwo := m.Limit(2)
+ assert.Equal(t, 2, len(firstTwo))
+ for i := 0; i < 2; i++ {
+ assert.Equal(t, m[i], firstTwo[i])
+ }
+ assert.Equal(t, m, m.Limit(4))
+ assert.Equal(t, m, m.Limit(5))
+}
+
func TestHomeNodeMenu(t *testing.T) {
viper.Reset()
defer viper.Reset()