From 7a149c82579fb1c83039f4acb294e15f39fa7e97 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Thu, 25 Jul 2019 13:20:22 +0200 Subject: [PATCH] Improve tests --- pkg/controller/jenkins/groovy/groovy_test.go | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkg/controller/jenkins/groovy/groovy_test.go b/pkg/controller/jenkins/groovy/groovy_test.go index fd3fe88f..b9a7a09b 100644 --- a/pkg/controller/jenkins/groovy/groovy_test.go +++ b/pkg/controller/jenkins/groovy/groovy_test.go @@ -280,6 +280,40 @@ func TestGroovy_EnsureSingle(t *testing.T) { assert.Equal(t, 2, len(jenkins.Status.AppliedGroovyScripts)) }) + t.Run("execute two groovy scripts with different configuration types", func(t *testing.T) { + jenkins := &v1alpha2.Jenkins{ + ObjectMeta: metav1.ObjectMeta{ + Name: jenkinsName, + Namespace: namespace, + }, + } + err := v1alpha2.SchemeBuilder.AddToScheme(scheme.Scheme) + require.NoError(t, err) + fakeClient := fake.NewFakeClient() + err = fakeClient.Create(ctx, jenkins) + require.NoError(t, err) + + 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) + 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) + require.NoError(t, err) + assert.True(t, requeue) + + assert.Equal(t, 2, len(jenkins.Status.AppliedGroovyScripts)) + }) t.Run("execute script fails", func(t *testing.T) { // given jenkins := &v1alpha2.Jenkins{