From e86e88c27b583ed9ffe07ca6fd87775c19eb3ab7 Mon Sep 17 00:00:00 2001
From: Alexander Buntakov <alexander.buntakov@gmail.com>
Date: Mon, 23 Jan 2023 22:30:22 +0300
Subject: [PATCH] fix ReposoitoryTest

---
 build.gradle.kts                                         | 9 +--------
 .../common/spring/test/jpa/repository/RepositoryTest.kt  | 8 ++++++++
 .../test/jpa/repository/RepositoryTestConfiguration.kt   | 2 ++
 .../touchin/common/spring/test/annotations/SlowTest.kt   | 2 --
 telegram-bot-spring/build.gradle                         | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4cba31a..a5c0d14 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,21 +29,13 @@ allprojects {
         mavenCentral()
     }
 
-    println("Enabling IDEA plugin in project ${project.name}...")
     apply(plugin = "idea")
 }
 
 subprojects {
-    println("Enabling Kotlin JVM plugin in project ${project.name}...")
     apply(plugin = "org.jetbrains.kotlin.jvm")
-
-    println("Enabling Kotlin Spring plugin in project ${project.name}...")
     apply(plugin = "org.jetbrains.kotlin.plugin.spring")
-
-    println("Enabling Spring Boot Dependency Management in project ${project.name}...")
     apply(plugin = "io.spring.dependency-management")
-
-    println("Enabling Detekt support in project ${project.name}...")
     apply(plugin = "io.gitlab.arturbosch.detekt")
 
     detekt {
@@ -81,6 +73,7 @@ subprojects {
             dependency("org.junit.jupiter:junit-jupiter-engine:5.4.2")
 
             dependency("org.liquibase:liquibase-core:4.4.0")
+            dependency("org.telegram:telegrambots-spring-boot-starter:6.4.0")
 
             dependency("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
             dependency("org.mockito:mockito-inline:3.11.0")
diff --git a/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTest.kt b/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTest.kt
index fcbf1c7..4acc011 100644
--- a/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTest.kt
+++ b/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTest.kt
@@ -4,10 +4,18 @@ package ru.touchin.common.spring.test.jpa.repository
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
 import org.springframework.context.annotation.Import
 import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.junit.jupiter.DisabledIf
 import ru.touchin.common.spring.test.annotations.SlowTest
 
 @ActiveProfiles("test", "test-slow")
 @SlowTest
 @DataJpaTest
 @Import(RepositoryTestConfiguration::class)
+@DisabledIf(
+    expression = """
+       #{systemProperties['tests.slow.enabled'] != null
+        ? systemProperties['tests.slow.enabled'].toLowerCase().contains('false')
+        : false} 
+    """
+)
 annotation class RepositoryTest
diff --git a/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTestConfiguration.kt b/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTestConfiguration.kt
index 8d375e1..b946947 100644
--- a/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTestConfiguration.kt
+++ b/common-spring-test-jpa/src/main/kotlin/ru/touchin/common/spring/test/jpa/repository/RepositoryTestConfiguration.kt
@@ -4,6 +4,7 @@ package ru.touchin.common.spring.test.jpa.repository
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
 import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
@@ -18,6 +19,7 @@ import javax.sql.DataSource
 @TestConfiguration
 @EnableJpaAuditingExtra
 @ComponentScan
+@ConditionalOnProperty(name = ["tests.slow.enabled"], matchIfMissing = true)
 class RepositoryTestConfiguration {
 
     // запуск и остановка контейнера по lifecycle-событиями компонента (1)
diff --git a/common-spring-test/src/main/kotlin/ru/touchin/common/spring/test/annotations/SlowTest.kt b/common-spring-test/src/main/kotlin/ru/touchin/common/spring/test/annotations/SlowTest.kt
index 4adc7fb..d5461fc 100644
--- a/common-spring-test/src/main/kotlin/ru/touchin/common/spring/test/annotations/SlowTest.kt
+++ b/common-spring-test/src/main/kotlin/ru/touchin/common/spring/test/annotations/SlowTest.kt
@@ -2,9 +2,7 @@
 package ru.touchin.common.spring.test.annotations
 
 import org.springframework.context.annotation.Profile
-import org.springframework.test.context.junit.jupiter.DisabledIf
 
 @Profile(value = ["test", "test-slow"])
-@DisabledIf("\${tests.slow.disabled:false}")
 @Target(allowedTargets = [AnnotationTarget.FUNCTION, AnnotationTarget.CLASS])
 annotation class SlowTest
diff --git a/telegram-bot-spring/build.gradle b/telegram-bot-spring/build.gradle
index 6537758..d6d4b3e 100644
--- a/telegram-bot-spring/build.gradle
+++ b/telegram-bot-spring/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api 'org.telegram:telegrambots-spring-boot-starter:6.3.0'
+    api 'org.telegram:telegrambots-spring-boot-starter'
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
     implementation 'com.fasterxml.jackson.core:jackson-databind'