Fix test

lunny · lunny · commit 19d2a48efb81 · 2023-09-11T11:40:47.000+08:00
diff --git a/models/fixtures/system_setting.yml b/models/fixtures/system_setting.yml
@@ -1,14 +1,14 @@
 -
   id: 1
-  setting_key: 'disable_gravatar'
+  setting_key: 'picture.disable_gravatar'
   setting_value: 'false'
   version: 1
   created: 1653533198
   updated: 1653533198
 
 -
   id: 2
-  setting_key: 'enable_federated_avatar'
+  setting_key: 'picture.enable_federated_avatar'
   setting_value: 'false'
   version: 1
   created: 1653533198
diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go
@@ -103,11 +103,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
 	assert.EqualValues(t, []string{"readme.md"}, headCommit.Modified)
 }
 
-func enableGravatar(t *testing.T) {
-	err := system_model.SetSettingNoVersion(db.DefaultContext, system_model.KeyPictureDisableGravatar, "false")
-	assert.NoError(t, err)
+func initGravatarSource(t *testing.T) {
 	setting.GravatarSource = "https://secure.gravatar.com/avatar"
-	err = system_model.Init(db.DefaultContext)
+	err := system_model.Init(db.DefaultContext)
 	assert.NoError(t, err)
 }
 
@@ -134,7 +132,7 @@ func TestPushCommits_AvatarLink(t *testing.T) {
 		},
 	}
 
-	enableGravatar(t)
+	initGravatarSource(t)
 
 	assert.Equal(t,
 		"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon&s="+strconv.Itoa(28*setting.Avatar.RenderedSizeFactor),

Original file line number	Diff line number	Diff line change
`@@ -103,11 +103,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {`
`103`	`103`	`assert.EqualValues(t, []string{"readme.md"}, headCommit.Modified)`
`104`	`104`	`}`
`105`	`105`
`106`		`-func enableGravatar(t *testing.T) {`
`107`		`- err := system_model.SetSettingNoVersion(db.DefaultContext, system_model.KeyPictureDisableGravatar, "false")`
`108`		`- assert.NoError(t, err)`
	`106`	`+func initGravatarSource(t *testing.T) {`
`109`	`107`	`setting.GravatarSource = "https://secure.gravatar.com/avatar"`
`110`		`- err = system_model.Init(db.DefaultContext)`
	`108`	`+ err := system_model.Init(db.DefaultContext)`
`111`	`109`	`assert.NoError(t, err)`
`112`	`110`	`}`
`113`	`111`
`@@ -134,7 +132,7 @@ func TestPushCommits_AvatarLink(t *testing.T) {`
`134`	`132`	`},`
`135`	`133`	`}`
`136`	`134`
`137`		`- enableGravatar(t)`
	`135`	`+ initGravatarSource(t)`
`138`	`136`
`139`	`137`	`assert.Equal(t,`
`140`	`138`	`"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon&s="+strconv.Itoa(28*setting.Avatar.RenderedSizeFactor),`