Include channel prefix in key in get_channel_map

Fixes #587

2 files changed, 4 insertions, 4 deletions

diff --git a/_pytest/conftest.py b/_pytest/conftest.py
index 0a770c7..87fa834 100644
--- a/_pytest/conftest.py
+++ b/_pytest/conftest.py
@@ -57,7 +57,7 @@ def team(realish_eventrouter):
 
 @pytest.fixture
 def channel_general(team):
-    return team.channels[team.get_channel_map()['general']]
+    return team.channels[team.get_channel_map()['#general']]
 
 @pytest.fixture
 def user_alice(team):
diff --git a/_pytest/test_topic_command.py b/_pytest/test_topic_command.py
index 2137c27..5224ab7 100644
--- a/_pytest/test_topic_command.py
+++ b/_pytest/test_topic_command.py
@@ -29,7 +29,7 @@ def test_parse_topic_with_delete():
 def test_parse_topic_with_channel():
     channel_name, topic = parse_topic_command('/topic #general')
 
-    assert channel_name == 'general'
+    assert channel_name == '#general'
     assert topic is None
 
 
@@ -37,14 +37,14 @@ def test_parse_topic_with_channel_and_text():
     channel_name, topic = parse_topic_command(
         '/topic #general some topic text')
 
-    assert channel_name == 'general'
+    assert channel_name == '#general'
     assert topic == 'some topic text'
 
 
 def test_parse_topic_with_channel_and_delete():
     channel_name, topic = parse_topic_command('/topic #general -delete')
 
-    assert channel_name == 'general'
+    assert channel_name == '#general'
     assert topic == ''