Resolves some bad rename issues with pytest.fixture

Leah Jones · Leah Jones · commit fe0ecb0a123e · 2016-02-21T16:26:52.000-08:00
diff --git a/_pytest/conftest.py b/_pytest/conftest.py
@@ -26,13 +26,13 @@ def server(monkeypatch):
 
 
 @pytest.fixture
-def slackclient(client_server):
+def slackclient(server):
     my_slackclient = SlackClient('xoxp-1234123412341234-12341234-1234')
     return my_slackclient
 
 
 @pytest.fixture
-def channel(channel_server):
-    my_channel = Channel(channel_server, "somechannel", "C12341234", ["user"])
+def channel(server):
+    my_channel = Channel(server, "somechannel", "C12341234", ["user"])
     return my_channel
 
diff --git a/_pytest/test_server.py b/_pytest/test_server.py
@@ -6,7 +6,7 @@
 
 
 @pytest.fixture
-def login_data():
+def login_fixture():
     file_login_data = open('_pytest/data/rtm.start.json', 'r').read()
     json_login_data = json.loads(file_login_data)
     return json_login_data
@@ -16,13 +16,13 @@ def test_Server(server):
     assert type(server) == Server
 
 
-def test_Server_parse_channel_data(server, user_login_data):
-    server.parse_channel_data(user_login_data["channels"])
+def test_Server_parse_channel_data(server, login_fixture):
+    server.parse_channel_data(login_fixture["channels"])
     assert type(server.channels.find('general')) == Channel
 
 
-def test_Server_parse_user_data(server, user_login_data):
-    server.parse_user_data(user_login_data["users"])
+def test_Server_parse_user_data(server, login_fixture):
+    server.parse_user_data(login_fixture["users"])
     assert type(server.users.find('fakeuser')) == User
 
 
diff --git a/_pytest/test_slackclient.py b/_pytest/test_slackclient.py
@@ -5,14 +5,14 @@
 
 
 @pytest.fixture
-def channel_created():
+def channel_created_fixture():
     file_channel_created_data = open('_pytest/data/channel.created.json', 'r').read()
     json_channel_created_data = json.loads(file_channel_created_data)
     return json_channel_created_data
 
 
 @pytest.fixture
-def im_created():
+def im_created_fixture():
     file_channel_created_data = open('_pytest/data/im.created.json', 'r').read()
     json_channel_created_data = json.loads(file_channel_created_data)
     return json_channel_created_data
@@ -22,9 +22,9 @@ def test_SlackClient(slackclient):
     assert type(slackclient) == SlackClient
 
 
-def test_SlackClient_process_changes(slackclient, channel_created_data, im_created_data):
-    slackclient.process_changes(channel_created_data)
+def test_SlackClient_process_changes(slackclient, channel_created_fixture, im_created_fixture):
+    slackclient.process_changes(channel_created_fixture)
     assert type(slackclient.server.channels.find('fun')) == Channel
-    slackclient.process_changes(im_created_data)
+    slackclient.process_changes(im_created_fixture)
     assert type(slackclient.server.channels.find('U123BL234')) == Channel
 
diff --git a/slackclient/_slackrequest.py b/slackclient/_slackrequest.py
@@ -4,7 +4,7 @@
 class SlackRequest(object):
 
     @staticmethod
-    def do(self, token, request="?", post_data=None, domain="slack.com"):
+    def do(token, request="?", post_data=None, domain="slack.com"):
         if post_data is None:
             post_data = {}
 
