mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-21898 - Part 1: Generate and use an interface instead of *A… (#13840)

Просмотр исходного кода 
* Generate and use an interface instead of *App
Этот коммит содержится в:
Eli Yukelzon
2020-02-13 13:26:58 +01:00
коммит произвёл GitHub
родитель 66fc096768
Коммит 17523fa5d9
200 изменённых файлов: 4553 добавлений и 2361 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

28
app/user_test.go
Просмотреть файл

@@ -372,7 +372,7 @@ func TestUpdateUserEmail(t *testing.T) {
Username: model.NewId(),
IsBot: true,
}
_, err = th.App.Srv.Store.User().Save(&botuser)
_, err = th.App.Srv().Store.User().Save(&botuser)
assert.Nil(t, err)
newBotEmail := th.MakeEmail()
@@ -415,7 +415,7 @@ func TestUpdateUserEmail(t *testing.T) {
Username: model.NewId(),
IsBot: true,
}
_, err = th.App.Srv.Store.User().Save(&botuser)
_, err = th.App.Srv().Store.User().Save(&botuser)
assert.Nil(t, err)
newBotEmail := th.MakeEmail()
@@ -583,7 +583,7 @@ func TestCreateUserWithToken(t *testing.T) {
TOKEN_TYPE_VERIFY_EMAIL,
model.MapToJson(map[string]string{"teamId": th.BasicTeam.Id, "email": user.Email}),
)
require.Nil(t, th.App.Srv.Store.Token().Save(token))
require.Nil(t, th.App.Srv().Store.Token().Save(token))
defer th.App.DeleteToken(token)
_, err := th.App.CreateUserWithToken(&user, token)
require.NotNil(t, err, "Should fail on bad token type")
@@ -595,7 +595,7 @@ func TestCreateUserWithToken(t *testing.T) {
model.MapToJson(map[string]string{"teamId": th.BasicTeam.Id, "email": user.Email}),
)
token.CreateAt = model.GetMillis() - INVITATION_EXPIRY_TIME - 1
require.Nil(t, th.App.Srv.Store.Token().Save(token))
require.Nil(t, th.App.Srv().Store.Token().Save(token))
defer th.App.DeleteToken(token)
_, err := th.App.CreateUserWithToken(&user, token)
require.NotNil(t, err, "Should fail on expired token")
@@ -606,7 +606,7 @@ func TestCreateUserWithToken(t *testing.T) {
TOKEN_TYPE_TEAM_INVITATION,
model.MapToJson(map[string]string{"teamId": model.NewId(), "email": user.Email}),
)
require.Nil(t, th.App.Srv.Store.Token().Save(token))
require.Nil(t, th.App.Srv().Store.Token().Save(token))
defer th.App.DeleteToken(token)
_, err := th.App.CreateUserWithToken(&user, token)
require.NotNil(t, err, "Should fail on bad team id")
@@ -618,13 +618,13 @@ func TestCreateUserWithToken(t *testing.T) {
TOKEN_TYPE_TEAM_INVITATION,
model.MapToJson(map[string]string{"teamId": th.BasicTeam.Id, "email": invitationEmail}),
)
require.Nil(t, th.App.Srv.Store.Token().Save(token))
require.Nil(t, th.App.Srv().Store.Token().Save(token))
newUser, err := th.App.CreateUserWithToken(&user, token)
require.Nil(t, err, "Should add user to the team. err=%v", err)
assert.False(t, newUser.IsGuest())
require.Equal(t, invitationEmail, newUser.Email, "The user email must be the invitation one")
_, err = th.App.Srv.Store.Token().GetByToken(token.Token)
_, err = th.App.Srv().Store.Token().GetByToken(token.Token)
require.NotNil(t, err, "The token must be deleted after be used")
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newUser.Id)
@@ -638,14 +638,14 @@ func TestCreateUserWithToken(t *testing.T) {
TOKEN_TYPE_GUEST_INVITATION,
model.MapToJson(map[string]string{"teamId": th.BasicTeam.Id, "email": invitationEmail, "channels": th.BasicChannel.Id}),
)
require.Nil(t, th.App.Srv.Store.Token().Save(token))
require.Nil(t, th.App.Srv().Store.Token().Save(token))
guest := model.User{Email: strings.ToLower(model.NewId()) + "success+test@example.com", Nickname: "Darth Vader", Username: "vader" + model.NewId(), Password: "passwd1", AuthService: ""}
newGuest, err := th.App.CreateUserWithToken(&guest, token)
require.Nil(t, err, "Should add user to the team. err=%v", err)
assert.True(t, newGuest.IsGuest())
require.Equal(t, invitationEmail, newGuest.Email, "The user email must be the invitation one")
_, err = th.App.Srv.Store.Token().GetByToken(token.Token)
_, err = th.App.Srv().Store.Token().GetByToken(token.Token)
require.NotNil(t, err, "The token must be deleted after be used")
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newGuest.Id)
@@ -672,8 +672,8 @@ func TestCreateUserWithToken(t *testing.T) {
TOKEN_TYPE_GUEST_INVITATION,
model.MapToJson(map[string]string{"teamId": th.BasicTeam.Id, "email": grantedInvitationEmail, "channels": th.BasicChannel.Id}),
)
require.Nil(t, th.App.Srv.Store.Token().Save(forbiddenDomainToken))
require.Nil(t, th.App.Srv.Store.Token().Save(grantedDomainToken))
require.Nil(t, th.App.Srv().Store.Token().Save(forbiddenDomainToken))
require.Nil(t, th.App.Srv().Store.Token().Save(grantedDomainToken))
guest := model.User{
Email: strings.ToLower(model.NewId()) + "+test@example.com",
Nickname: "Darth Vader",
@@ -690,7 +690,7 @@ func TestCreateUserWithToken(t *testing.T) {
require.Nil(t, err)
assert.True(t, newGuest.IsGuest())
require.Equal(t, grantedInvitationEmail, newGuest.Email)
_, err = th.App.Srv.Store.Token().GetByToken(grantedDomainToken.Token)
_, err = th.App.Srv().Store.Token().GetByToken(grantedDomainToken.Token)
require.NotNil(t, err)
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newGuest.Id)
@@ -715,7 +715,7 @@ func TestCreateUserWithToken(t *testing.T) {
TOKEN_TYPE_GUEST_INVITATION,
model.MapToJson(map[string]string{"teamId": th.BasicTeam.Id, "email": invitationEmail, "channels": th.BasicChannel.Id}),
)
require.Nil(t, th.App.Srv.Store.Token().Save(token))
require.Nil(t, th.App.Srv().Store.Token().Save(token))
guest := model.User{
Email: strings.ToLower(model.NewId()) + "+test@example.com",
Nickname: "Darth Vader",
@@ -727,7 +727,7 @@ func TestCreateUserWithToken(t *testing.T) {
require.Nil(t, err)
assert.True(t, newGuest.IsGuest())
assert.Equal(t, invitationEmail, newGuest.Email, "The user email must be the invitation one")
_, err = th.App.Srv.Store.Token().GetByToken(token.Token)
_, err = th.App.Srv().Store.Token().GetByToken(token.Token)
require.NotNil(t, err)
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newGuest.Id)