Merge pull request #51 from cloudblue/fix_resultset_mock_for_zero_results

Fix resultset mock for empty lists

Author: ffaraone

connect/client/testing/models/resourceset.py

@@ -91,6 +91,23 @@ def _mock_iteration(self, return_value, extra_headers):
         total = len(return_value)
         self._count = 0
 
+        if total == 0:
+            url = self._build_full_url(
+                request_kwargs['params']['limit'],
+                0,
+                request_kwargs['params'].get('search'),
+            )
+            headers = {'Content-Range': 'items 0-0/0'}
+
+            if extra_headers:
+                headers.update(extra_headers)
+            self._client.get(
+                url,
+                return_value=[],
+                headers=headers,
+            )
+            return
+
         def pages_iterator():
             for i in range(0, total, self._limit):
                 yield return_value[i:i + self._limit], i
@@ -116,6 +133,23 @@ def _mock_slicing(self, return_value, extra_headers):
         total = len(return_value)
         self._count = 0
 
+        if total == 0:
+            url = self._build_full_url(
+                request_kwargs['params']['limit'],
+                0,
+                request_kwargs['params'].get('search'),
+            )
+            headers = {'Content-Range': 'items 0-0/0'}
+
+            if extra_headers:
+                headers.update(extra_headers)
+            self._client.get(
+                url,
+                return_value=[],
+                headers=headers,
+            )
+            return
+
         def pages_iterator():
             limit = request_kwargs['params']['limit']
             offset = request_kwargs['params']['offset']

tests/async_client/test_testing.py

@@ -172,6 +172,21 @@ async def test_iterate():
         assert [item async for item in client.products.all()] == return_value
         assert client.response.headers['X-Custom-Header'] == 'value'
 
+    with AsyncConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all().mock(return_value=[])
+
+        client = AsyncConnectClient('api_key', endpoint='http://localhost')
+
+        assert [item async for item in client.products.all()] == []
+
+    with AsyncConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all().mock(return_value=[], headers={'X-Custom-Header': 'value'})
+
+        client = AsyncConnectClient('api_key', endpoint='http://localhost')
+
+        assert [item async for item in client.products.all()] == []
+        assert client.response.headers['X-Custom-Header'] == 'value'
+
     with AsyncConnectClientMocker('http://localhost') as mocker:
         mocker.products.all().mock(return_value=return_value)
 
@@ -265,6 +280,31 @@ async def test_slicing(total, start, stop):
         assert client.response.headers['X-Custom-Header'] == 'value'
 
 
+@pytest.mark.asyncio
+async def test_slicing_no_results():
+
+    with AsyncConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all()[0:3].mock(return_value=[])
+
+        client = AsyncConnectClient('api_key', endpoint='http://localhost')
+
+        assert [
+            item async for item in client.products.all()[0:3]
+        ] == []
+
+    with AsyncConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all()[0:3].mock(
+            return_value=[], headers={'X-Custom-Header': 'value'},
+        )
+
+        client = AsyncConnectClient('api_key', endpoint='http://localhost')
+
+        assert [
+            item async for item in client.products.all()[0:3]
+        ] == []
+        assert client.response.headers['X-Custom-Header'] == 'value'
+
+
 @pytest.mark.asyncio
 async def test_count():
     with AsyncConnectClientMocker('http://localhost') as mocker:

tests/client/test_testing.py

@@ -161,6 +161,21 @@ def test_iterate():
         assert list(client.products.all()) == return_value
         assert client.response.headers['X-Custom-Header'] == 'value'
 
+    with ConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all().mock(return_value=[])
+
+        client = ConnectClient('api_key', endpoint='http://localhost')
+
+        assert list(client.products.all()) == []
+
+    with ConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all().mock(return_value=[], headers={'X-Custom-Header': 'value'})
+
+        client = ConnectClient('api_key', endpoint='http://localhost')
+
+        assert list(client.products.all()) == []
+        assert client.response.headers['X-Custom-Header'] == 'value'
+
     with ConnectClientMocker('http://localhost') as mocker:
         mocker.products.all().mock(return_value=return_value)
 
@@ -267,6 +282,26 @@ def test_slicing(total, start, stop):
         assert client.response.headers['X-Custom-Header'] == 'value'
 
 
+def test_slicing_no_results():
+
+    with ConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all()[0:3].mock(return_value=[])
+
+        client = ConnectClient('api_key', endpoint='http://localhost')
+
+        assert list(client.products.all()[0:3]) == []
+
+    with ConnectClientMocker('http://localhost') as mocker:
+        mocker.products.all()[0:3].mock(
+            return_value=[], headers={'X-Custom-Header': 'value'},
+        )
+
+        client = ConnectClient('api_key', endpoint='http://localhost')
+
+        assert list(client.products.all()[0:3]) == []
+        assert client.response.headers['X-Custom-Header'] == 'value'
+
+
 def test_count():
     with ConnectClientMocker('http://localhost') as mocker:
         mocker.products.all().count(return_value=123)