From e8277cc8a09695553d95673c1e9f5a432e27efe2 Mon Sep 17 00:00:00 2001
From: Jakub Al-Khalili <jakubalkhalili@gmail.com>
Date: Thu, 12 Sep 2019 14:58:47 +0200
Subject: [PATCH] #96 Small tests improvements

---
 .../configuration/base/resources/pod.go       | 12 +++++++
 .../configuration/base/resources/pod_test.go  | 34 +++++--------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/pkg/controller/jenkins/configuration/base/resources/pod.go b/pkg/controller/jenkins/configuration/base/resources/pod.go
index 3cd378cf..f225ba1d 100644
--- a/pkg/controller/jenkins/configuration/base/resources/pod.go
+++ b/pkg/controller/jenkins/configuration/base/resources/pod.go
@@ -150,6 +150,18 @@ func GetJenkinsMasterPodBaseVolumes(jenkins *v1alpha2.Jenkins) []corev1.Volume {
 	return volumes
 }
 
+func checkSecretVolumesPresence(jenkins *v1alpha2.Jenkins) (groovyExists bool, cascExists bool) {
+	for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) {
+		if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) {
+			groovyExists = true
+		} else if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) {
+			cascExists = true
+		}
+	}
+
+	return groovyExists, cascExists
+}
+
 func getGroovyScriptsSecretVolumeName(jenkins *v1alpha2.Jenkins) string {
 	return "gs-" + jenkins.Spec.GroovyScripts.Secret.Name
 }
diff --git a/pkg/controller/jenkins/configuration/base/resources/pod_test.go b/pkg/controller/jenkins/configuration/base/resources/pod_test.go
index e3788ba2..1cca58f4 100644
--- a/pkg/controller/jenkins/configuration/base/resources/pod_test.go
+++ b/pkg/controller/jenkins/configuration/base/resources/pod_test.go
@@ -1,9 +1,10 @@
 package resources
 
 import (
+	"testing"
+
 	"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestGetJenkinsMasterPodBaseVolumes(t *testing.T) {
@@ -38,16 +39,7 @@ func TestGetJenkinsMasterPodBaseVolumes(t *testing.T) {
 			},
 		}
 
-		groovyExists := false
-		cascExists := false
-
-		for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) {
-			if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) {
-				groovyExists = true
-			} else if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) {
-				cascExists = true
-			}
-		}
+		groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
 
 		assert.True(t, groovyExists)
 		assert.True(t, cascExists)
@@ -79,14 +71,10 @@ func TestGetJenkinsMasterPodBaseVolumes(t *testing.T) {
 			},
 		}
 
-		volumeExists := false
-		for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) {
-			if volume.Name == ("casc-" + jenkins.Spec.ConfigurationAsCode.Secret.Name) {
-				volumeExists = true
-			}
-		}
+		groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
 
-		assert.True(t, volumeExists)
+		assert.True(t, cascExists)
+		assert.False(t, groovyExists)
 	})
 	t.Run("casc without secret name", func(t *testing.T) {
 		jenkins := &v1alpha2.Jenkins{
@@ -115,14 +103,10 @@ func TestGetJenkinsMasterPodBaseVolumes(t *testing.T) {
 			},
 		}
 
-		volumeExists := false
-		for _, volume := range GetJenkinsMasterPodBaseVolumes(jenkins) {
-			if volume.Name == ("gs-" + jenkins.Spec.GroovyScripts.Secret.Name) {
-				volumeExists = true
-			}
-		}
+		groovyExists, cascExists := checkSecretVolumesPresence(jenkins)
 
-		assert.True(t, volumeExists)
+		assert.True(t, groovyExists)
+		assert.False(t, cascExists)
 	})
 	t.Run("casc and groovy script shared secret name", func(t *testing.T) {
 		jenkins := &v1alpha2.Jenkins{