Hotfix tests (#135)

jlandowner · Aug 15, 2024 · f6ae268 · f6ae268
1 parent 59ba926
commit f6ae268
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -47,9 +47,9 @@ integ-test-kong:
 
 .PHONY: integ-test-fail
 integ-test-fail: install-dev-bin
- -helm chartsnap --chart example/app1 --namespace default $(ARGS)
- -helm chartsnap --chart example/app1 --namespace default -f example/app1/testfail/test_ingress_enabled.yaml $(ARGS)
- -helm chartsnap --chart example/app1 --namespace default -f example/app1/testfail/ $(ARGS)
+ helm chartsnap --chart example/app1 --namespace default $(ARGS) && (echo "should fail"; exit 1) || (echo "--- fail is expected ---"; true)
+ helm chartsnap --chart example/app1 --namespace default -f example/app1/testfail/test_ingress_enabled.yaml $(ARGS) && (echo "should fail"; exit 1) || (echo "--- fail is expected ---"; true)
+ helm chartsnap --chart example/app1 --namespace default -f example/app1/testfail/ $(ARGS) && (echo "should fail"; exit 1) || (echo "--- fail is expected ---"; true)
 
 .PHONY: update-versions
 update-versions:

diff --git a/__snapshots__/main_test.snap b/__snapshots__/main_test.snap
@@ -75,4 +75,4 @@ SnapShot = 'snapshot does not match chart=example/app1 values=example/app1/testf
 
 ['rootCmd fail values file not found should fail 1']
 SnapShot = """
-values file 'example/app1/test/notfound.yaml' not found"""
+values file 'example/app1/test_latest/notfound.yaml' not found"""
diff --git a/hack/helm-template-diff/main.go b/hack/helm-template-diff/main.go
@@ -20,16 +20,16 @@ func main() {
  helm: "helm template chartsnap ../../example/app1 -n default",
  },
  {
- snap: "../../example/app1/test/__snapshots__/test_ingress_enabled.snap",
- helm: "helm template chartsnap ../../example/app1 -f ../../example/app1/test/test_ingress_enabled.yaml -n default",
+ snap: "../../example/app1/test_latest/__snapshots__/test_ingress_enabled.snap",
+ helm: "helm template chartsnap ../../example/app1 -f ../../example/app1/test_latest/test_ingress_enabled.yaml -n default",
  },
  {
- snap: "../../example/app1/test/__snapshots__/test_hpa_enabled.snap",
- helm: "helm template chartsnap ../../example/app1 -f ../../example/app1/test/test_hpa_enabled.yaml -n default",
+ snap: "../../example/app1/test_latest/__snapshots__/test_hpa_enabled.snap",
+ helm: "helm template chartsnap ../../example/app1 -f ../../example/app1/test_latest/test_hpa_enabled.yaml -n default",
  },
  {
- snap: "../../example/app1/test/__snapshots__/test_certmanager_enabled.snap",
- helm: "helm template chartsnap ../../example/app1 -f ../../example/app1/test/test_certmanager_enabled.yaml -n default",
+ snap: "../../example/app1/test_latest/__snapshots__/test_certmanager_enabled.snap",
+ helm: "helm template chartsnap ../../example/app1 -f ../../example/app1/test_latest/test_certmanager_enabled.yaml -n default",
  },
  {
  snap: "../../example/remote/__snapshots__/nginx-gateway-fabric.values.snap",

diff --git a/main_test.go b/main_test.go
@@ -21,15 +21,15 @@ var _ = Describe("rootCmd", func() {
  Context("success", func() {
  Context("snapshot local chart with single values file", func() {
  It("should pass", func() {
- rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test/test_ingress_enabled.yaml", "--namespace", "default"})
+ rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test_latest/test_ingress_enabled.yaml", "--namespace", "default"})
  err := rootCmd.Execute()
  Expect(err).ShouldNot(HaveOccurred())
  })
  })
 
  Context("snapshot local chart with values directory", func() {
  It("should pass", func() {
- rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test/", "--namespace", "default"})
+ rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test_latest/", "--namespace", "default"})
  err := rootCmd.Execute()
  Expect(err).ShouldNot(HaveOccurred())
  })
@@ -124,7 +124,7 @@ var _ = Describe("rootCmd", func() {
 
  Context("values file not found", func() {
  It("should fail", func() {
- rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test/notfound.yaml", "--namespace", "default"})
+ rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test_latest/notfound.yaml", "--namespace", "default"})
  err := rootCmd.Execute()
  Expect(err).To(HaveOccurred())
  Ω(err.Error()).To(MatchSnapShot())
@@ -151,7 +151,7 @@ var _ = Describe("rootCmd", func() {
 
  Context("invalid flag", func() {
  It("should fail", func() {
- rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test/test_ingress_enabled.yaml", "--namespace", "default", "--invalid"})
+ rootCmd.SetArgs([]string{"--chart", "example/app1", "-f", "example/app1/test_latest/test_ingress_enabled.yaml", "--namespace", "default", "--invalid"})
  err := rootCmd.Execute()
  Expect(err).To(HaveOccurred())
  Ω(err.Error()).To(MatchSnapShot())