diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/2a/83b349fa234131fc5db6f2a0498d3f4d3d6038 b/tests/gitea-repositories-meta/user27/template1.git/objects/2a/83b349fa234131fc5db6f2a0498d3f4d3d6038 new file mode 100644 index 000000000000..ab167ceeafed --- /dev/null +++ b/tests/gitea-repositories-meta/user27/template1.git/objects/2a/83b349fa234131fc5db6f2a0498d3f4d3d6038 @@ -0,0 +1,2 @@ +xAJ0a9\@Ij2Cw"hi޷q~{_ +c)M* rȉSD&M*lpm*5fE_P8DQCɕao?+\>f۸OHH9G"x{w;8 +is09/ IH \ No newline at end of file diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/3d/0bc64f2521cfc7ffce6c175c1c846c88eb6df7 b/tests/gitea-repositories-meta/user27/template1.git/objects/3d/0bc64f2521cfc7ffce6c175c1c846c88eb6df7 new file mode 100644 index 000000000000..4912a5a99c66 Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/3d/0bc64f2521cfc7ffce6c175c1c846c88eb6df7 differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/83/77b2196e99ac8635aae79df3db76959ccd1094 b/tests/gitea-repositories-meta/user27/template1.git/objects/83/77b2196e99ac8635aae79df3db76959ccd1094 new file mode 100644 index 000000000000..6538644ee823 Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/83/77b2196e99ac8635aae79df3db76959ccd1094 differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/99/45b93bcb5b70af06e0322bd2caa6180680991f b/tests/gitea-repositories-meta/user27/template1.git/objects/99/45b93bcb5b70af06e0322bd2caa6180680991f new file mode 100644 index 000000000000..4af172516fad Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/99/45b93bcb5b70af06e0322bd2caa6180680991f differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/af/f5b10402b4e0479d1e76bc41a42d29fe7f28fa b/tests/gitea-repositories-meta/user27/template1.git/objects/af/f5b10402b4e0479d1e76bc41a42d29fe7f28fa new file mode 100644 index 000000000000..5a80075eb12e Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/af/f5b10402b4e0479d1e76bc41a42d29fe7f28fa differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/b9/04864fd6cd0c8e9054351fd39a980bfd214229 b/tests/gitea-repositories-meta/user27/template1.git/objects/b9/04864fd6cd0c8e9054351fd39a980bfd214229 new file mode 100644 index 000000000000..b5d5d1d8dc45 Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/b9/04864fd6cd0c8e9054351fd39a980bfd214229 differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/c5/10abf4c7c3e0dc4bf07db9344c61c4e6ee7cbc b/tests/gitea-repositories-meta/user27/template1.git/objects/c5/10abf4c7c3e0dc4bf07db9344c61c4e6ee7cbc new file mode 100644 index 000000000000..d8ea1e1cd617 Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/c5/10abf4c7c3e0dc4bf07db9344c61c4e6ee7cbc differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/tests/gitea-repositories-meta/user27/template1.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 000000000000..711223894375 Binary files /dev/null and b/tests/gitea-repositories-meta/user27/template1.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ diff --git a/tests/gitea-repositories-meta/user27/template1.git/refs/heads/master b/tests/gitea-repositories-meta/user27/template1.git/refs/heads/master index 0f13243bfd64..bb42d472e53d 100644 --- a/tests/gitea-repositories-meta/user27/template1.git/refs/heads/master +++ b/tests/gitea-repositories-meta/user27/template1.git/refs/heads/master @@ -1 +1 @@ -aacbdfe9e1c4b47f60abe81849045fa4e96f1d75 +2a83b349fa234131fc5db6f2a0498d3f4d3d6038 diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index 4654fd70faa3..8ca29415825b 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -7,6 +7,7 @@ import ( "fmt" "net/http" "net/http/httptest" + "strings" "testing" "code.gitea.io/gitea/models/unittest" @@ -16,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" ) -func testRepoGenerate(t *testing.T, session *TestSession, templateOwnerName, templateRepoName, generateOwnerName, generateRepoName string) *httptest.ResponseRecorder { +func testRepoGenerate(t *testing.T, session *TestSession, templateID, templateOwnerName, templateRepoName, generateOwnerName, generateRepoName string) *httptest.ResponseRecorder { generateOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: generateOwnerName}) // Step0: check the existence of the generated repo @@ -41,16 +42,32 @@ func testRepoGenerate(t *testing.T, session *TestSession, templateOwnerName, tem _, exists = htmlDoc.doc.Find(fmt.Sprintf(".owner.dropdown .item[data-value=\"%d\"]", generateOwner.ID)).Attr("data-value") assert.True(t, exists, fmt.Sprintf("Generate owner '%s' is not present in select box", generateOwnerName)) req = NewRequestWithValues(t, "POST", link, map[string]string{ - "_csrf": htmlDoc.GetCSRF(), - "uid": fmt.Sprintf("%d", generateOwner.ID), - "repo_name": generateRepoName, - "git_content": "true", + "_csrf": htmlDoc.GetCSRF(), + "uid": fmt.Sprintf("%d", generateOwner.ID), + "repo_name": generateRepoName, + "repo_template": templateID, + "git_content": "true", }) session.MakeRequest(t, req, http.StatusSeeOther) // Step4: check the existence of the generated repo req = NewRequestf(t, "GET", "/%s/%s", generateOwnerName, generateRepoName) + session.MakeRequest(t, req, http.StatusOK) + + // Step5: check substituted values in Readme + req = NewRequestf(t, "GET", "/%s/%s/raw/branch/master/README.md", generateOwnerName, generateRepoName) + resp = session.MakeRequest(t, req, http.StatusOK) + body := fmt.Sprintf(`# %s Readme +Owner: %s +Link: /%s/%s +Clone URL: http://localhost:3003/%s/%s.git`, + generateRepoName, strings.ToUpper(generateOwnerName), generateOwnerName, generateRepoName, generateOwnerName, generateRepoName) + assert.Equal(t, body, resp.Body.String()) + + // Step6: check substituted values in substituted file path ${REPO_NAME} + req = NewRequestf(t, "GET", "/%s/%s/raw/branch/master/%s.log", generateOwnerName, generateRepoName, generateRepoName) resp = session.MakeRequest(t, req, http.StatusOK) + assert.Equal(t, generateRepoName, resp.Body.String()) return resp } @@ -58,11 +75,11 @@ func testRepoGenerate(t *testing.T, session *TestSession, templateOwnerName, tem func TestRepoGenerate(t *testing.T) { defer tests.PrepareTestEnv(t)() session := loginUser(t, "user1") - testRepoGenerate(t, session, "user27", "template1", "user1", "generated1") + testRepoGenerate(t, session, "44", "user27", "template1", "user1", "generated1") } func TestRepoGenerateToOrg(t *testing.T) { defer tests.PrepareTestEnv(t)() session := loginUser(t, "user2") - testRepoGenerate(t, session, "user27", "template1", "user2", "generated2") + testRepoGenerate(t, session, "44", "user27", "template1", "user2", "generated2") }