Merge 7dff42d into 8808080

sparkpost/transmissions.py

@@ -1,6 +1,7 @@
 import base64
 import copy
 import json
+import warnings
 from email.utils import parseaddr
 
 from .base import Resource
@@ -265,15 +266,18 @@ def get(self, transmission_id):
         results = self._fetch_get(transmission_id)
         return results['transmission']
 
-    def list(self):
+    def list(self, **kwargs):
         """
         Get a list of your transmissions
 
+        :param campaign_id: ID of the campaign used by the transmissions
+        :param template_id: ID of the template used by the transmissions
+
         :returns: list of transmissions
         :raises: :exc:`SparkPostAPIException` if API call fails
         """
-        results = self.request('GET', self.uri)
-        return results
+        warnings.warn('deprecated', DeprecationWarning)
+        return self.request('GET', self.uri, params=kwargs)
 
     def delete(self, transmission_id):
         """

test-requirements.txt

@@ -3,3 +3,4 @@ pytest==2.8.7
 pytest-cov==1.8.1
 requests==2.5.1
 responses==0.3.0
+mock==2.0.0

test/test_transmissions.py

@@ -2,6 +2,8 @@
 import json
 import os
 import tempfile
+import warnings
+from mock import patch
 
 import pytest
 import responses
@@ -297,7 +299,8 @@ def test_fail_get():
 
 
 @responses.activate
-def test_success_list():
+@patch.object(warnings, 'warn')
+def test_success_list(mock_warn):
     responses.add(
         responses.GET,
         'https://api.sparkpost.com/api/v1/transmissions',
@@ -307,6 +310,23 @@ def test_success_list():
     )
     sp = SparkPost('fake-key')
     response = sp.transmission.list()
+    assert mock_warn.called
+    assert response == []
+
+
+@responses.activate
+def test_success_list_with_params():
+    responses.add(
+        responses.GET,
+        'https://api.sparkpost.com/api/v1/transmissions?template_id=abcd',
+        status=200,
+        content_type='application/json',
+        body='{"results": []}',
+        match_querystring=True
+
+    )
+    sp = SparkPost('fake-key')
+    response = sp.transmission.list(template_id='abcd')
     assert response == []