diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-19 21:40:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-19 21:40:42 +0800 |
commit | e422342eebc18034ef586ec58f1e2fff0340091d (patch) | |
tree | 307264b46c1683915429083d54e9634ee4f2fc4d /tests | |
parent | 01214c8ada993bf5f54a4149979d140443d69410 (diff) | |
download | gitea-e422342eebc18034ef586ec58f1e2fff0340091d.tar.gz gitea-e422342eebc18034ef586ec58f1e2fff0340091d.zip |
Allow adding new files to an empty repo (#24164)
![image](https://user-images.githubusercontent.com/2114189/232561612-2bfcfd0a-fc04-47ba-965f-5d0bcea46c54.png)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/integration/empty_repo_test.go | 80 | ||||
-rw-r--r-- | tests/integration/integration_test.go | 13 | ||||
-rw-r--r-- | tests/test_utils.go | 37 |
3 files changed, 112 insertions, 18 deletions
diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go index 1a83de1292..80697c7329 100644 --- a/tests/integration/empty_repo_test.go +++ b/tests/integration/empty_repo_test.go @@ -4,12 +4,19 @@ package integration import ( + "bytes" + "io" + "mime/multipart" "net/http" "testing" + "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -17,7 +24,7 @@ import ( func TestEmptyRepo(t *testing.T) { defer tests.PrepareTestEnv(t)() - subpaths := []string{ + subPaths := []string{ "commits/master", "raw/foo", "commit/1ae57b34ccf7e18373", @@ -26,8 +33,75 @@ func TestEmptyRepo(t *testing.T) { emptyRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 5}) assert.True(t, emptyRepo.IsEmpty) owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: emptyRepo.OwnerID}) - for _, subpath := range subpaths { - req := NewRequestf(t, "GET", "/%s/%s/%s", owner.Name, emptyRepo.Name, subpath) + for _, subPath := range subPaths { + req := NewRequestf(t, "GET", "/%s/%s/%s", owner.Name, emptyRepo.Name, subPath) MakeRequest(t, req, http.StatusNotFound) } } + +func TestEmptyRepoAddFile(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + err := user_model.UpdateUserCols(db.DefaultContext, &user_model.User{ID: 30, ProhibitLogin: false}, "prohibit_login") + assert.NoError(t, err) + + session := loginUser(t, "user30") + req := NewRequest(t, "GET", "/user30/empty/_new/"+setting.Repository.DefaultBranch) + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body).Find(`input[name="commit_choice"]`) + assert.Equal(t, "", doc.AttrOr("checked", "_no_")) + req = NewRequestWithValues(t, "POST", "/user30/empty/_new/"+setting.Repository.DefaultBranch, map[string]string{ + "_csrf": GetCSRF(t, session, "/user/settings"), + "commit_choice": "direct", + "tree_path": "test-file.md", + "content": "newly-added-test-file", + }) + + resp = session.MakeRequest(t, req, http.StatusSeeOther) + redirect := test.RedirectURL(resp) + assert.Equal(t, "/user30/empty/src/branch/"+setting.Repository.DefaultBranch+"/test-file.md", redirect) + + req = NewRequest(t, "GET", redirect) + resp = session.MakeRequest(t, req, http.StatusOK) + assert.Contains(t, resp.Body.String(), "newly-added-test-file") +} + +func TestEmptyRepoUploadFile(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + err := user_model.UpdateUserCols(db.DefaultContext, &user_model.User{ID: 30, ProhibitLogin: false}, "prohibit_login") + assert.NoError(t, err) + + session := loginUser(t, "user30") + req := NewRequest(t, "GET", "/user30/empty/_new/"+setting.Repository.DefaultBranch) + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body).Find(`input[name="commit_choice"]`) + assert.Equal(t, "", doc.AttrOr("checked", "_no_")) + + body := &bytes.Buffer{} + mpForm := multipart.NewWriter(body) + _ = mpForm.WriteField("_csrf", GetCSRF(t, session, "/user/settings")) + file, _ := mpForm.CreateFormFile("file", "uploaded-file.txt") + _, _ = io.Copy(file, bytes.NewBufferString("newly-uploaded-test-file")) + _ = mpForm.Close() + + req = NewRequestWithBody(t, "POST", "/user30/empty/upload-file", body) + req.Header.Add("Content-Type", mpForm.FormDataContentType()) + resp = session.MakeRequest(t, req, http.StatusOK) + respMap := map[string]string{} + assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), &respMap)) + + req = NewRequestWithValues(t, "POST", "/user30/empty/_upload/"+setting.Repository.DefaultBranch, map[string]string{ + "_csrf": GetCSRF(t, session, "/user/settings"), + "commit_choice": "direct", + "files": respMap["uuid"], + "tree_path": "", + }) + resp = session.MakeRequest(t, req, http.StatusSeeOther) + redirect := test.RedirectURL(resp) + assert.Equal(t, "/user30/empty/src/branch/"+setting.Repository.DefaultBranch+"/", redirect) + + req = NewRequest(t, "GET", redirect) + resp = session.MakeRequest(t, req, http.StatusOK) + assert.Contains(t, resp.Body.String(), "uploaded-file.txt") +} diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 965bae576c..33a815b154 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -124,6 +124,9 @@ func TestMain(m *testing.M) { fmt.Printf("Error initializing test database: %v\n", err) os.Exit(1) } + + // FIXME: the console logger is deleted by mistake, so if there is any `log.Fatal`, developers won't see any error message. + // Instead, "No tests were found", last nonsense log is "According to the configuration, subsequent logs will not be printed to the console" exitCode := m.Run() tests.WriterCloser.Reset() @@ -366,10 +369,12 @@ const NoExpectedStatus = -1 func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *httptest.ResponseRecorder { t.Helper() recorder := httptest.NewRecorder() + if req.RemoteAddr == "" { + req.RemoteAddr = "test-mock:12345" + } c.ServeHTTP(recorder, req) if expectedStatus != NoExpectedStatus { - if !assert.EqualValues(t, expectedStatus, recorder.Code, - "Request: %s %s", req.Method, req.URL.String()) { + if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) { logUnexpectedResponse(t, recorder) } } @@ -410,8 +415,10 @@ func logUnexpectedResponse(t testing.TB, recorder *httptest.ResponseRecorder) { return } else if len(respBytes) < 500 { // if body is short, just log the whole thing - t.Log("Response:", string(respBytes)) + t.Log("Response: ", string(respBytes)) return + } else { + t.Log("Response length: ", len(respBytes)) } // log the "flash" error message, if one exists diff --git a/tests/test_utils.go b/tests/test_utils.go index 102dd3d298..b3c98427c3 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -10,7 +10,6 @@ import ( "os" "path" "path/filepath" - "runtime" "testing" "code.gitea.io/gitea/models/db" @@ -30,29 +29,44 @@ import ( "github.com/stretchr/testify/assert" ) +func exitf(format string, args ...interface{}) { + fmt.Printf(format+"\n", args...) + os.Exit(1) +} + func InitTest(requireGitea bool) { giteaRoot := base.SetupGiteaRoot() if giteaRoot == "" { - fmt.Println("Environment variable $GITEA_ROOT not set") - os.Exit(1) + exitf("Environment variable $GITEA_ROOT not set") } + setting.AppWorkPath = giteaRoot if requireGitea { giteaBinary := "gitea" - if runtime.GOOS == "windows" { + if setting.IsWindows { giteaBinary += ".exe" } setting.AppPath = path.Join(giteaRoot, giteaBinary) if _, err := os.Stat(setting.AppPath); err != nil { - fmt.Printf("Could not find gitea binary at %s\n", setting.AppPath) - os.Exit(1) + exitf("Could not find gitea binary at %s", setting.AppPath) } } giteaConf := os.Getenv("GITEA_CONF") if giteaConf == "" { - fmt.Println("Environment variable $GITEA_CONF not set") - os.Exit(1) - } else if !path.IsAbs(giteaConf) { + // By default, use sqlite.ini for testing, then IDE like GoLand can start the test process with debugger. + // It's easier for developers to debug bugs step by step with a debugger. + // Notice: when doing "ssh push", Gitea executes sub processes, debugger won't work for the sub processes. + giteaConf = "tests/sqlite.ini" + _ = os.Setenv("GITEA_CONF", giteaConf) + fmt.Printf("Environment variable $GITEA_CONF not set, use default: %s\n", giteaConf) + if !setting.EnableSQLite3 { + exitf(`Need to enable SQLite3 for sqlite.ini testing, please set: -tags "sqlite,sqlite_unlock_notify"`) + } + } + + setting.IsInTesting = true + + if !path.IsAbs(giteaConf) { setting.CustomConf = path.Join(giteaRoot, giteaConf) } else { setting.CustomConf = giteaConf @@ -69,8 +83,7 @@ func InitTest(requireGitea bool) { setting.LoadDBSetting() if err := storage.Init(); err != nil { - fmt.Printf("Init storage failed: %v", err) - os.Exit(1) + exitf("Init storage failed: %v", err) } switch { @@ -221,7 +234,7 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() { return deferFn } -// resetFixtures flushes queues, reloads fixtures and resets test repositories within a single test. +// ResetFixtures flushes queues, reloads fixtures and resets test repositories within a single test. // Most tests should call defer tests.PrepareTestEnv(t)() (or have onGiteaRun do that for them) but sometimes // within a single test this is required func ResetFixtures(t *testing.T) { |