[CHA-1300] Update channel type instead of relying on FF (#355)

* Update channel type

* Sleep

* Sleep less

* less sleep

* Cleanup

* Back to 500 ms

* Using specific channel type

* Lets try this

* Added comment

Author: javierdfm

channel_test.go

@@ -948,8 +948,9 @@ func ExampleChannel_Query() {
 // amount of messages sent when the CountMessages feature is enabled (default behaviour).
 func TestChannel_MessageCount_DefaultEnabled(t *testing.T) {
 	c := initClient(t)
-	ch := initChannel(t, c)
 	ctx := context.Background()
+	// team channel type has CountMessages enabled by default
+	ch := initChannel(t, c)
 
 	// Send a single message to the channel
 	user := randomUser(t, c)
@@ -968,7 +969,7 @@ func TestChannel_MessageCount_DefaultEnabled(t *testing.T) {
 // CountMessages feature is disabled via config_override.
 func TestChannel_MessageCount_Disabled(t *testing.T) {
 	c := initClient(t)
-	ch := initChannel(t, c)
+	ch := initChannelWithType(t, c, "messaging")
 	ctx := context.Background()
 
 	// Disable the count_messages feature for this channel via partial update

client_test.go

@@ -20,12 +20,16 @@ func initClient(t *testing.T) *Client {
 }
 
 func initChannel(t *testing.T, c *Client, membersID ...string) *Channel {
+	return initChannelWithType(t, c, "team", membersID...)
+}
+
+func initChannelWithType(t *testing.T, c *Client, channelType string, membersID ...string) *Channel {
 	t.Helper()
 
 	owner := randomUser(t, c)
 	ctx := context.Background()
 
-	resp, err := c.CreateChannelWithMembers(ctx, "team", randomString(12), owner.ID, membersID...)
+	resp, err := c.CreateChannelWithMembers(ctx, channelType, randomString(12), owner.ID, membersID...)
 	require.NoError(t, err, "create channel")
 
 	t.Cleanup(func() {