[MM-45272] Fix MM-45272 (#24701)
* Fix MM-45272 * Properly handle permalinks * Fix * Fix tests * Handle only not found case for team member * Fix lint * Use proper config value * Separate permission in several statements * Add tests * Fix lint * Revert changes on utils * Address feedback and more fixes * Address feedback * Fix test * Fix test and related bug * Fix and reorder test * Address feedback * Address feedback --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c395ec6245
Коммит
2ff0fe343e
@@ -3795,7 +3795,7 @@ func TestPostGetInfo(t *testing.T) {
|
||||
dmPost, _, err := client.CreatePost(context.Background(), &model.Post{ChannelId: dmChannel.Id})
|
||||
require.NoError(t, err)
|
||||
|
||||
openTeam, _, err := sysadminClient.CreateTeam(context.Background(), &model.Team{Type: model.TeamOpen, Name: "open-team", DisplayName: "Open Team"})
|
||||
openTeam, _, err := sysadminClient.CreateTeam(context.Background(), &model.Team{Type: model.TeamOpen, Name: "open-team", DisplayName: "Open Team", AllowOpenInvite: true})
|
||||
require.NoError(t, err)
|
||||
openTeamOpenChannel, _, err := sysadminClient.CreateChannel(context.Background(), &model.Channel{TeamId: openTeam.Id, Type: model.ChannelTypeOpen, Name: "open-team-open-channel", DisplayName: "Open Team - Open Channel"})
|
||||
require.NoError(t, err)
|
||||
@@ -3803,7 +3803,7 @@ func TestPostGetInfo(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// Alt team is a team without the sysadmin in it.
|
||||
altOpenTeam, _, err := client.CreateTeam(context.Background(), &model.Team{Type: model.TeamOpen, Name: "alt-open-team", DisplayName: "Alt Open Team"})
|
||||
altOpenTeam, _, err := client.CreateTeam(context.Background(), &model.Team{Type: model.TeamOpen, Name: "alt-open-team", DisplayName: "Alt Open Team", AllowOpenInvite: true})
|
||||
require.NoError(t, err)
|
||||
altOpenTeamOpenChannel, _, err := client.CreateChannel(context.Background(), &model.Channel{TeamId: altOpenTeam.Id, Type: model.ChannelTypeOpen, Name: "alt-open-team-open-channel", DisplayName: "Open Team - Open Channel"})
|
||||
require.NoError(t, err)
|
||||
@@ -4008,8 +4008,12 @@ func TestPostGetInfo(t *testing.T) {
|
||||
require.Equal(t, tc.channel.DisplayName, info.ChannelDisplayName)
|
||||
require.Equal(t, tc.hasJoinedChannel, info.HasJoinedChannel)
|
||||
if tc.team != nil {
|
||||
teamType := "I"
|
||||
if tc.team.AllowOpenInvite {
|
||||
teamType = "O"
|
||||
}
|
||||
require.Equal(t, tc.team.Id, info.TeamId)
|
||||
require.Equal(t, tc.team.Type, info.TeamType)
|
||||
require.Equal(t, teamType, info.TeamType)
|
||||
require.Equal(t, tc.team.DisplayName, info.TeamDisplayName)
|
||||
require.Equal(t, tc.hasJoinedTeam, info.HasJoinedTeam)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user