fix golint error and rename func for suggestion. (#1997)

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

diff --git a/integrations/change_default_branch_test.go b/integrations/change_default_branch_test.go
index d34cd176cdf41562109381df9f46904522467a70..d0825122095c69f0d0c7e657a4c18aeeb11bbbc3 100644 (file)
--- 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 c5230d022002648baac311fbcabe23a236558a84..4216a2d3ea8de02613c23f68ea732c519aa80953 100644 (file)
--- 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 10d9dc5318b344f941ef8523d0a1c32c22ae9632..24cb8f196742fb34c7d869e494ad32bee860ce57 100644 (file)
--- 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 6339b2da948ee5306e88d48ba5001df44c9c8665..43e75db30d18f401410d921315775507d74b6578 100644 (file)
--- 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 1870c55bac67f77973bcff8a011cd6cff2cb8977..459444364747a6bf4287d4dd919cbb8383b2e121 100644 (file)
--- 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 4d78ab4b98d146180e7c08d181e2573d0853f90e..b07fac3a3a72551b97bfc602ce400b57e195c04f 100644 (file)
--- 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 5ff7b4b6cb8877d1b8483c11dd79b7ac4c8aa3b6..06826a08b9373a4510d2939b31114fd8b4add3bd 100644 (file)
--- 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 f518c1bb550bac27395365b68ca0f2afebd4f302..91f682fbda2896e9921f8172e7fffdc5d77d995c 100644 (file)
--- 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 33d9960115fbb918bed0428cece9876d4602ea06..acb48bd78108fdabfcd4cd5092e6e04c27713ef6 100644 (file)
--- 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 8343cf22a6c389033d867a3a698d1369fa5fe72c..4283b862317d47f5704016aa50530f57721740f9 100644 (file)
--- 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 7aebd5dbde0ba975e20c5402ad77a384ad87c5e1..bcd5185116ea82c68f15d7100bde215fec6e1de1 100644 (file)
--- 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{