Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97591d99b5
|
||
|
|
587f9a05af
|
||
|
|
b130f6e069
|
||
|
|
e74dd82211
|
||
|
|
8cfccc2722
|
||
|
|
801a314421
|
||
|
|
9565259dc1
|
||
|
|
f05a513926
|
@@ -1,40 +1,27 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
|
||||
type UserProfile struct {
|
||||
Usr *User `json:"user"`
|
||||
}
|
||||
|
||||
func InitUserProfile(usr *User) (usrProfile *UserProfile, done bool) {
|
||||
func InitUserProfile(usr *User) (usrProfile *UserProfile, err error) {
|
||||
if usr == nil {
|
||||
return nil, false
|
||||
return nil, fmt.Errof("User is empty")
|
||||
} else {
|
||||
usrProfile = new(UserProfile)
|
||||
if len(usr.Password) > 0 {
|
||||
var newUsr User
|
||||
newUsr = *usr
|
||||
newUsr.Password = ""
|
||||
newUsr := User{Id: usr.Id, PhoneNumber: usr.PhoneNumber, Username: usr.Username, Firstname: usr.Firstname, Lastname: usr.Lastname, Created: usr.Created, LastLogin: usr.LastLogin,}
|
||||
usrProfile.Usr = &newUsr
|
||||
|
||||
return usrProfile, true
|
||||
return usrProfile, nil
|
||||
} else {
|
||||
usrProfile.Usr = usr
|
||||
return usrProfile, true
|
||||
return usrProfile, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestInitUserProfile(t *testing.T) {
|
||||
usr := User{}
|
||||
usr.Username = "Bob"
|
||||
usr.PhoneNumber = "+12224572351"
|
||||
usr.Password = "TheNight!"
|
||||
profile, done := InitUserProfile(&usr)
|
||||
assert.Equal(t, done, true, "Error")
|
||||
assert.NotEmpty(t, profile, "UserProfile is empty")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestInitUserProfile(t *testing.T) {
|
||||
usr := User{Username: "Bob", PhoneNumber: "+12224572351", Password: "TheNight!"}
|
||||
|
||||
profile, err := InitUserProfile(&usr)
|
||||
|
||||
assert.NoError(t, err, "Error %v", err)
|
||||
assert.NotEmpty(t, profile, "UserProfile is empty")
|
||||
|
||||
assert.Empty(t, profile.Usr.Password, "Password should be empty")
|
||||
}
|
||||
Reference in New Issue
Block a user