mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Refactor older tests to use testify (#33140)
Refactor checks to use assert/require Use require.Eventually for waiting in elastic and meilisearch tests Use require to exit early instead of assert
This commit is contained in:
		| @@ -11,6 +11,7 @@ import ( | ||||
| 	user_model "code.gitea.io/gitea/models/user" | ||||
|  | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"github.com/stretchr/testify/require" | ||||
| ) | ||||
|  | ||||
| func TestGetUserOpenIDs(t *testing.T) { | ||||
| @@ -34,30 +35,23 @@ func TestGetUserOpenIDs(t *testing.T) { | ||||
| func TestToggleUserOpenIDVisibility(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
| 	oids, err := user_model.GetUserOpenIDs(db.DefaultContext, int64(2)) | ||||
| 	if !assert.NoError(t, err) || !assert.Len(t, oids, 1) { | ||||
| 		return | ||||
| 	} | ||||
| 	require.NoError(t, err) | ||||
| 	require.Len(t, oids, 1) | ||||
| 	assert.True(t, oids[0].Show) | ||||
|  | ||||
| 	err = user_model.ToggleUserOpenIDVisibility(db.DefaultContext, oids[0].ID) | ||||
| 	if !assert.NoError(t, err) { | ||||
| 		return | ||||
| 	} | ||||
| 	require.NoError(t, err) | ||||
|  | ||||
| 	oids, err = user_model.GetUserOpenIDs(db.DefaultContext, int64(2)) | ||||
| 	if !assert.NoError(t, err) || !assert.Len(t, oids, 1) { | ||||
| 		return | ||||
| 	} | ||||
| 	require.NoError(t, err) | ||||
| 	require.Len(t, oids, 1) | ||||
|  | ||||
| 	assert.False(t, oids[0].Show) | ||||
| 	err = user_model.ToggleUserOpenIDVisibility(db.DefaultContext, oids[0].ID) | ||||
| 	if !assert.NoError(t, err) { | ||||
| 		return | ||||
| 	} | ||||
| 	require.NoError(t, err) | ||||
|  | ||||
| 	oids, err = user_model.GetUserOpenIDs(db.DefaultContext, int64(2)) | ||||
| 	if !assert.NoError(t, err) { | ||||
| 		return | ||||
| 	} | ||||
| 	require.NoError(t, err) | ||||
| 	if assert.Len(t, oids, 1) { | ||||
| 		assert.True(t, oids[0].Show) | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user