loading up the forgejo repo on tangled to test page performance
Merge pull request '[BUG] Reflect Cargo index state in settings' (#2698) from gusted/forgejo-cargo-index into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2698
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+86
-9
+1
options/locale/locale_en-US.ini
+1
options/locale/locale_en-US.ini
···
3572
3572
owner.settings.cargo.rebuild.description = Rebuilding can be useful if the index is not synchronized with the stored Cargo packages.
3573
3573
owner.settings.cargo.rebuild.error = Failed to rebuild Cargo index: %v
3574
3574
owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild.
3575
+
owner.settings.cargo.rebuild.no_index = Cannot rebuild, no index is initialized.
3575
3576
owner.settings.cleanuprules.title = Manage cleanup rules
3576
3577
owner.settings.cleanuprules.add = Add cleanup rule
3577
3578
owner.settings.cleanuprules.edit = Edit cleanup rule
+2
-2
services/packages/cargo/index.go
+2
-2
services/packages/cargo/index.go
···
62
62
}
63
63
64
64
func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {
65
-
repo, err := getOrCreateIndexRepository(ctx, doer, owner)
65
+
repo, err := repo_model.GetRepositoryByOwnerAndName(ctx, owner.Name, IndexRepositoryName)
66
66
if err != nil {
67
-
return err
67
+
return fmt.Errorf("GetRepositoryByOwnerAndName: %w", err)
68
68
}
69
69
70
70
ps, err := packages_model.GetPackagesByType(ctx, owner.ID, packages_model.TypeCargo)
+60
tests/integration/api_packages_cargo_test.go
+60
tests/integration/api_packages_cargo_test.go
···
23
23
cargo_module "code.gitea.io/gitea/modules/packages/cargo"
24
24
"code.gitea.io/gitea/modules/setting"
25
25
cargo_router "code.gitea.io/gitea/routers/api/packages/cargo"
26
+
gitea_context "code.gitea.io/gitea/services/context"
26
27
cargo_service "code.gitea.io/gitea/services/packages/cargo"
27
28
"code.gitea.io/gitea/tests"
28
29
···
385
386
assert.Equal(t, user.DisplayName(), owners.Users[0].Name)
386
387
})
387
388
}
389
+
390
+
func TestRebuildCargo(t *testing.T) {
391
+
onGiteaRun(t, func(t *testing.T, u *neturl.URL) {
392
+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
393
+
session := loginUser(t, user.Name)
394
+
unittest.AssertExistsIf(t, false, &repo_model.Repository{OwnerID: user.ID, Name: cargo_service.IndexRepositoryName})
395
+
396
+
t.Run("No index", func(t *testing.T) {
397
+
defer tests.PrintCurrentTest(t)()
398
+
399
+
req := NewRequestWithValues(t, "POST", "/user/settings/packages/cargo/rebuild", map[string]string{
400
+
"_csrf": GetCSRF(t, session, "/user/settings/packages"),
401
+
})
402
+
session.MakeRequest(t, req, http.StatusSeeOther)
403
+
404
+
flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
405
+
assert.NotNil(t, flashCookie)
406
+
assert.EqualValues(t, "error%3DCannot%2Brebuild%252C%2Bno%2Bindex%2Bis%2Binitialized.", flashCookie.Value)
407
+
unittest.AssertExistsIf(t, false, &repo_model.Repository{OwnerID: user.ID, Name: cargo_service.IndexRepositoryName})
408
+
})
409
+
410
+
t.Run("Initialize Cargo", func(t *testing.T) {
411
+
defer tests.PrintCurrentTest(t)()
412
+
413
+
req := NewRequest(t, "GET", "/user/settings/packages")
414
+
resp := session.MakeRequest(t, req, http.StatusOK)
415
+
htmlDoc := NewHTMLParser(t, resp.Body)
416
+
417
+
htmlDoc.AssertElement(t, `form[action="/user/settings/packages/cargo/rebuild"]`, false)
418
+
htmlDoc.AssertElement(t, `form[action="/user/settings/packages/cargo/initialize"]`, true)
419
+
420
+
req = NewRequestWithValues(t, "POST", "/user/settings/packages/cargo/initialize", map[string]string{
421
+
"_csrf": htmlDoc.GetCSRF(),
422
+
})
423
+
session.MakeRequest(t, req, http.StatusSeeOther)
424
+
unittest.AssertExistsIf(t, true, &repo_model.Repository{OwnerID: user.ID, Name: cargo_service.IndexRepositoryName})
425
+
426
+
req = NewRequest(t, "GET", "/user/settings/packages")
427
+
resp = session.MakeRequest(t, req, http.StatusOK)
428
+
htmlDoc = NewHTMLParser(t, resp.Body)
429
+
430
+
htmlDoc.AssertElement(t, `form[action="/user/settings/packages/cargo/rebuild"]`, true)
431
+
htmlDoc.AssertElement(t, `form[action="/user/settings/packages/cargo/initialize"]`, false)
432
+
})
433
+
434
+
t.Run("With index", func(t *testing.T) {
435
+
defer tests.PrintCurrentTest(t)()
436
+
437
+
req := NewRequestWithValues(t, "POST", "/user/settings/packages/cargo/rebuild", map[string]string{
438
+
"_csrf": GetCSRF(t, session, "/user/settings/packages"),
439
+
})
440
+
session.MakeRequest(t, req, http.StatusSeeOther)
441
+
442
+
flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
443
+
assert.NotNil(t, flashCookie)
444
+
assert.EqualValues(t, "success%3DThe%2BCargo%2Bindex%2Bwas%2Bsuccessfully%2Brebuild.", flashCookie.Value)
445
+
})
446
+
})
447
+
}