Fix test after rebase

nginxinc · Apr 29, 2024 · 69f42f0 · 69f42f0
1 parent a946d23
commit 69f42f0
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/internal/mode/static/nginx/config/generator_test.go b/internal/mode/static/nginx/config/generator_test.go
@@ -115,17 +115,12 @@ func TestGenerate(t *testing.T) {
 	g.Expect(files[3].Content).To(Equal([]byte("load_module modules/ngx_otel_module.so;")))
 
 	g.Expect(files[4].Path).To(Equal("/etc/nginx/secrets/test-certbundle.crt"))
-	certBundle := string(files[3].Content)
+	certBundle := string(files[4].Content)
 	g.Expect(certBundle).To(Equal("test-cert"))
 
-<<<<<<< HEAD
 	g.Expect(files[5]).To(Equal(file.File{
 		Type:    file.TypeSecret,
 		Path:    "/etc/nginx/secrets/test-keypair.pem",
 		Content: []byte("test-cert\ntest-key"),
 	}))
-=======
-	g.Expect(files[4].Path).To(Equal("/etc/nginx/module-includes/load-modules.conf"))
-	g.Expect(files[4].Content).To(Equal([]byte("load_module modules/ngx_otel_module.so;")))
->>>>>>> dfc23a2 (Code review)
 }