Pr 9039 (#9187)
* MM-11065: Allow to search and get archived channels from the API * Fixing more tests * Add some unit tests * Add includeDeleted parameter to session permissions check function * More test fixing * Adding archive channels list in channels search * Add restriction for archived channel edition * Reverting permissions checks modification * Changed the query parameter to include_deleted * Enable search archive channels as true by default * Adding tests for verify search on deleted channels * Allowing to override archive channels during the imports * Fixed test * Search in archive channels from the API must be explicitly requested * Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam * Back to ViewArchivedChannels config * Fixing tests * Reverting GetChannelByName parameter * Add include deleted parameter on GetChannel functions in plugins api * Fixing tests
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
65cd447a61
Коммит
5872bf9c2f
@@ -867,7 +867,7 @@ func TestDeleteChannel(t *testing.T) {
|
||||
CheckNoError(t, resp)
|
||||
|
||||
// default channel cannot be deleted.
|
||||
defaultChannel, _ := th.App.GetChannelByName(model.DEFAULT_CHANNEL, team.Id)
|
||||
defaultChannel, _ := th.App.GetChannelByName(model.DEFAULT_CHANNEL, team.Id, false)
|
||||
pass, resp = Client.DeleteChannel(defaultChannel.Id)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
|
||||
@@ -998,7 +998,7 @@ func TestConvertChannelToPrivate(t *testing.T) {
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
|
||||
defaultChannel, _ := th.App.GetChannelByName(model.DEFAULT_CHANNEL, th.BasicTeam.Id)
|
||||
defaultChannel, _ := th.App.GetChannelByName(model.DEFAULT_CHANNEL, th.BasicTeam.Id, false)
|
||||
_, resp := Client.ConvertChannelToPrivate(defaultChannel.Id)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
@@ -1115,6 +1115,16 @@ func TestGetChannelByName(t *testing.T) {
|
||||
_, resp = Client.GetChannelByName(strings.ToUpper(th.BasicPrivateChannel.Name), th.BasicTeam.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
_, resp = Client.GetChannelByName(th.BasicDeletedChannel.Name, th.BasicTeam.Id, "")
|
||||
CheckNotFoundStatus(t, resp)
|
||||
|
||||
channel, resp = Client.GetChannelByNameIncludeDeleted(th.BasicDeletedChannel.Name, th.BasicTeam.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
if channel.Name != th.BasicDeletedChannel.Name {
|
||||
t.Fatal("names did not match")
|
||||
}
|
||||
|
||||
Client.RemoveUserFromChannel(th.BasicChannel.Id, th.BasicUser.Id)
|
||||
_, resp = Client.GetChannelByName(th.BasicChannel.Name, th.BasicTeam.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
@@ -1157,6 +1167,16 @@ func TestGetChannelByNameForTeamName(t *testing.T) {
|
||||
_, resp = Client.GetChannelByNameForTeamName(th.BasicChannel.Name, th.BasicTeam.Name, "")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
_, resp = Client.GetChannelByNameForTeamName(th.BasicDeletedChannel.Name, th.BasicTeam.Name, "")
|
||||
CheckNotFoundStatus(t, resp)
|
||||
|
||||
channel, resp = Client.GetChannelByNameForTeamNameIncludeDeleted(th.BasicDeletedChannel.Name, th.BasicTeam.Name, "")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
if channel.Name != th.BasicDeletedChannel.Name {
|
||||
t.Fatal("names did not match")
|
||||
}
|
||||
|
||||
_, resp = Client.GetChannelByNameForTeamName(th.BasicChannel.Name, model.NewRandomString(15), "")
|
||||
CheckNotFoundStatus(t, resp)
|
||||
|
||||
@@ -1330,8 +1350,8 @@ func TestGetChannelMembersForUser(t *testing.T) {
|
||||
members, resp := Client.GetChannelMembersForUser(th.BasicUser.Id, th.BasicTeam.Id, "")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
if len(*members) != 5 {
|
||||
t.Fatal("should have 5 members on team")
|
||||
if len(*members) != 6 {
|
||||
t.Fatal("should have 6 members on team")
|
||||
}
|
||||
|
||||
_, resp = Client.GetChannelMembersForUser("", th.BasicTeam.Id, "")
|
||||
|
||||
Ссылка в новой задаче
Block a user