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

[MM-30911]: Change receiver name for (me *TestHelper) in app/slashcommands/helper_test.go to be more idiomatic. (#16387)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Haardik Dharma
2020-12-12 20:15:17 +05:30
коммит произвёл GitHub
родитель 0dee08fa31
Коммит 609c8166f2
1 изменённых файлов: 64 добавлений и 64 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

128
app/slashcommands/helper_test.go
Просмотреть файл

@@ -144,38 +144,38 @@ var userCache struct {
BasicUser2 *model.User BasicUser2 *model.User
} }
func (me *TestHelper) initBasic() *TestHelper { func (th *TestHelper) initBasic() *TestHelper {
// create users once and cache them because password hashing is slow // create users once and cache them because password hashing is slow
initBasicOnce.Do(func() { initBasicOnce.Do(func() {
me.SystemAdminUser = me.createUser() th.SystemAdminUser = th.createUser()
me.App.UpdateUserRoles(me.SystemAdminUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID, false) th.App.UpdateUserRoles(th.SystemAdminUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_ADMIN_ROLE_ID, false)
me.SystemAdminUser, _ = me.App.GetUser(me.SystemAdminUser.Id) th.SystemAdminUser, _ = th.App.GetUser(th.SystemAdminUser.Id)
userCache.SystemAdminUser = me.SystemAdminUser.DeepCopy() userCache.SystemAdminUser = th.SystemAdminUser.DeepCopy()
me.BasicUser = me.createUser() th.BasicUser = th.createUser()
me.BasicUser, _ = me.App.GetUser(me.BasicUser.Id) th.BasicUser, _ = th.App.GetUser(th.BasicUser.Id)
userCache.BasicUser = me.BasicUser.DeepCopy() userCache.BasicUser = th.BasicUser.DeepCopy()
me.BasicUser2 = me.createUser() th.BasicUser2 = th.createUser()
me.BasicUser2, _ = me.App.GetUser(me.BasicUser2.Id) th.BasicUser2, _ = th.App.GetUser(th.BasicUser2.Id)
userCache.BasicUser2 = me.BasicUser2.DeepCopy() userCache.BasicUser2 = th.BasicUser2.DeepCopy()
}) })
// restore cached users // restore cached users
me.SystemAdminUser = userCache.SystemAdminUser.DeepCopy() th.SystemAdminUser = userCache.SystemAdminUser.DeepCopy()
me.BasicUser = userCache.BasicUser.DeepCopy() th.BasicUser = userCache.BasicUser.DeepCopy()
me.BasicUser2 = userCache.BasicUser2.DeepCopy() th.BasicUser2 = userCache.BasicUser2.DeepCopy()
mainHelper.GetSQLStore().GetMaster().Insert(me.SystemAdminUser, me.BasicUser, me.BasicUser2) mainHelper.GetSQLStore().GetMaster().Insert(th.SystemAdminUser, th.BasicUser, th.BasicUser2)
me.BasicTeam = me.createTeam() th.BasicTeam = th.createTeam()
me.linkUserToTeam(me.BasicUser, me.BasicTeam) th.linkUserToTeam(th.BasicUser, th.BasicTeam)
me.linkUserToTeam(me.BasicUser2, me.BasicTeam) th.linkUserToTeam(th.BasicUser2, th.BasicTeam)
me.BasicChannel = me.CreateChannel(me.BasicTeam) th.BasicChannel = th.CreateChannel(th.BasicTeam)
me.BasicPost = me.createPost(me.BasicChannel) th.BasicPost = th.createPost(th.BasicChannel)
return me return th
} }
func (me *TestHelper) createTeam() *model.Team { func (th *TestHelper) createTeam() *model.Team {
id := model.NewId() id := model.NewId()
team := &model.Team{ team := &model.Team{
DisplayName: "dn_" + id, DisplayName: "dn_" + id,
@@ -186,7 +186,7 @@ func (me *TestHelper) createTeam() *model.Team {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
if team, err = me.App.CreateTeam(team); err != nil { if team, err = th.App.CreateTeam(team); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -196,15 +196,15 @@ func (me *TestHelper) createTeam() *model.Team {
return team return team
} }
func (me *TestHelper) createUser() *model.User { func (th *TestHelper) createUser() *model.User {
return me.createUserOrGuest(false) return th.createUserOrGuest(false)
} }
func (me *TestHelper) createGuest() *model.User { func (th *TestHelper) createGuest() *model.User {
return me.createUserOrGuest(true) return th.createUserOrGuest(true)
} }
func (me *TestHelper) createUserOrGuest(guest bool) *model.User { func (th *TestHelper) createUserOrGuest(guest bool) *model.User {
id := model.NewId() id := model.NewId()
user := &model.User{ user := &model.User{
@@ -218,14 +218,14 @@ func (me *TestHelper) createUserOrGuest(guest bool) *model.User {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
if guest { if guest {
if user, err = me.App.CreateGuest(user); err != nil { if user, err = th.App.CreateGuest(user); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
panic(err) panic(err)
} }
} else { } else {
if user, err = me.App.CreateUser(user); err != nil { if user, err = th.App.CreateUser(user); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -236,15 +236,15 @@ func (me *TestHelper) createUserOrGuest(guest bool) *model.User {
return user return user
} }
func (me *TestHelper) CreateChannel(team *model.Team) *model.Channel { func (th *TestHelper) CreateChannel(team *model.Team) *model.Channel {
return me.createChannel(team, model.CHANNEL_OPEN) return th.createChannel(team, model.CHANNEL_OPEN)
} }
func (me *TestHelper) createPrivateChannel(team *model.Team) *model.Channel { func (th *TestHelper) createPrivateChannel(team *model.Team) *model.Channel {
return me.createChannel(team, model.CHANNEL_PRIVATE) return th.createChannel(team, model.CHANNEL_PRIVATE)
} }
func (me *TestHelper) createChannel(team *model.Team, channelType string) *model.Channel { func (th *TestHelper) createChannel(team *model.Team, channelType string) *model.Channel {
id := model.NewId() id := model.NewId()
channel := &model.Channel{ channel := &model.Channel{
@@ -252,12 +252,12 @@ func (me *TestHelper) createChannel(team *model.Team, channelType string) *model
Name: "name_" + id, Name: "name_" + id,
Type: channelType, Type: channelType,
TeamId: team.Id, TeamId: team.Id,
CreatorId: me.BasicUser.Id, CreatorId: th.BasicUser.Id,
} }
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
if channel, err = me.App.CreateChannel(channel, true); err != nil { if channel, err = th.App.CreateChannel(channel, true); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -267,7 +267,7 @@ func (me *TestHelper) createChannel(team *model.Team, channelType string) *model
return channel return channel
} }
func (me *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType, userId string) *model.Channel { func (th *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType, userId string) *model.Channel {
id := model.NewId() id := model.NewId()
channel := &model.Channel{ channel := &model.Channel{
@@ -280,7 +280,7 @@ func (me *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
if channel, err = me.App.CreateChannel(channel, true); err != nil { if channel, err = th.App.CreateChannel(channel, true); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -290,11 +290,11 @@ func (me *TestHelper) createChannelWithAnotherUser(team *model.Team, channelType
return channel return channel
} }
func (me *TestHelper) createDmChannel(user *model.User) *model.Channel { func (th *TestHelper) createDmChannel(user *model.User) *model.Channel {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
var channel *model.Channel var channel *model.Channel
if channel, err = me.App.GetOrCreateDirectChannel(me.BasicUser.Id, user.Id); err != nil { if channel, err = th.App.GetOrCreateDirectChannel(th.BasicUser.Id, user.Id); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -304,11 +304,11 @@ func (me *TestHelper) createDmChannel(user *model.User) *model.Channel {
return channel return channel
} }
func (me *TestHelper) createGroupChannel(user1 *model.User, user2 *model.User) *model.Channel { func (th *TestHelper) createGroupChannel(user1 *model.User, user2 *model.User) *model.Channel {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
var channel *model.Channel var channel *model.Channel
if channel, err = me.App.CreateGroupChannel([]string{me.BasicUser.Id, user1.Id, user2.Id}, me.BasicUser.Id); err != nil { if channel, err = th.App.CreateGroupChannel([]string{th.BasicUser.Id, user1.Id, user2.Id}, th.BasicUser.Id); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -318,11 +318,11 @@ func (me *TestHelper) createGroupChannel(user1 *model.User, user2 *model.User) *
return channel return channel
} }
func (me *TestHelper) createPost(channel *model.Channel) *model.Post { func (th *TestHelper) createPost(channel *model.Channel) *model.Post {
id := model.NewId() id := model.NewId()
post := &model.Post{ post := &model.Post{
UserId: me.BasicUser.Id, UserId: th.BasicUser.Id,
ChannelId: channel.Id, ChannelId: channel.Id,
Message: "message_" + id, Message: "message_" + id,
CreateAt: model.GetMillis() - 10000, CreateAt: model.GetMillis() - 10000,
@@ -330,7 +330,7 @@ func (me *TestHelper) createPost(channel *model.Channel) *model.Post {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
var err *model.AppError var err *model.AppError
if post, err = me.App.CreatePost(post, channel, false, true); err != nil { if post, err = th.App.CreatePost(post, channel, false, true); err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
time.Sleep(time.Second) time.Sleep(time.Second)
@@ -340,10 +340,10 @@ func (me *TestHelper) createPost(channel *model.Channel) *model.Post {
return post return post
} }
func (me *TestHelper) linkUserToTeam(user *model.User, team *model.Team) { func (th *TestHelper) linkUserToTeam(user *model.User, team *model.Team) {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
err := me.App.JoinUserToTeam(team, user, "") err := th.App.JoinUserToTeam(team, user, "")
if err != nil { if err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
@@ -354,10 +354,10 @@ func (me *TestHelper) linkUserToTeam(user *model.User, team *model.Team) {
utils.EnableDebugLogForTest() utils.EnableDebugLogForTest()
} }
func (me *TestHelper) addUserToChannel(user *model.User, channel *model.Channel) *model.ChannelMember { func (th *TestHelper) addUserToChannel(user *model.User, channel *model.Channel) *model.ChannelMember {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
member, err := me.App.AddUserToChannel(user, channel) member, err := th.App.AddUserToChannel(user, channel)
if err != nil { if err != nil {
mlog.Error(err.Error()) mlog.Error(err.Error())
@@ -370,10 +370,10 @@ func (me *TestHelper) addUserToChannel(user *model.User, channel *model.Channel)
return member return member
} }
func (me *TestHelper) shutdownApp() { func (th *TestHelper) shutdownApp() {
done := make(chan bool) done := make(chan bool)
go func() { go func() {
me.Server.Shutdown() th.Server.Shutdown()
close(done) close(done)
}() }()
@@ -386,21 +386,21 @@ func (me *TestHelper) shutdownApp() {
} }
} }
func (me *TestHelper) tearDown() { func (th *TestHelper) tearDown() {
if me.IncludeCacheLayer { if th.IncludeCacheLayer {
// Clean all the caches // Clean all the caches
me.App.Srv().InvalidateAllCaches() th.App.Srv().InvalidateAllCaches()
} }
me.shutdownApp() th.shutdownApp()
if me.tempWorkspace != "" { if th.tempWorkspace != "" {
os.RemoveAll(me.tempWorkspace) os.RemoveAll(th.tempWorkspace)
} }
} }
func (me *TestHelper) removePermissionFromRole(permission string, roleName string) { func (th *TestHelper) removePermissionFromRole(permission string, roleName string) {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
role, err1 := me.App.GetRoleByName(roleName) role, err1 := th.App.GetRoleByName(roleName)
if err1 != nil { if err1 != nil {
utils.EnableDebugLogForTest() utils.EnableDebugLogForTest()
panic(err1) panic(err1)
@@ -420,7 +420,7 @@ func (me *TestHelper) removePermissionFromRole(permission string, roleName strin
role.Permissions = newPermissions role.Permissions = newPermissions
_, err2 := me.App.UpdateRole(role) _, err2 := th.App.UpdateRole(role)
if err2 != nil { if err2 != nil {
utils.EnableDebugLogForTest() utils.EnableDebugLogForTest()
panic(err2) panic(err2)
@@ -429,10 +429,10 @@ func (me *TestHelper) removePermissionFromRole(permission string, roleName strin
utils.EnableDebugLogForTest() utils.EnableDebugLogForTest()
} }
func (me *TestHelper) addPermissionToRole(permission string, roleName string) { func (th *TestHelper) addPermissionToRole(permission string, roleName string) {
utils.DisableDebugLogForTest() utils.DisableDebugLogForTest()
role, err1 := me.App.GetRoleByName(roleName) role, err1 := th.App.GetRoleByName(roleName)
if err1 != nil { if err1 != nil {
utils.EnableDebugLogForTest() utils.EnableDebugLogForTest()
panic(err1) panic(err1)
@@ -447,7 +447,7 @@ func (me *TestHelper) addPermissionToRole(permission string, roleName string) {
role.Permissions = append(role.Permissions, permission) role.Permissions = append(role.Permissions, permission)
_, err2 := me.App.UpdateRole(role) _, err2 := th.App.UpdateRole(role)
if err2 != nil { if err2 != nil {
utils.EnableDebugLogForTest() utils.EnableDebugLogForTest()
panic(err2) panic(err2)