mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	migrate some more "OptionalBool" to "Option[bool]" (#29479)
just some refactoring bits towards replacing **util.OptionalBool** with **optional.Option[bool]** --------- Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
This commit is contained in:
		| @@ -9,7 +9,7 @@ import ( | ||||
| 	"code.gitea.io/gitea/models/db" | ||||
| 	"code.gitea.io/gitea/models/unittest" | ||||
| 	user_model "code.gitea.io/gitea/models/user" | ||||
| 	"code.gitea.io/gitea/modules/util" | ||||
| 	"code.gitea.io/gitea/modules/optional" | ||||
|  | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
| @@ -128,14 +128,14 @@ func TestListEmails(t *testing.T) { | ||||
| 	assert.True(t, contains(func(s *user_model.SearchEmailResult) bool { return s.UID == 27 })) | ||||
|  | ||||
| 	// Must find only primary addresses (i.e. from the `user` table) | ||||
| 	opts = &user_model.SearchEmailOptions{IsPrimary: util.OptionalBoolTrue} | ||||
| 	opts = &user_model.SearchEmailOptions{IsPrimary: optional.Some(true)} | ||||
| 	emails, _, err = user_model.SearchEmails(db.DefaultContext, opts) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.True(t, contains(func(s *user_model.SearchEmailResult) bool { return s.IsPrimary })) | ||||
| 	assert.False(t, contains(func(s *user_model.SearchEmailResult) bool { return !s.IsPrimary })) | ||||
|  | ||||
| 	// Must find only inactive addresses (i.e. not validated) | ||||
| 	opts = &user_model.SearchEmailOptions{IsActivated: util.OptionalBoolFalse} | ||||
| 	opts = &user_model.SearchEmailOptions{IsActivated: optional.Some(false)} | ||||
| 	emails, _, err = user_model.SearchEmails(db.DefaultContext, opts) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.True(t, contains(func(s *user_model.SearchEmailResult) bool { return !s.IsActivated })) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user