resolve conflicts

DataBiosphere · Sep 10, 2024 · 6e30645 · 6e30645
1 parent fcac6f9
commit 6e30645
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/service/src/test/java/bio/terra/pipelines/dependencies/rawls/RawlsServiceTest.java b/service/src/test/java/bio/terra/pipelines/dependencies/rawls/RawlsServiceTest.java
@@ -230,7 +230,7 @@ void getDataTableEntity() throws Exception {
     when(entitiesApi.getEntity(any(), any(), any(), any(), any(), any()))
         .thenReturn(expectedResponse);
 
-    rawlsService = spy(new RawlsService(rawlsClient, template));
+    rawlsService = spy(new RawlsService(rawlsClient, template, objectMapper));
 
     doReturn(entitiesApi).when(rawlsClient).getEntitiesApi(any());