fix TestAPIGetContentsList

Author: yp05327

models/fixtures/branch.yml

@@ -38,9 +38,9 @@
   id: 4
   repo_id: 1
   name: 'master'
-  commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
-  commit_message: 'Initial commit'
-  commit_time: 1489927679
+  commit_id: '94dc45d6ec51090b36c4d5bd5d9e6f5a70da9edf'
+  commit_message: 'add workflow'
+  commit_time: 1710312301
   pusher_id: 1
   is_deleted: false
   deleted_by_id: 0

tests/integration/api_repo_get_contents_list_test.go

@@ -22,32 +22,83 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func getExpectedContentsListResponseForContents(ref, refType, lastCommitSHA string) []*api.ContentsResponse {
-	treePath := "README.md"
-	sha := "4b4851ad51df6a7d9f25c979345979eaeb5b349f"
-	selfURL := setting.AppURL + "api/v1/repos/user2/repo1/contents/" + treePath + "?ref=" + ref
-	htmlURL := setting.AppURL + "user2/repo1/src/" + refType + "/" + ref + "/" + treePath
-	gitURL := setting.AppURL + "api/v1/repos/user2/repo1/git/blobs/" + sha
-	downloadURL := setting.AppURL + "user2/repo1/raw/" + refType + "/" + ref + "/" + treePath
-	return []*api.ContentsResponse{
-		{
-			Name:          filepath.Base(treePath),
-			Path:          treePath,
-			SHA:           sha,
-			LastCommitSHA: lastCommitSHA,
-			Type:          "file",
-			Size:          30,
-			URL:           &selfURL,
-			HTMLURL:       &htmlURL,
-			GitURL:        &gitURL,
-			DownloadURL:   &downloadURL,
-			Links: &api.FileLinksResponse{
-				Self:    &selfURL,
-				GitURL:  &gitURL,
-				HTMLURL: &htmlURL,
-			},
+type Content struct {
+	treePath      string
+	sha           string
+	contentType   string
+	ref           string
+	refType       string
+	lastCommitSHA string
+	size          int64
+}
+
+func getContent(t *testing.T, gitRepo *git.Repository, tree, sha, contentType, ref, refType, commitSHA string, size int64) *Content {
+	if commitSHA == "" {
+		var commit *git.Commit
+		var err error
+		if refType == "branch" {
+			commit, err = gitRepo.GetBranchCommit(ref)
+		} else {
+			commit, err = gitRepo.GetTagCommit(ref)
+		}
+		assert.NoError(t, err)
+		lastCommit, err := commit.GetCommitByPath(tree)
+		assert.NoError(t, err)
+		commitSHA = lastCommit.ID.String()
+	}
+	return &Content{
+		treePath:      tree,
+		sha:           sha,
+		contentType:   contentType,
+		ref:           ref,
+		refType:       refType,
+		lastCommitSHA: commitSHA,
+		size:          size,
+	}
+}
+
+func getReadmeContent(t *testing.T, gitRepo *git.Repository, ref, refType, commitSHA string) *Content {
+	return getContent(t, gitRepo, "README.md", "4b4851ad51df6a7d9f25c979345979eaeb5b349f", "file", ref, refType, commitSHA, 30)
+}
+
+func getGiteaContent(t *testing.T, gitRepo *git.Repository, ref, refType, commitSHA string) *Content {
+	return getContent(t, gitRepo, ".gitea", "b5f7dda5e39c1eef0d4da9c20b7d8322daa7add5", "dir", ref, refType, commitSHA, 0)
+}
+
+func getExpectedContentsResponseForContent(content *Content) *api.ContentsResponse {
+	selfURL := setting.AppURL + "api/v1/repos/user2/repo1/contents/" + content.treePath + "?ref=" + content.ref
+	htmlURL := setting.AppURL + "user2/repo1/src/" + content.refType + "/" + content.ref + "/" + content.treePath
+	gitURL := setting.AppURL + "api/v1/repos/user2/repo1/git/blobs/" + content.sha
+
+	resp := &api.ContentsResponse{
+		Name:          filepath.Base(content.treePath),
+		Path:          content.treePath,
+		SHA:           content.sha,
+		LastCommitSHA: content.lastCommitSHA,
+		Type:          content.contentType,
+		Size:          content.size,
+		URL:           &selfURL,
+		HTMLURL:       &htmlURL,
+		GitURL:        &gitURL,
+		Links: &api.FileLinksResponse{
+			Self:    &selfURL,
+			GitURL:  &gitURL,
+			HTMLURL: &htmlURL,
 		},
 	}
+	if content.contentType == "file" {
+		downloadURL := setting.AppURL + "user2/repo1/raw/" + content.refType + "/" + content.ref + "/" + content.treePath
+		resp.DownloadURL = &downloadURL
+	}
+	return resp
+}
+
+func getExpectedContentsListResponseForContents(contents []*Content) []*api.ContentsResponse {
+	resps := make([]*api.ContentsResponse, 0, len(contents))
+	for _, content := range contents {
+		resps = append(resps, getExpectedContentsResponseForContent(content))
+	}
+	return resps
 }
 
 func TestAPIGetContentsList(t *testing.T) {
@@ -96,9 +147,10 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	var contentsListResponse []*api.ContentsResponse
 	DecodeJSON(t, resp, &contentsListResponse)
 	assert.NotNil(t, contentsListResponse)
-	lastCommit, err := gitRepo.GetCommitByPath("README.md")
-	assert.NoError(t, err)
-	expectedContentsListResponse := getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
+	expectedContentsListResponse := getExpectedContentsListResponseForContents([]*Content{
+		getGiteaContent(t, gitRepo, ref, refType, ""),
+		getReadmeContent(t, gitRepo, ref, refType, ""),
+	})
 	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
 
 	// No ref
@@ -107,8 +159,10 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &contentsListResponse)
 	assert.NotNil(t, contentsListResponse)
-
-	expectedContentsListResponse = getExpectedContentsListResponseForContents(repo1.DefaultBranch, refType, lastCommit.ID.String())
+	expectedContentsListResponse = getExpectedContentsListResponseForContents([]*Content{
+		getGiteaContent(t, gitRepo, ref, refType, ""),
+		getReadmeContent(t, gitRepo, repo1.DefaultBranch, refType, ""),
+	})
 	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
 
 	// ref is the branch we created above in setup
@@ -118,11 +172,10 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &contentsListResponse)
 	assert.NotNil(t, contentsListResponse)
-	branchCommit, err := gitRepo.GetBranchCommit(ref)
-	assert.NoError(t, err)
-	lastCommit, err = branchCommit.GetCommitByPath("README.md")
-	assert.NoError(t, err)
-	expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
+	expectedContentsListResponse = getExpectedContentsListResponseForContents([]*Content{
+		getGiteaContent(t, gitRepo, ref, refType, ""),
+		getReadmeContent(t, gitRepo, ref, refType, ""),
+	})
 	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
 
 	// ref is the new tag we created above in setup
@@ -132,11 +185,10 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &contentsListResponse)
 	assert.NotNil(t, contentsListResponse)
-	tagCommit, err := gitRepo.GetTagCommit(ref)
-	assert.NoError(t, err)
-	lastCommit, err = tagCommit.GetCommitByPath("README.md")
-	assert.NoError(t, err)
-	expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
+	expectedContentsListResponse = getExpectedContentsListResponseForContents([]*Content{
+		getGiteaContent(t, gitRepo, ref, refType, ""),
+		getReadmeContent(t, gitRepo, ref, refType, ""),
+	})
 	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
 
 	// ref is a commit
@@ -146,7 +198,10 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &contentsListResponse)
 	assert.NotNil(t, contentsListResponse)
-	expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, commitID)
+	expectedContentsListResponse = getExpectedContentsListResponseForContents([]*Content{
+		getGiteaContent(t, gitRepo, ref, refType, commitID),
+		getReadmeContent(t, gitRepo, ref, refType, "65f1bf27bc3bf70f64657658635e66094edbcb4d"), // readme didn't changed since this commit
+	})
 	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
 
 	// Test file contents a file with a bad ref