From 063f0c074b94932469b1c2971c9d0dac4a9a2e89 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Wed, 31 Jul 2019 10:51:36 +0200 Subject: [PATCH] Improve unit tests --- pkg/controller/jenkins/groovy/groovy.go | 2 +- pkg/controller/jenkins/groovy/groovy_test.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/controller/jenkins/groovy/groovy.go b/pkg/controller/jenkins/groovy/groovy.go index 555d5e26..15b594f7 100644 --- a/pkg/controller/jenkins/groovy/groovy.go +++ b/pkg/controller/jenkins/groovy/groovy.go @@ -58,7 +58,7 @@ func (g *Groovy) EnsureSingle(source, name, hash, groovyScript string) (requeue var appliedGroovyScripts []v1alpha2.AppliedGroovyScript for _, ags := range g.jenkins.Status.AppliedGroovyScripts { - if ags.Source != source || ags.Name != name { + if g.configurationType != ags.ConfigurationType || ags.Source != source || ags.Name != name { appliedGroovyScripts = append(appliedGroovyScripts, ags) } } diff --git a/pkg/controller/jenkins/groovy/groovy_test.go b/pkg/controller/jenkins/groovy/groovy_test.go index b9a7a09b..3bdd20ec 100644 --- a/pkg/controller/jenkins/groovy/groovy_test.go +++ b/pkg/controller/jenkins/groovy/groovy_test.go @@ -296,19 +296,18 @@ func TestGroovy_EnsureSingle(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() jenkinsClient := jenkinsclient.NewMockJenkins(ctrl) - jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) groovyClient := New(jenkinsClient, fakeClient, log.Log, jenkins, configurationType, emptyCustomization) - requeue, err := groovyClient.EnsureSingle("test-conf1", "test.groovy", hash, groovyScript) + requeue, err := groovyClient.EnsureSingle(source, "test.groovy", hash, groovyScript) require.NoError(t, err) assert.True(t, requeue) groovyClient = New(jenkinsClient, fakeClient, log.Log, jenkins, "another-test-configuration-type", emptyCustomization) - requeue, err = groovyClient.EnsureSingle("test-conf2", "test.groovy", "anotherHash", groovyScript) + requeue, err = groovyClient.EnsureSingle(source, "test.groovy", "anotherHash", groovyScript) require.NoError(t, err) assert.True(t, requeue)