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/channel_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/channel_test.go') diff --git a/app/channel_test.go b/app/channel_test.go index fa9520b52..ba5f3eb58 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -175,7 +175,7 @@ func TestJoinDefaultChannelsExperimentalDefaultChannels(t *testing.T) { th.App.JoinDefaultChannels(th.BasicTeam.Id, user, false, "") for _, channelName := range defaultChannelList { - channel, err := th.App.GetChannelByName(channelName, th.BasicTeam.Id) + channel, err := th.App.GetChannelByName(channelName, th.BasicTeam.Id, false) if err != nil { t.Errorf("Expected nil, got %s", err) -- cgit v1.2.3-1-g7c22