From c8d3124ddeb86093caf1b18dfaa328c3053e5b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 13 Nov 2016 14:27:10 +0100 Subject: node to page: Remove Node And misc. TODO-fixes Updates #2297 --- hugolib/menu_test.go | 66 ++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 31 deletions(-) (limited to 'hugolib/menu_test.go') diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go index 447273f0b..460440fa8 100644 --- a/hugolib/menu_test.go +++ b/hugolib/menu_test.go @@ -208,7 +208,7 @@ func doTestPageMenuWithIdentifier(t *testing.T, menuPageSources []source.ByteSou s := setupMenuTests(t, menuPageSources) - assert.Equal(t, 3, len(s.regularPages), "Not enough pages") + assert.Equal(t, 3, len(s.RegularPages), "Not enough pages") me1 := findTestMenuEntryByID(s, "m1", "i1") me2 := findTestMenuEntryByID(s, "m1", "i2") @@ -246,7 +246,7 @@ func doTestPageMenuWithDuplicateName(t *testing.T, menuPageSources []source.Byte s := setupMenuTests(t, menuPageSources) - assert.Equal(t, 3, len(s.regularPages), "Not enough pages") + assert.Equal(t, 3, len(s.RegularPages), "Not enough pages") me1 := findTestMenuEntryByName(s, "m1", "n1") me2 := findTestMenuEntryByName(s, "m1", "n2") @@ -264,13 +264,13 @@ func TestPageMenu(t *testing.T) { s := setupMenuTests(t, menuPageSources) - if len(s.regularPages) != 3 { - t.Fatalf("Posts not created, expected 3 got %d", len(s.regularPages)) + if len(s.RegularPages) != 3 { + t.Fatalf("Posts not created, expected 3 got %d", len(s.RegularPages)) } - first := s.regularPages[0] - second := s.regularPages[1] - third := s.regularPages[2] + first := s.RegularPages[0] + second := s.RegularPages[1] + third := s.RegularPages[2] pOne := findTestMenuEntryByName(s, "p_one", "One") pTwo := findTestMenuEntryByID(s, "p_two", "Two") @@ -290,6 +290,10 @@ func TestPageMenu(t *testing.T) { {"p_one", third, pTwo, false, false}, } { + if i != 4 { + continue + } + isMenuCurrent := this.page.IsMenuCurrent(this.menu, this.menuItem) hasMenuCurrent := this.page.HasMenuCurrent(this.menu, this.menuItem) @@ -358,9 +362,9 @@ Yaml Front Matter with Menu Pages`) {Name: filepath.FromSlash("sect/yaml1.md"), Content: ps1}, {Name: filepath.FromSlash("sect/yaml2.md"), Content: ps2}}) - p1 := s.regularPages[0] + p1 := s.RegularPages[0] assert.Len(t, p1.Menus(), 2, "List YAML") - p2 := s.regularPages[1] + p2 := s.RegularPages[1] assert.Len(t, p2.Menus(), 2, "Map YAML") } @@ -406,14 +410,14 @@ func doTestSectionPagesMenu(canonifyURLs bool, t *testing.T) { viper.Set("canonifyURLs", canonifyURLs) s := setupMenuTests(t, menuPageSectionsSources) - assert.Equal(t, 3, len(s.Sections)) + require.Equal(t, 3, len(s.Sections)) firstSectionPages := s.Sections["first"] - assert.Equal(t, 2, len(firstSectionPages)) + require.Equal(t, 2, len(firstSectionPages)) secondSectionPages := s.Sections["second-section"] - assert.Equal(t, 1, len(secondSectionPages)) + require.Equal(t, 1, len(secondSectionPages)) fishySectionPages := s.Sections["fish-and-chips"] - assert.Equal(t, 1, len(fishySectionPages)) + require.Equal(t, 1, len(fishySectionPages)) nodeFirst := s.getPage(KindSection, "first") require.NotNil(t, nodeFirst) @@ -426,33 +430,33 @@ func doTestSectionPagesMenu(canonifyURLs bool, t *testing.T) { secondSectionMenuEntry := findTestMenuEntryByID(s, "spm", "second-section") fishySectionMenuEntry := findTestMenuEntryByID(s, "spm", "Fish and Chips") - assert.NotNil(t, firstSectionMenuEntry) - assert.NotNil(t, secondSectionMenuEntry) - assert.NotNil(t, nodeFirst) - assert.NotNil(t, nodeSecond) - assert.NotNil(t, fishySectionMenuEntry) - assert.NotNil(t, nodeFishy) + require.NotNil(t, firstSectionMenuEntry) + require.NotNil(t, secondSectionMenuEntry) + require.NotNil(t, nodeFirst) + require.NotNil(t, nodeSecond) + require.NotNil(t, fishySectionMenuEntry) + require.NotNil(t, nodeFishy) - assert.True(t, nodeFirst.IsMenuCurrent("spm", firstSectionMenuEntry)) - assert.False(t, nodeFirst.IsMenuCurrent("spm", secondSectionMenuEntry)) - assert.False(t, nodeFirst.IsMenuCurrent("spm", fishySectionMenuEntry)) - assert.True(t, nodeFishy.IsMenuCurrent("spm", fishySectionMenuEntry)) - assert.Equal(t, "Fish and Chips", fishySectionMenuEntry.Name) + require.True(t, nodeFirst.IsMenuCurrent("spm", firstSectionMenuEntry)) + require.False(t, nodeFirst.IsMenuCurrent("spm", secondSectionMenuEntry)) + require.False(t, nodeFirst.IsMenuCurrent("spm", fishySectionMenuEntry)) + require.True(t, nodeFishy.IsMenuCurrent("spm", fishySectionMenuEntry)) + require.Equal(t, "Fish and Chips", fishySectionMenuEntry.Name) for _, p := range firstSectionPages { - assert.True(t, p.Page.HasMenuCurrent("spm", firstSectionMenuEntry)) - assert.False(t, p.Page.HasMenuCurrent("spm", secondSectionMenuEntry)) + require.True(t, p.Page.HasMenuCurrent("spm", firstSectionMenuEntry)) + require.False(t, p.Page.HasMenuCurrent("spm", secondSectionMenuEntry)) } for _, p := range secondSectionPages { - assert.False(t, p.Page.HasMenuCurrent("spm", firstSectionMenuEntry)) - assert.True(t, p.Page.HasMenuCurrent("spm", secondSectionMenuEntry)) + require.False(t, p.Page.HasMenuCurrent("spm", firstSectionMenuEntry)) + require.True(t, p.Page.HasMenuCurrent("spm", secondSectionMenuEntry)) } for _, p := range fishySectionPages { - assert.False(t, p.Page.HasMenuCurrent("spm", firstSectionMenuEntry)) - assert.False(t, p.Page.HasMenuCurrent("spm", secondSectionMenuEntry)) - assert.True(t, p.Page.HasMenuCurrent("spm", fishySectionMenuEntry)) + require.False(t, p.Page.HasMenuCurrent("spm", firstSectionMenuEntry)) + require.False(t, p.Page.HasMenuCurrent("spm", secondSectionMenuEntry)) + require.True(t, p.Page.HasMenuCurrent("spm", fishySectionMenuEntry)) } } -- cgit v1.2.3