Extend test to cover wider scope

Signed-off-by: Ales Raszka <[email protected]>

Author: Allda

controllers/backupcronjob/backupcronjob_controller.go

@@ -464,7 +464,7 @@ func (r *BackupCronJobReconciler) getWorkspacePVCName(workspace *dw.DevWorkspace
 		if dwOperatorConfig.Config.Workspace.PVCName != "" {
 			pvcName = dwOperatorConfig.Config.Workspace.PVCName
 		}
-		return pvcName, workspace.Status.DevWorkspaceId + "/" + constants.DefaultProjectsSourcesRoot, nil
+		return pvcName, workspace.Status.DevWorkspaceId + constants.DefaultProjectsSourcesRoot, nil
 	}
 	return "", "", nil
 }

controllers/backupcronjob/backupcronjob_controller_test.go

@@ -38,6 +38,7 @@ import (
 	dwv2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/conditions"
+	"github.com/devfile/devworkspace-operator/pkg/constants"
 )
 
 var _ = Describe("BackupCronJobReconciler", func() {
@@ -253,6 +254,25 @@ var _ = Describe("BackupCronJobReconciler", func() {
 			jobList := &batchv1.JobList{}
 			Expect(fakeClient.List(ctx, jobList, &client.ListOptions{Namespace: dw.Namespace})).To(Succeed())
 			Expect(jobList.Items).To(HaveLen(1))
+			job := jobList.Items[0]
+			Expect(job.Labels[constants.DevWorkspaceIDLabel]).To(Equal("id-recent"))
+			Expect(job.Spec.Template.Spec.ServiceAccountName).To(Equal("devworkspace-job-runner-id-recent"))
+			container := job.Spec.Template.Spec.Containers[0]
+			expectedEnvs := []corev1.EnvVar{
+				{Name: "DEVWORKSPACE_NAME", Value: "dw-recent"},
+				{Name: "DEVWORKSPACE_NAMESPACE", Value: "ns-a"},
+				{Name: "WORKSPACE_ID", Value: "id-recent"},
+				{Name: "BACKUP_SOURCE_PATH", Value: "/workspace/id-recent/projects"},
+				{Name: "DEVWORKSPACE_BACKUP_REGISTRY", Value: "fake-registry"},
+				{Name: "PODMAN_PUSH_OPTIONS", Value: "--tls-verify=false"},
+			}
+			Expect(container.Env).Should(ContainElements(expectedEnvs), "container env vars should include vars neeeded for backup")
+
+			expectedVolumeMounts := []corev1.VolumeMount{
+				{MountPath: "/workspace", Name: "workspace-data"},
+				{MountPath: "/var/lib/containers", Name: "build-storage"},
+			}
+			Expect(container.VolumeMounts).Should(ContainElements(expectedVolumeMounts), "container volume mounts should include mounts needed for backup")
 		})
 
 		It("does not create a Job when the DevWorkspace was stopped beyond time range", func() {