From 2dabc773d4bb7d0fd87a5ffb827fcc4de1349ca1 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Tue, 23 Jul 2019 09:16:38 +0200 Subject: [PATCH] #54 Improve tests --- pkg/controller/jenkins/groovy/groovy_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkg/controller/jenkins/groovy/groovy_test.go b/pkg/controller/jenkins/groovy/groovy_test.go index 5d3d8571..1650020a 100644 --- a/pkg/controller/jenkins/groovy/groovy_test.go +++ b/pkg/controller/jenkins/groovy/groovy_test.go @@ -132,6 +132,7 @@ func TestGroovy_EnsureSingle(t *testing.T) { defer ctrl.Finish() jenkinsClient := jenkinsclient.NewMockJenkins(ctrl) + jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) jenkinsClient.EXPECT().ExecuteScript(groovyScript).Return("logs", nil) @@ -163,6 +164,18 @@ func TestGroovy_EnsureSingle(t *testing.T) { assert.Equal(t, anotherHash, jenkins.Status.AppliedGroovyScripts[0].Hash) assert.Equal(t, source, jenkins.Status.AppliedGroovyScripts[0].Source) assert.Equal(t, groovyScriptName, jenkins.Status.AppliedGroovyScripts[0].Name) + + requeue, err = groovyClient.EnsureSingle(source, groovyScriptName, hash, groovyScript) + require.NoError(t, err) + assert.True(t, requeue) + + err = fakeClient.Get(ctx, types.NamespacedName{Name: jenkins.Name, Namespace: jenkins.Namespace}, jenkins) + require.NoError(t, err) + assert.Equal(t, 1, len(jenkins.Status.AppliedGroovyScripts)) + assert.Equal(t, configurationType, jenkins.Status.AppliedGroovyScripts[0].ConfigurationType) + assert.Equal(t, hash, jenkins.Status.AppliedGroovyScripts[0].Hash) + assert.Equal(t, source, jenkins.Status.AppliedGroovyScripts[0].Source) + assert.Equal(t, groovyScriptName, jenkins.Status.AppliedGroovyScripts[0].Name) }) t.Run("execute script fails", func(t *testing.T) { // given