From a98415fec75a0ff5de75f0635acc1017b335cfd6 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Sat, 8 Sep 2018 16:23:38 +0100
Subject: [PATCH] Fix up test cases after rebase

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 pkg/issuer/acme/dns/dns_test.go      | 10 ++++++----
 pkg/issuer/acme/http/ingress.go      |  1 -
 pkg/issuer/acme/http/ingress_test.go | 28 +++++++++-------------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/pkg/issuer/acme/dns/dns_test.go b/pkg/issuer/acme/dns/dns_test.go
index f62e720da..3f45b2389 100644
--- a/pkg/issuer/acme/dns/dns_test.go
+++ b/pkg/issuer/acme/dns/dns_test.go
@@ -228,10 +228,12 @@ func TestSolverFor(t *testing.T) {
 						},
 					},
 				}),
-				Challenge: v1alpha1.ACMEOrderChallenge{
-					SolverConfig: v1alpha1.SolverConfig{
-						DNS01: &v1alpha1.DNS01SolverConfig{
-							Provider: "fake-acmedns",
+				Challenge: &v1alpha1.Challenge{
+					Spec: v1alpha1.ChallengeSpec{
+						Config: v1alpha1.SolverConfig{
+							DNS01: &v1alpha1.DNS01SolverConfig{
+								Provider: "fake-acmedns",
+							},
 						},
 					},
 				},
diff --git a/pkg/issuer/acme/http/ingress.go b/pkg/issuer/acme/http/ingress.go
index 2077f058e..10ebd2625 100644
--- a/pkg/issuer/acme/http/ingress.go
+++ b/pkg/issuer/acme/http/ingress.go
@@ -230,7 +230,6 @@ func (s *Solver) cleanupIngresses(ch *v1alpha1.Challenge) error {
 
 	ingPathToDel := solverPathFn(ch.Spec.Token)
 	var ingRules []extv1beta1.IngressRule
-Outer:
 	for _, rule := range ing.Spec.Rules {
 		if rule.Host == ch.Spec.DNSName {
 			if rule.HTTP == nil {
diff --git a/pkg/issuer/acme/http/ingress_test.go b/pkg/issuer/acme/http/ingress_test.go
index bad7d6b25..9bce1d794 100644
--- a/pkg/issuer/acme/http/ingress_test.go
+++ b/pkg/issuer/acme/http/ingress_test.go
@@ -31,7 +31,6 @@ import (
 
 	"github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
 	"github.com/jetstack/cert-manager/pkg/controller/test"
-	"github.com/jetstack/cert-manager/test/util/generate"
 )
 
 func TestGetIngressesForChallenge(t *testing.T) {
@@ -210,23 +209,14 @@ func TestCleanupIngresses(t *testing.T) {
 					},
 				},
 			},
-			Certificate: generate.Certificate(generate.CertificateConfig{
-				Name:         "test",
-				Namespace:    defaultTestNamespace,
-				DNSNames:     []string{"example.com"},
-				ACMEOrderURL: "testurl",
-				SolverConfig: v1alpha1.SolverConfig{
-					HTTP01: &v1alpha1.HTTP01SolverConfig{
-						Ingress: "testingress",
-					},
-				},
-			}),
-			Challenge: v1alpha1.ACMEOrderChallenge{
-				Domain: "example.com",
-				Token:  "abcd",
-				SolverConfig: v1alpha1.SolverConfig{
-					HTTP01: &v1alpha1.HTTP01SolverConfig{
-						Ingress: "testingress",
+			Challenge: &v1alpha1.Challenge{
+				Spec: v1alpha1.ChallengeSpec{
+					DNSName: "example.com",
+					Token:   "abcd",
+					Config: v1alpha1.SolverConfig{
+						HTTP01: &v1alpha1.HTTP01SolverConfig{
+							Ingress: "testingress",
+						},
 					},
 				},
 			},
@@ -236,7 +226,7 @@ func TestCleanupIngresses(t *testing.T) {
 				expectedIng := s.KubeObjects[0].(*v1beta1.Ingress).DeepCopy()
 				expectedIng.Spec.Rules = nil
 
-				actualIng, err := s.Builder.FakeKubeClient().ExtensionsV1beta1().Ingresses(s.Certificate.Namespace).Get(expectedIng.Name, metav1.GetOptions{})
+				actualIng, err := s.Builder.FakeKubeClient().ExtensionsV1beta1().Ingresses(s.Challenge.Namespace).Get(expectedIng.Name, metav1.GetOptions{})
 				if apierrors.IsNotFound(err) {
 					t.Errorf("expected ingress resource %q to not be deleted, but it was deleted", expectedIng.Name)
 				}