fix(dependencies): Fix tests broken by Kork upgrade (spinnaker#3713)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
amanya · Jun 1, 2020 · b6e2e99 · b6e2e99
1 parent 9d4d91f
commit b6e2e99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 enablePublishing=false
 fiatVersion=1.19.1
-keikoVersion=3.6.2
-korkVersion=7.42.11
-kotlinVersion=1.3.71
+keikoVersion=3.7.1
+korkVersion=7.43.1
+kotlinVersion=1.3.72
 org.gradle.parallel=true
 spinnakerGradleVersion=8.1.1
 

diff --git a/orca-sql/src/test/kotlin/com/netflix/spinnaker/orca/sql/SqlHealthcheckQueueActivatorTest.kt b/orca-sql/src/test/kotlin/com/netflix/spinnaker/orca/sql/SqlHealthcheckQueueActivatorTest.kt
@@ -25,7 +25,7 @@ import com.nhaarman.mockito_kotlin.whenever
 import dev.minutest.junit.JUnit5Minutests
 import dev.minutest.rootContext
 import org.jooq.DSLContext
-import org.jooq.DeleteWhereStep
+import org.jooq.DeleteUsingStep
 import org.jooq.Table
 import strikt.api.expectThat
 import strikt.assertions.isFalse
@@ -36,7 +36,7 @@ class SqlHealthcheckQueueActivatorTest : JUnit5Minutests {
   fun tests() = rootContext<Unit> {
 
     val dslContext = mock<DSLContext>()
-    val query = mock<DeleteWhereStep<*>>()
+    val query = mock<DeleteUsingStep<*>>()
 
     after {
       reset(dslContext, query)

diff --git a/orca-web/src/test/groovy/com/netflix/spinnaker/orca/controllers/TaskControllerSpec.groovy b/orca-web/src/test/groovy/com/netflix/spinnaker/orca/controllers/TaskControllerSpec.groovy
@@ -19,6 +19,7 @@ package com.netflix.spinnaker.orca.controllers
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.common.collect.Collections2
 import com.netflix.spectator.api.NoopRegistry
+import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionType
 import com.netflix.spinnaker.orca.front50.Front50Service
@@ -611,7 +612,7 @@ class TaskControllerSpec extends Specification {
     results.id == ['test-1', 'test-3']
   }
 
-  void '/applications/{application}/pipelines/search should handle a trigger search field that is a list of maps correctly and deterministicly'() {
+  void '/applications/{application}/pipelines/search should handle a trigger search field that is a list of maps correctly and deterministically'() {
     given:
     def app = "covfefe"
     def pipelines = [
@@ -622,8 +623,8 @@ class TaskControllerSpec extends Specification {
        trigger: new DockerTrigger("test-account", "test-repo", "1")
       ]
     ]
-    pipelines[0].trigger.artifacts.addAll([[name: "a", version: "1"],  [name: "a"]])
-    pipelines[1].trigger.artifacts.addAll([[name: "a"], [name: "a", version: "1"]])
+    pipelines[0].trigger.artifacts.addAll([Artifact.builder().name("a").version("1").build(), Artifact.builder().name("a").build()])
+    pipelines[1].trigger.artifacts.addAll([Artifact.builder().name("a").build(), Artifact.builder().name("a").version("1").build()])
 
     executionRepository.retrieveAllPipelinesForPipelineConfigIdsBetweenBuildTimeBoundary(["1"], _, _, _) >> pipelines.findAll {
       it.pipelineConfigId == "1"