From 90f9bb12c628a167d30f6f8b4bfb80438fb675a7 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sat, 17 Jun 2017 11:29:59 -0500 Subject: [PATCH] fix golint error and rename func for suggestion. (#1997) Signed-off-by: Bo-Yi Wu --- integrations/change_default_branch_test.go | 4 ++-- integrations/delete_user_test.go | 2 +- integrations/editor_test.go | 8 ++++---- integrations/html_helper.go | 17 +++++++++++------ integrations/integration_test.go | 2 +- integrations/issue_test.go | 4 ++-- integrations/pull_compare_test.go | 2 +- integrations/pull_create_test.go | 4 ++-- integrations/pull_merge_test.go | 2 +- integrations/repo_commits_test.go | 6 +++--- integrations/repo_fork_test.go | 4 ++-- 11 files changed, 30 insertions(+), 25 deletions(-) diff --git a/integrations/change_default_branch_test.go b/integrations/change_default_branch_test.go index d34cd176cd..d082512209 100644 --- a/integrations/change_default_branch_test.go +++ b/integrations/change_default_branch_test.go @@ -25,7 +25,7 @@ func TestChangeDefaultBranch(t *testing.T) { req := NewRequest(t, "GET", branchesURL) resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) req = NewRequestWithValues(t, "POST", branchesURL, map[string]string{ "_csrf": doc.GetCSRF(), @@ -39,7 +39,7 @@ func TestChangeDefaultBranch(t *testing.T) { req = NewRequest(t, "GET", branchesURL) resp = session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc = NewHtmlParser(t, resp.Body) + doc = NewHTMLParser(t, resp.Body) req = NewRequestWithValues(t, "POST", branchesURL, map[string]string{ "_csrf": doc.GetInputValueByName("_csrf"), diff --git a/integrations/delete_user_test.go b/integrations/delete_user_test.go index c5230d0220..4216a2d3ea 100644 --- a/integrations/delete_user_test.go +++ b/integrations/delete_user_test.go @@ -22,7 +22,7 @@ func TestDeleteUser(t *testing.T) { resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) req = NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{ "_csrf": doc.GetCSRF(), }) diff --git a/integrations/editor_test.go b/integrations/editor_test.go index 10d9dc5318..24cb8f1967 100644 --- a/integrations/editor_test.go +++ b/integrations/editor_test.go @@ -22,7 +22,7 @@ func TestCreateFile(t *testing.T) { resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) lastCommit := doc.GetInputValueByName("last_commit") assert.NotEmpty(t, lastCommit) @@ -49,7 +49,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) { resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) // Change master branch to protected req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches?action=protected_branch", map[string]string{ @@ -70,7 +70,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) { resp = session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc = NewHtmlParser(t, resp.Body) + doc = NewHTMLParser(t, resp.Body) lastCommit := doc.GetInputValueByName("last_commit") assert.NotEmpty(t, lastCommit) @@ -99,7 +99,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - htmlDoc := NewHtmlParser(t, resp.Body) + htmlDoc := NewHTMLParser(t, resp.Body) lastCommit := htmlDoc.GetInputValueByName("last_commit") assert.NotEmpty(t, lastCommit) diff --git a/integrations/html_helper.go b/integrations/html_helper.go index 6339b2da94..43e75db30d 100644 --- a/integrations/html_helper.go +++ b/integrations/html_helper.go @@ -12,26 +12,31 @@ import ( "github.com/stretchr/testify/assert" ) -type HtmlDoc struct { +// HTMLDoc struct +type HTMLDoc struct { doc *goquery.Document } -func NewHtmlParser(t testing.TB, content []byte) *HtmlDoc { +// NewHTMLParser parse html file +func NewHTMLParser(t testing.TB, content []byte) *HTMLDoc { doc, err := goquery.NewDocumentFromReader(bytes.NewReader(content)) assert.NoError(t, err) - return &HtmlDoc{doc: doc} + return &HTMLDoc{doc: doc} } -func (doc *HtmlDoc) GetInputValueById(id string) string { +// GetInputValueByID for get input value by id +func (doc *HTMLDoc) GetInputValueByID(id string) string { text, _ := doc.doc.Find("#" + id).Attr("value") return text } -func (doc *HtmlDoc) GetInputValueByName(name string) string { +// GetInputValueByName for get input value by name +func (doc *HTMLDoc) GetInputValueByName(name string) string { text, _ := doc.doc.Find("input[name=\"" + name + "\"]").Attr("value") return text } -func (doc *HtmlDoc) GetCSRF() string { +// GetCSRF for get CSRC token value from input +func (doc *HTMLDoc) GetCSRF() string { return doc.GetInputValueByName("_csrf") } diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 1870c55bac..4594443647 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -167,7 +167,7 @@ func loginUserWithPassword(t testing.TB, userName, password string) *TestSession resp := MakeRequest(req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) req = NewRequestWithValues(t, "POST", "/user/login", map[string]string{ "_csrf": doc.GetCSRF(), "user_name": userName, diff --git a/integrations/issue_test.go b/integrations/issue_test.go index 4d78ab4b98..b07fac3a3a 100644 --- a/integrations/issue_test.go +++ b/integrations/issue_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" ) -func getIssuesSelection(htmlDoc *HtmlDoc) *goquery.Selection { +func getIssuesSelection(htmlDoc *HTMLDoc) *goquery.Selection { return htmlDoc.doc.Find(".issue.list").Find("li").Find(".title") } @@ -50,7 +50,7 @@ func TestNoLoginViewIssuesSortByType(t *testing.T) { resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - htmlDoc := NewHtmlParser(t, resp.Body) + htmlDoc := NewHTMLParser(t, resp.Body) issuesSelection := getIssuesSelection(htmlDoc) expectedNumIssues := models.GetCount(t, &models.Issue{RepoID: repo.ID, PosterID: user.ID}, diff --git a/integrations/pull_compare_test.go b/integrations/pull_compare_test.go index 5ff7b4b6cb..06826a08b9 100644 --- a/integrations/pull_compare_test.go +++ b/integrations/pull_compare_test.go @@ -18,7 +18,7 @@ func TestPullCompare(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo1/pulls") resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - htmlDoc := NewHtmlParser(t, resp.Body) + htmlDoc := NewHTMLParser(t, resp.Body) link, exists := htmlDoc.doc.Find(".navbar").Find(".ui.green.button").Attr("href") assert.True(t, exists, "The template has changed") diff --git a/integrations/pull_create_test.go b/integrations/pull_create_test.go index f518c1bb55..91f682fbda 100644 --- a/integrations/pull_create_test.go +++ b/integrations/pull_create_test.go @@ -18,7 +18,7 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo, branch strin assert.EqualValues(t, http.StatusOK, resp.HeaderCode) // Click the little green button to create a pull - htmlDoc := NewHtmlParser(t, resp.Body) + htmlDoc := NewHTMLParser(t, resp.Body) link, exists := htmlDoc.doc.Find("button.ui.green.small.button").Parent().Attr("href") assert.True(t, exists, "The template has changed") @@ -27,7 +27,7 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo, branch strin assert.EqualValues(t, http.StatusOK, resp.HeaderCode) // Submit the form for creating the pull - htmlDoc = NewHtmlParser(t, resp.Body) + htmlDoc = NewHTMLParser(t, resp.Body) link, exists = htmlDoc.doc.Find("form.ui.form").Attr("action") assert.True(t, exists, "The template has changed") req = NewRequestWithValues(t, "POST", link, map[string]string{ diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index 33d9960115..acb48bd781 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -19,7 +19,7 @@ func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum strin assert.EqualValues(t, http.StatusOK, resp.HeaderCode) // Click the little green button to craete a pull - htmlDoc := NewHtmlParser(t, resp.Body) + htmlDoc := NewHTMLParser(t, resp.Body) link, exists := htmlDoc.doc.Find("form.ui.form>button.ui.green.button").Parent().Attr("action") assert.True(t, exists, "The template has changed") req = NewRequestWithValues(t, "POST", link, map[string]string{ diff --git a/integrations/repo_commits_test.go b/integrations/repo_commits_test.go index 8343cf22a6..4283b86231 100644 --- a/integrations/repo_commits_test.go +++ b/integrations/repo_commits_test.go @@ -24,7 +24,7 @@ func TestRepoCommits(t *testing.T) { resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Attr("href") assert.True(t, exists) assert.NotEmpty(t, commitURL) @@ -40,7 +40,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) { resp := session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc := NewHtmlParser(t, resp.Body) + doc := NewHTMLParser(t, resp.Body) // Get first commit URL commitURL, exists := doc.doc.Find("#commits-table tbody tr td.sha a").Attr("href") assert.True(t, exists) @@ -64,7 +64,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) { resp = session.MakeRequest(t, req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) - doc = NewHtmlParser(t, resp.Body) + doc = NewHTMLParser(t, resp.Body) // Check if commit status is displayed in message column sel := doc.doc.Find("#commits-table tbody tr td.message i.commit-status") assert.Equal(t, sel.Length(), 1) diff --git a/integrations/repo_fork_test.go b/integrations/repo_fork_test.go index 7aebd5dbde..bcd5185116 100644 --- a/integrations/repo_fork_test.go +++ b/integrations/repo_fork_test.go @@ -23,7 +23,7 @@ func testRepoFork(t *testing.T, session *TestSession) *TestResponse { assert.EqualValues(t, http.StatusOK, resp.HeaderCode) // Step2: click the fork button - htmlDoc := NewHtmlParser(t, resp.Body) + htmlDoc := NewHTMLParser(t, resp.Body) link, exists := htmlDoc.doc.Find("a.ui.button[href^=\"/repo/fork/\"]").Attr("href") assert.True(t, exists, "The template has changed") req = NewRequest(t, "GET", link) @@ -31,7 +31,7 @@ func testRepoFork(t *testing.T, session *TestSession) *TestResponse { assert.EqualValues(t, http.StatusOK, resp.HeaderCode) // Step3: fill the form of the forking - htmlDoc = NewHtmlParser(t, resp.Body) + htmlDoc = NewHTMLParser(t, resp.Body) link, exists = htmlDoc.doc.Find("form.ui.form[action^=\"/repo/fork/\"]").Attr("action") assert.True(t, exists, "The template has changed") req = NewRequestWithValues(t, "POST", link, map[string]string{