davrot/forgejo_backup
1
0
Fork 0
mirror of https://codeberg.org/davrot/forgejo.git synced 2025-06-09 12:00:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: QoL improvements to tests (#7917)

Browse source 
- Use mock helper functions, instead of home-brew solutions.
- Disable cron jobs that are not important to be run during integration tests and might even interfere.
- Avoid sleeping unnecessary, if there's some requirement then sleep or retry until that requirement is met.
- Avoid trying to deliver webhooks that will always result in a failure.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7917
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-committed-by: Gusted <postmaster@gusted.xyz>
This commit is contained in:
Gusted 2025-05-21 15:45:56 +02:00 • committed by Gusted
parent 112ba66637
commit fa2a135f68
44 changed files with 155 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/validation/helpers_test.go
View file

@ -7,6 +7,7 @@ import (
"testing"
"forgejo.org/modules/setting"
"forgejo.org/modules/test"
"github.com/stretchr/testify/assert"
)
@ -47,7 +48,7 @@ func Test_IsValidURL(t *testing.T) {
}
func Test_IsValidExternalURL(t *testing.T) {
setting.AppURL = "https://try.gitea.io/"
defer test.MockVariableValue(&setting.AppURL, "https://code.forgejo.org/")()
cases := []struct {
description string
@ -56,7 +57,7 @@ func Test_IsValidExternalURL(t *testing.T) {
}{
{
description: "Current instance URL",
url: "https://try.gitea.io/test",
url: "https://code.forgejo.org/test",
valid: true,
},
{
@ -66,7 +67,7 @@ func Test_IsValidExternalURL(t *testing.T) {
},
{
description: "Current instance API URL",
url: "https://try.gitea.io/api/v1/user/follow",
url: "https://code.forgejo.org/api/v1/user/follow",
valid: false,
},
{
@ -89,7 +90,7 @@ func Test_IsValidExternalURL(t *testing.T) {
}
func Test_IsValidExternalTrackerURLFormat(t *testing.T) {
setting.AppURL = "https://try.gitea.io/"
defer test.MockVariableValue(&setting.AppURL, "https://code.forgejo.org/")()
cases := []struct {
description string
@ -156,7 +157,8 @@ func Test_IsValidExternalTrackerURLFormat(t *testing.T) {
}
func TestIsValidUsernameAllowDots(t *testing.T) {
setting.Service.AllowDotsInUsernames = true
defer test.MockVariableValue(&setting.Service.AllowDotsInUsernames, true)()
tests := []struct {
arg string
want bool
@ -188,10 +190,7 @@ func TestIsValidUsernameAllowDots(t *testing.T) {
}
func TestIsValidUsernameBanDots(t *testing.T) {
setting.Service.AllowDotsInUsernames = false
defer func() {
setting.Service.AllowDotsInUsernames = true
}()
defer test.MockVariableValue(&setting.Service.AllowDotsInUsernames, false)()
tests := []struct {
arg string