diff --git a/src/integration-test/java/org/openlmis/auth/ExposedMessageSourceIntegrationTest.java b/src/integration-test/java/org/openlmis/auth/ExposedMessageSourceIntegrationTest.java index 5ea2d1a..c53665b 100644 --- a/src/integration-test/java/org/openlmis/auth/ExposedMessageSourceIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/auth/ExposedMessageSourceIntegrationTest.java @@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true") public class ExposedMessageSourceIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/auth/repository/BaseCrudRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/auth/repository/BaseCrudRepositoryIntegrationTest.java index ab7d2b7..0f7ad29 100644 --- a/src/integration-test/java/org/openlmis/auth/repository/BaseCrudRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/auth/repository/BaseCrudRepositoryIntegrationTest.java @@ -30,7 +30,7 @@ @RunWith(SpringRunner.class) @SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true") -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @Transactional public abstract class BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/auth/web/BaseWebIntegrationTest.java b/src/integration-test/java/org/openlmis/auth/web/BaseWebIntegrationTest.java index 6cefbbf..7de91db 100644 --- a/src/integration-test/java/org/openlmis/auth/web/BaseWebIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/auth/web/BaseWebIntegrationTest.java @@ -68,7 +68,7 @@ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "spring.main.allow-bean-definition-overriding=true") -@ActiveProfiles("test") +@ActiveProfiles({"test", "test-run"}) @DirtiesContext public abstract class BaseWebIntegrationTest { private static final String BASE_URL = System.getenv("BASE_URL"); diff --git a/src/main/java/org/openlmis/auth/TestDataInitializer.java b/src/main/java/org/openlmis/auth/TestDataInitializer.java index 74c1cd9..8d0e0bf 100644 --- a/src/main/java/org/openlmis/auth/TestDataInitializer.java +++ b/src/main/java/org/openlmis/auth/TestDataInitializer.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; @Component -@Profile("demo-data") +@Profile("demo-data & !test-run") @Order(5) public class TestDataInitializer implements CommandLineRunner {