From a5bef7ac44a688b9d4493c28210a1a3fbcb64ffe Mon Sep 17 00:00:00 2001 From: Paul Baranay Date: Mon, 29 Feb 2016 14:31:28 -0500 Subject: [PATCH 1/2] Fix channel comparison with # prefix --- slackclient/_channel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slackclient/_channel.py b/slackclient/_channel.py index ca1ede355..cc642c1d3 100644 --- a/slackclient/_channel.py +++ b/slackclient/_channel.py @@ -6,7 +6,7 @@ def __init__(self, server, name, channel_id, members=None): self.members = [] if members is None else members def __eq__(self, compare_str): - if self.name == compare_str or self.name == "#" + compare_str or self.id == compare_str: + if self.name == compare_str or "#" + self.name == compare_str or self.id == compare_str: return True else: return False From 2848d1a6fac3d9584936167542c89a6eef50c483 Mon Sep 17 00:00:00 2001 From: Jeff Ammons Date: Thu, 19 May 2016 18:18:20 -0700 Subject: [PATCH 2/2] Adding unit test to verify this fix is working --- tests/test_channel.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/test_channel.py b/tests/test_channel.py index b00926800..631919a59 100644 --- a/tests/test_channel.py +++ b/tests/test_channel.py @@ -1,11 +1,23 @@ from slackclient._channel import Channel import pytest +def mock_channel(): + ''' Returns a Channel object for testing. ''' -def test_Channel(channel): +def test_channel(channel): assert type(channel) == Channel +def test_channel_eq(channel): + channel = Channel( + 'test-server', + 'test-channel', + 'C12345678', + ) + assert channel == 'test-channel' + assert channel == '#test-channel' + assert channel == 'C12345678' + assert (channel == 'foo') is False @pytest.mark.xfail -def test_Channel_send_message(channel): +def test_channel_send_message(channel): channel.send_message('hi')