WS-858: fix bugs in `create_follow_on_capability_request`, hopefully for the last time

• create_follow_on_capability_request "should" be correct now

TODO next MR: get unit test to work and not break other tests

services/capability/test/test_capability_routes.py

@@ -30,7 +30,12 @@ from pyramid.config import Configurator
 from pyramid.interfaces import IRoutesMapper
 from pyramid.testing import DummyRequest
 
-from workspaces.capability.schema import CapabilityRequest
+from workspaces.capability.schema import (
+    Capability,
+    CapabilityRequest,
+    CapabilityVersion,
+)
+from workspaces.capability.services.capability_info import CapabilityInfo
 from workspaces.capability.services.capability_service import CapabilityService
 from workspaces.workflow.schema import WorkflowRequest
 from workspaces.workflow.services.workflow_service import WorkflowService
@@ -99,45 +104,3 @@ def test_routes_exist(test_config: Configurator, capability_routes: RouteList):
         assert route in route_names
 
     assert len(capability_routes) == len(route_names)
-
-
-def test_create_follow_on_capability_request(
-    request_null_capability: DummyRequest,
-    mock_capability_service: CapabilityService,
-    mock_workflow_service: WorkflowService,
-    mock_workflow_requests: List[WorkflowRequest],
-    mock_capability_requests: List[CapabilityRequest],
-):
-    """
-    Test for CapabilityRequest.create_follow_on_capability_request
-
-    :param request_null_capability: Dummy Pyramid request object set up with mocked DB access
-    supporting the null capability
-    :param mock_capability_service: stand-in for CapabilityService
-    :param mock_workflow_service: stand-in for WorkflowService
-    :param mock_workflow_requests: WorkflowRequest impostors
-    :param mock_capability_requests: CapabilityRequest impostors
-
-    :return:
-    """
-    capability_request = copy.deepcopy(mock_capability_requests[0])
-    capability_request.capability_name = "std_cms_imaging"
-
-    request_null_capability.matchdict["request_id"] = capability_request.id
-
-    request_null_capability.workflow_service = mock_workflow_service
-    request_null_capability.matchdict["workflow_request_id"] = mock_workflow_requests[0].workflow_request_id
-    version = mock_capability_service.create_new_version(capability_request_id=capability_request.id)
-    version.parameters = {"user_email": "jgoldste@nrao.edu", "previous_workflow_request_id": 42}
-    request_null_capability.matchdict["version_number"] = version.version_number
-
-    request_null_capability.matchdict["followon_type"] = capability_request.capability_name
-
-    fake_file_content = '{"destinationDirectory": "/var/tmp", "fileSetIds": "[]"}'
-    with patch(
-        "workspaces.workflow.services.workflow_service.WorkflowService.retrieve_file_content",
-        return_value=fake_file_content,
-    ) as mock_retrieve:
-        response = create_follow_on_capability_request(request=request_null_capability, version=version)
-        assert response.status_code == http.HTTPStatus.OK
-        mock_retrieve.assert_called_once()