refactor e2e tests, move random_refs and api_client out

hjwp · hjwp · commit 0cff3fcb4035 · 2020-01-03T19:02:46.000Z
diff --git a/tests/e2e/api_client.py b/tests/e2e/api_client.py
@@ -0,0 +1,21 @@
+import requests
+from allocation import config
+
+
+def post_to_add_batch(ref, sku, qty, eta):
+    url = config.get_api_url()
+    r = requests.post(
+        f'{url}/add_batch',
+        json={'ref': ref, 'sku': sku, 'qty': qty, 'eta': eta}
+    )
+    assert r.status_code == 201
+
+
+def post_to_allocate(orderid, sku, qty, expect_success=True):
+    url = config.get_api_url()
+    r = requests.post(f'{url}/allocate', json={
+        'orderid': orderid, 'sku': sku, 'qty': qty,
+    })
+    if expect_success:
+        assert r.status_code == 201
+    return r
diff --git a/tests/e2e/test_api.py b/tests/e2e/test_api.py
@@ -1,41 +1,30 @@
-import uuid
 import pytest
-import requests
-
-from allocation import config
-from ..random_refs import random_sku, random_batchref, random_orderid
-
-
-def post_to_add_batch(ref, sku, qty, eta):
-    url = config.get_api_url()
-    r = requests.post(
-        f'{url}/add_batch',
-        json={'ref': ref, 'sku': sku, 'qty': qty, 'eta': eta}
-    )
-    assert r.status_code == 201
+from ..random_refs import random_batchref, random_orderid, random_sku
+from . import api_client
 
 
 @pytest.mark.usefixtures('postgres_db')
 @pytest.mark.usefixtures('restart_api')
 def test_happy_path_returns_201_and_allocated_batch():
     sku, othersku = random_sku(), random_sku('other')
     batch1, batch2, batch3 = random_batchref(1), random_batchref(2), random_batchref(3)
-    post_to_add_batch(batch1, sku, 100, '2011-01-02')
-    post_to_add_batch(batch2, sku, 100, '2011-01-01')
-    post_to_add_batch(batch3, othersku, 100, None)
-    data = {'orderid': random_orderid(), 'sku': sku, 'qty': 3}
-    url = config.get_api_url()
-    r = requests.post(f'{url}/allocate', json=data)
-    assert r.status_code == 201
-    assert r.json()['batchref'] == batch2
+    api_client.post_to_add_batch(batch1, sku, 100, '2011-01-02')
+    api_client.post_to_add_batch(batch2, sku, 100, '2011-01-01')
+    api_client.post_to_add_batch(batch3, othersku, 100, None)
+
+    response = api_client.post_to_allocate(random_orderid(), sku, qty=3)
+
+    assert response.json()['batchref'] == batch2
 
 
 @pytest.mark.usefixtures('postgres_db')
 @pytest.mark.usefixtures('restart_api')
 def test_unhappy_path_returns_400_and_error_message():
     unknown_sku, orderid = random_sku(), random_orderid()
-    data = {'orderid': orderid, 'sku': unknown_sku, 'qty': 20}
-    url = config.get_api_url()
-    r = requests.post(f'{url}/allocate', json=data)
-    assert r.status_code == 400
-    assert r.json()['message'] == f'Invalid sku {unknown_sku}'
+
+    response = api_client.post_to_allocate(
+        orderid, unknown_sku, qty=20, expect_success=False,
+    )
+
+    assert response.status_code == 400
+    assert response.json()['message'] == f'Invalid sku {unknown_sku}'
