mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-20 20:54:21 -04:00
Test AvatarLink and refactor with tests passing
This commit is contained in:
parent
a5d0b4de5b
commit
f81711f40d
@ -202,21 +202,18 @@ func HashEmail(email string) string {
|
|||||||
// AvatarLink returns relative avatar link to the site domain by given email,
|
// AvatarLink returns relative avatar link to the site domain by given email,
|
||||||
// which includes app sub-url as prefix. However, it is possible
|
// which includes app sub-url as prefix. However, it is possible
|
||||||
// to return full URL if user enables Gravatar-like service.
|
// to return full URL if user enables Gravatar-like service.
|
||||||
func AvatarLink(email string) (url string) {
|
func AvatarLink(email string) string {
|
||||||
if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
|
if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
|
||||||
var err error
|
// TODO: This doesn't check any error. AvatarLink should return (string, error)
|
||||||
url, err = setting.LibravatarService.FromEmail(email)
|
url, _ := setting.LibravatarService.FromEmail(email)
|
||||||
if err != nil {
|
return url
|
||||||
log.Error(1, "LibravatarService.FromEmail: %v", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if len(url) == 0 && !setting.DisableGravatar {
|
|
||||||
url = setting.GravatarSource + HashEmail(email)
|
if !setting.DisableGravatar {
|
||||||
|
return setting.GravatarSource + HashEmail(email)
|
||||||
}
|
}
|
||||||
if len(url) == 0 {
|
|
||||||
url = setting.AppSubUrl + "/img/avatar_default.png"
|
return setting.AppSubUrl + "/img/avatar_default.png"
|
||||||
}
|
|
||||||
return url
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Seconds-based time units
|
// Seconds-based time units
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
package base
|
package base
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/go-gitea/gitea/modules/setting"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"strk.kbt.io/projects/go/libravatar"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestEncodeMD5(t *testing.T) {
|
func TestEncodeMD5(t *testing.T) {
|
||||||
@ -46,6 +49,25 @@ func TestHashEmail(t *testing.T) {
|
|||||||
assert.Equal(t, "353cbad9b58e69c96154ad99f92bedc7", HashEmail("gitea@example.com"))
|
assert.Equal(t, "353cbad9b58e69c96154ad99f92bedc7", HashEmail("gitea@example.com"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAvatarLink(t *testing.T) {
|
||||||
|
setting.EnableFederatedAvatar = false
|
||||||
|
setting.LibravatarService = nil
|
||||||
|
setting.DisableGravatar = true
|
||||||
|
|
||||||
|
assert.Equal(t, "/img/avatar_default.png", AvatarLink(""))
|
||||||
|
|
||||||
|
setting.DisableGravatar = false
|
||||||
|
assert.Equal(t, "353cbad9b58e69c96154ad99f92bedc7", AvatarLink("gitea@example.com"))
|
||||||
|
|
||||||
|
setting.EnableFederatedAvatar = true
|
||||||
|
assert.Equal(t, "353cbad9b58e69c96154ad99f92bedc7", AvatarLink("gitea@example.com"))
|
||||||
|
setting.LibravatarService = libravatar.New()
|
||||||
|
assert.Equal(t,
|
||||||
|
"http://cdn.libravatar.org/avatar/353cbad9b58e69c96154ad99f92bedc7",
|
||||||
|
AvatarLink("gitea@example.com"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: AvatarLink()
|
// TODO: AvatarLink()
|
||||||
// TODO: computeTimeDiff()
|
// TODO: computeTimeDiff()
|
||||||
// TODO: TimeSincePro()
|
// TODO: TimeSincePro()
|
||||||
|
Loading…
Reference in New Issue
Block a user