From fec209934b2875e92bda2b8a0b9adf83db631188 Mon Sep 17 00:00:00 2001 From: AMeng Date: Thu, 3 Dec 2015 13:42:37 -0700 Subject: [PATCH] Fixed misnamed variables --- .../com/netflix/spinnaker/igor/jenkins/InfoController.groovy | 2 +- .../netflix/spinnaker/igor/jenkins/BuildControllerSpec.groovy | 2 +- .../netflix/spinnaker/igor/jenkins/InfoControllerSpec.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/InfoController.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/InfoController.groovy index 3e3ab9218..e9a81ed4e 100644 --- a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/InfoController.groovy +++ b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/InfoController.groovy @@ -90,7 +90,7 @@ class InfoController { } } } - recursiveGetJobs(jenkinsClient.jobs.list) + recursiveGetJobs(jenkinsService.jobs.list) return jobList } diff --git a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/BuildControllerSpec.groovy b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/BuildControllerSpec.groovy index 5c56795f7..02c0de203 100644 --- a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/BuildControllerSpec.groovy +++ b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/BuildControllerSpec.groovy @@ -170,7 +170,7 @@ class BuildControllerSpec extends Specification { void 'trigger a build with parameters to a job without parameters'() { given: - 1 * jenkinsService.getJobConfig(JOB_NAME) >> new JobConfig() + 1 * client.getJobConfig(JOB_NAME) >> new JobConfig() when: MockHttpServletResponse response = mockMvc.perform(put("/masters/${MASTER}/jobs/${JOB_NAME}") diff --git a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/InfoControllerSpec.groovy b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/InfoControllerSpec.groovy index 9fbdc3757..a23e6b6ce 100644 --- a/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/InfoControllerSpec.groovy +++ b/igor-web/src/test/groovy/com/netflix/spinnaker/igor/jenkins/InfoControllerSpec.groovy @@ -134,7 +134,7 @@ class InfoControllerSpec extends Specification { .accept(MediaType.APPLICATION_JSON)).andReturn().response then: - 1 * masters.map >> ['master2': [], 'build.masters.blah': [], 'master1': client] + 1 * masters.map >> ['master2': [], 'build.masters.blah': [], 'master1': service] response.contentAsString == '{"description":null,"displayName":"My-Build","name":"My-Build","buildable":true,"color":"red","url":"http://jenkins.builds.net/job/My-Build/","parameterDefinitionList":[{"defaultName":"pullRequestSourceBranch","defaultValue":"master","name":"pullRequestSourceBranch","description":null,"type":"StringParameterDefinition"},{"defaultName":"generation","defaultValue":"4","name":"generation","description":null,"type":"StringParameterDefinition"}],"upstreamProjectList":[{"name":"Upstream-Build","url":"http://jenkins.builds.net/job/Upstream-Build/","color":"blue"}],"downstreamProjectList":[{"name":"First-Downstream-Build","url":"http://jenkins.builds.net/job/First-Downstream-Build/","color":"blue"},{"name":"Second-Downstream-Build","url":"http://jenkins.builds.net/job/Second-Downstream-Build/","color":"blue"},{"name":"Third-Downstream-Build","url":"http://jenkins.builds.net/job/Third-Downstream-Build/","color":"red"}],"concurrentBuild":false}' }