From 5872bf9c2f9b81c7aad761d40a6970f6267f1424 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Mon, 30 Jul 2018 15:06:08 -0400 Subject: 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 --- app/import_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/import_test.go') diff --git a/app/import_test.go b/app/import_test.go index f99e100f1..a8e5a65a8 100644 --- a/app/import_test.go +++ b/app/import_test.go @@ -1898,7 +1898,7 @@ func TestImportImportChannel(t *testing.T) { th.CheckChannelsCount(t, channelCount+1) // Get the Channel and check all the fields are correct. - if channel, err := th.App.GetChannelByName(*data.Name, team.Id); err != nil { + if channel, err := th.App.GetChannelByName(*data.Name, team.Id, false); err != nil { t.Fatalf("Failed to get channel from database.") } else { assert.Equal(t, *data.Name, channel.Name) @@ -1923,7 +1923,7 @@ func TestImportImportChannel(t *testing.T) { th.CheckChannelsCount(t, channelCount) // Get the Channel and check all the fields are correct. - if channel, err := th.App.GetChannelByName(*data.Name, team.Id); err != nil { + if channel, err := th.App.GetChannelByName(*data.Name, team.Id, false); err != nil { t.Fatalf("Failed to get channel from database.") } else { assert.Equal(t, *data.Name, channel.Name) @@ -2157,7 +2157,7 @@ func TestImportImportUser(t *testing.T) { DisplayName: ptrStr("Display Name"), Type: ptrStr("O"), }, false) - channel, err := th.App.GetChannelByName(channelName, team.Id) + channel, err := th.App.GetChannelByName(channelName, team.Id, false) if err != nil { t.Fatalf("Failed to get channel from database.") } @@ -2671,7 +2671,7 @@ func TestImportImportUser(t *testing.T) { if err := th.App.ImportChannel(channelData, false); err != nil { t.Fatalf("Import should have succeeded.") } - channel, err = th.App.GetChannelByName(*channelData.Name, team.Id) + channel, err = th.App.GetChannelByName(*channelData.Name, team.Id, false) if err != nil { t.Fatalf("Failed to get channel from database: %v", err.Error()) } @@ -2755,7 +2755,7 @@ func TestImportImportPost(t *testing.T) { DisplayName: ptrStr("Display Name"), Type: ptrStr("O"), }, false) - channel, err := th.App.GetChannelByName(channelName, team.Id) + channel, err := th.App.GetChannelByName(channelName, team.Id, false) if err != nil { t.Fatalf("Failed to get channel from database.") } @@ -3959,7 +3959,7 @@ func TestImportPostAndRepliesWithAttachments(t *testing.T) { DisplayName: ptrStr("Display Name"), Type: ptrStr("O"), }, false) - _, err = th.App.GetChannelByName(channelName, team.Id) + _, err = th.App.GetChannelByName(channelName, team.Id, false) if err != nil { t.Fatalf("Failed to get channel from database.") } -- cgit v1.2.3-1-g7c22