update tests, remove MockRequestsClient

tests/conftest.py

@@ -3,7 +3,7 @@ from sqlalchemy.orm import sessionmaker, scoped_session
 
 from atst.app import make_app, make_deps, make_config
 from atst.database import make_db
-from tests.mocks import MockApiClient, MockFundzClient, MockRequestsClient, MockAuthzClient
+from tests.mocks import MockApiClient, MockFundzClient, MockAuthzClient
 from atst.sessions import DictSessions
 
 
@@ -11,7 +11,6 @@ from atst.sessions import DictSessions
 def app(db):
     TEST_DEPS = {
         "authz_client": MockAuthzClient("authz"),
-        "requests_client": MockRequestsClient("requests"),
         "authnid_client": MockApiClient("authnid"),
         "fundz_client": MockFundzClient("fundz"),
         "sessions": DictSessions(),

tests/handlers/test_request_new.py

@@ -3,8 +3,17 @@ import pytest
 import tornado
 import urllib
 from tests.mocks import MOCK_USER
+from tests.factories import RequestFactory
 
 ERROR_CLASS = "alert--error"
+MOCK_REQUEST = RequestFactory.create(
+    creator=MOCK_USER["id"],
+    body={
+        "financial_verification": {
+            "pe_id": "0203752A",
+        },
+    }
+)
 
 @pytest.mark.gen_test
 def test_submit_invalid_request_form(monkeypatch, http_client, base_url):

tests/mocks.py

@@ -51,31 +51,8 @@ class MockApiClient(ApiClient):
         return response
 
 
-MOCK_REQUEST = {
-    "id": "66b8ef71-86d3-48ef-abc2-51bfa1732b6b",
-    "creator": "49903ae7-da4a-49bf-a6dc-9dff5d004238",
-    "body": {
-        "financial_verification": {
-            "pe_id": "0203752A",
-        },
-    },
-    "status": "incomplete"
-}
-
-class MockRequestsClient(MockApiClient):
-
-    @tornado.gen.coroutine
-    def get(self, path, **kwargs):
-        return self._get_response("GET", path, 200, json=MOCK_REQUEST)
-
-    @tornado.gen.coroutine
-    def post(self, path, **kwargs):
-        return self._get_response("POST", path, 202, json=MOCK_REQUEST)
-
-
 MOCK_VALID_PE_ID = "8675309U"
 
-
 class MockFundzClient(MockApiClient):
 
     @tornado.gen.coroutine