Merge branch 'develop' into 9507-show-linked-collections

IQSS · Oct 11, 2023 · 27e01f0 · 27e01f0
2 parents 617f36c + fa04074
commit 27e01f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/doc/sphinx-guides/source/developers/testing.rst b/doc/sphinx-guides/source/developers/testing.rst
@@ -316,7 +316,7 @@ Please make sure to:
    .. code:: java
 
        /** A very minimal example for a Testcontainers integration test class. */
-       @Testcontainers
+       @Testcontainers(disabledWithoutDocker = true)
        @Tag(edu.harvard.iq.dataverse.util.testing.Tags.INTEGRATION_TEST)
        @Tag(edu.harvard.iq.dataverse.util.testing.Tags.USES_TESTCONTAINERS)
        class MyExampleIT { /* ... */ }

diff --git a/...iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java b/...iq/dataverse/authorization/providers/oauth2/oidc/OIDCAuthenticationProviderFactoryIT.java
@@ -54,7 +54,7 @@
 
 @Tag(Tags.INTEGRATION_TEST)
 @Tag(Tags.USES_TESTCONTAINERS)
-@Testcontainers
+@Testcontainers(disabledWithoutDocker = true)
 @ExtendWith(MockitoExtension.class)
 // NOTE: order is important here - Testcontainers must be first, otherwise it's not ready when we call getAuthUrl()
 @LocalJvmSettings