Merge pull request #53 from eyakauleva/45

integration tests fix
eyakauleva · Jun 6, 2023 · 04c906e · 04c906e
2 parents db47ac4 + f9bef3f
commit 04c906e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/test/java/com/solvd/micro9/users/integration/elastic/ElasticsearchITConfig.java b/src/test/java/com/solvd/micro9/users/integration/elastic/ElasticsearchITConfig.java
@@ -3,14 +3,14 @@
 import com.solvd.micro9.users.domain.aggregate.User;
 import org.mockito.Mockito;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.ReactiveHashOperations;
 import org.springframework.data.redis.core.ReactiveRedisOperations;
 import reactor.core.publisher.Mono;
 
-@Configuration
+@TestConfiguration
 @EnableAutoConfiguration
 @ComponentScan("com.solvd.micro9.users.persistence.elastic")
 public class ElasticsearchITConfig {

diff --git a/src/test/java/com/solvd/micro9/users/integration/elastic/ElstcUserRepository.java b/src/test/java/com/solvd/micro9/users/integration/elastic/ElstcUserRepository.java
@@ -1,8 +1,9 @@
 package com.solvd.micro9.users.integration.elastic;
 
-
 import com.solvd.micro9.users.domain.elasticsearch.ESearchUser;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
+@ConditionalOnBean(ElasticsearchITConfig.class)
 public interface ElstcUserRepository extends ElasticsearchRepository<ESearchUser, String> {
 }