Removed httmock and DummyHttpResponse (#66)

Author: bkwi

requirements.txt

@@ -1,5 +1,3 @@
-coveralls==1.1
-httmock==1.2.6
 pytest==4.6.3
 pytest-cov==2.5.0
 requests==2.25.1

tests/audiovisual_test.py

@@ -1,7 +1,7 @@
 import pytest
+import responses
 
 from filestack import AudioVisual, Filelink
-from httmock import urlmatch, HTTMock, response
 
 
 APIKEY = 'APIKEY'
@@ -15,23 +15,18 @@ def av():
     return AudioVisual(PROCESS_URL, 'someuuid', 'sometimetstamp', apikey=APIKEY)
 
 
+@responses.activate
 def test_status(av):
-
-    @urlmatch(netloc=r'process.filestackapi\.com', method='get', scheme='https')
-    def api_zip(url, request):
-        return response(200, {'url': PROCESS_URL, 'status': 'completed'}, {'content-type': 'application/json'})
-
-    with HTTMock(api_zip):
-        assert av.status == 'completed'
+    responses.add(responses.GET, 'https://process.filestackapi.com/SOMEHANDLE', json={'status': 'completed'})
+    assert av.status == 'completed'
 
 
+@responses.activate
 def test_convert(av):
-
-    @urlmatch(netloc=r'process.filestackapi\.com', method='get', scheme='https')
-    def api_zip(url, request):
-        return response(200, {'status': 'completed', 'data': {'url': URL}}, {'content-type': 'application/json'})
-
-    with HTTMock(api_zip):
-        filelink = av.to_filelink()
-        assert isinstance(filelink, Filelink)
-        assert filelink.handle == HANDLE
+    responses.add(
+        responses.GET, 'https://process.filestackapi.com/SOMEHANDLE',
+        json={'status': 'completed', 'data': {'url': URL}}
+    )
+    filelink = av.to_filelink()
+    assert isinstance(filelink, Filelink)
+    assert filelink.handle == HANDLE

tests/client_test.py

@@ -1,8 +1,9 @@
+import re
 from unittest.mock import patch, mock_open
 
 import pytest
+import responses
 from trafaret import DataError
-from httmock import urlmatch, HTTMock, response
 
 import filestack.models
 from filestack import Client, Filelink, Transformation, Security
@@ -26,13 +27,12 @@ def test_wrong_storage():
     pytest.raises(DataError, Client, **kwargs)
 
 
+@responses.activate
 def test_store_external_url(client):
-    @urlmatch(netloc=r'cdn.filestackcontent\.com', method='post', scheme='https')
-    def api_store(url, request):
-        return response(200, {'handle': HANDLE})
-
-    with HTTMock(api_store):
-        filelink = client.upload_url(url="someurl", store_params={'filename': 'something.jpg'})
+    responses.add(
+        responses.POST, 'https://cdn.filestackcontent.com/process', json={'handle': HANDLE}
+    )
+    filelink = client.upload_url(url='http://a.bc')
 
     assert isinstance(filelink, Filelink)
     assert filelink.handle == HANDLE
@@ -78,15 +78,15 @@ def test_transform_external(client):
     assert isinstance(new_transform, Transformation)
 
 
+@responses.activate
 def test_zip(client):
-    @urlmatch(netloc=r'cdn.filestackcontent\.com', method='get', scheme='https')
-    def api_zip(url, request):
-        return response(200, b'zip-bytes')
-
+    responses.add(
+        responses.GET, re.compile('https://cdn.filestackcontent.com/APIKEY/zip*'),
+        body=b'zip-bytes'
+    )
     m = mock_open()
     with patch('filestack.models.client.open', m):
-        with HTTMock(api_zip):
-            zip_size = client.zip('test.zip', ['handle1', 'handle2'])
+        zip_size = client.zip('test.zip', ['handle1', 'handle2'])
 
     assert zip_size == 9
     m().write.assert_called_once_with(b'zip-bytes')

tests/filelink_test.py

@@ -5,8 +5,7 @@
 import pytest
 import responses
 
-from httmock import urlmatch, HTTMock, response
-
+from filestack import exceptions
 from filestack import Filelink, Security
 from filestack import config
 
@@ -54,24 +53,22 @@ def test_signed_url(security_obj, expected_security_part, secure_filelink):
     assert expected_security_part in secure_filelink.signed_url(security=security_obj)
 
 
+@responses.activate
 def test_get_content(filelink):
-    @urlmatch(netloc=r'cdn.filestackcontent\.com', method='get', scheme='https')
-    def api_download(url, request):
-        return response(200, b'SOMEBYTESCONTENT')
-
-    with HTTMock(api_download):
-        content = filelink.get_content()
-
-    assert content == b'SOMEBYTESCONTENT'
+    responses.add(
+        responses.GET, 'https://cdn.filestackcontent.com/{}'.format(HANDLE), body=b'file-content'
+    )
+    content = filelink.get_content()
+    assert content == b'file-content'
 
 
+@responses.activate
 def test_bad_call(filelink):
-    @urlmatch(netloc=r'cdn.filestackcontent\.com', method='get', scheme='https')
-    def api_bad(url, request):
-        return response(400, b'SOMEBYTESCONTENT')
-
-    with HTTMock(api_bad):
-        pytest.raises(Exception, filelink.get_content)
+    responses.add(
+        responses.GET, 'https://cdn.filestackcontent.com/{}'.format(HANDLE), status=400
+    )
+    with pytest.raises(exceptions.FilestackHTTPError):
+        filelink.get_content()
 
 
 @pytest.mark.parametrize('attributes, security, expected_params', [

tests/helpers.py

@@ -1,10 +1,10 @@
-from unittest.mock import patch
+import re
 
 import pytest
+import responses
 
 from filestack import Transformation, AudioVisual
 from filestack import config
-from tests.helpers import DummyHttpResponse
 
 APIKEY = 'SOMEAPIKEY'
 HANDLE = 'SOMEHANDLE'
@@ -306,24 +306,28 @@ def test_no_metadata(transform):
     assert no_metadata.url == target_url
 
 
-@patch('filestack.mixins.common.requests.post')
-def test_chain_tasks_and_store(post_mock, transform):
-    post_mock.return_value = DummyHttpResponse(json_dict={'handle': HANDLE})
+@responses.activate
+def test_chain_tasks_and_store(transform):
+    responses.add(
+        responses.POST, re.compile('https://cdn.filestackcontent.com/SOMEAPIKEY*'),
+        json={'handle': HANDLE}
+    )
     transform_obj = transform.flip().resize(width=100)
     new_filelink = transform_obj.store(filename='filename', location='S3', container='bucket', path='folder/image.jpg')
     assert new_filelink.handle == HANDLE
-    post_mock.assert_called_once_with(
-        '{}/{}/flip/resize=width:100/store=container:bucket,filename:filename,location:S3,path:"folder/image.jpg"/{}'.format(
-            config.CDN_URL, APIKEY, EXTERNAL_URL
-        )
+    assert responses.calls[0].request.url == (
+        '{}/{}/flip/resize=width:100/store=container:bucket,'.format(config.CDN_URL, APIKEY) +
+        'filename:filename,location:S3,path:%22folder/image.jpg%22/{}'.format(EXTERNAL_URL)
     )
 
 
-@patch('filestack.mixins.imagetransformation.utils.requests.get')
-def test_av_convert(post_mock, transform):
-    post_mock.return_value = DummyHttpResponse(json_dict={
-        'url': transform.url, 'uuid': 'someuuid', 'timestamp': 'sometimestamp'
-    })
+@responses.activate
+def test_av_convert(transform):
+    responses.add(
+        responses.GET,
+        'https://cdn.filestackcontent.com/SOMEAPIKEY/video_convert=height:500,width:500/SOMEEXTERNALURL',
+        json={'url': transform.url, 'uuid': 'someuuid', 'timestamp': 'sometimestamp'}
+    )
     new_av = transform.av_convert(width=500, height=500)
     assert isinstance(new_av, AudioVisual)
     assert new_av.uuid == 'someuuid'