Rename 'helper.JsonSatisfies' into 'helper.JsonStatisfiesAll' to make…

… the intent clearer
redhat-developer · Jun 26, 2023 · 6a2f36a · 6a2f36a
1 parent 12f1f56
commit 6a2f36a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/tests/helper/helper_generic.go b/tests/helper/helper_generic.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/onsi/gomega/types"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -15,6 +14,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/onsi/gomega/types"
+
 	"github.com/tidwall/gjson"
 
 	"github.com/redhat-developer/odo/pkg/config"
@@ -325,8 +326,8 @@ func JsonPathContentContain(json string, path string, value string) {
 	Expect(result.String()).To(ContainSubstring(value), fmt.Sprintf("content of path %q should contain %q but is %q", path, value, result.String()))
 }
 
-// JsonPathSatisfies expects content of the path to satisfy all the matchers passed to it
-func JsonPathSatisfies(json string, path string, matchers ...types.GomegaMatcher) {
+// JsonPathSatisfiesAll expects content of the path to satisfy all the matchers passed to it
+func JsonPathSatisfiesAll(json string, path string, matchers ...types.GomegaMatcher) {
 	result := gjson.Get(json, path)
 	Expect(result.String()).Should(SatisfyAll(matchers...))
 }

diff --git a/tests/integration/generic_test.go b/tests/integration/generic_test.go
@@ -155,12 +155,12 @@ var _ = Describe("odo generic", func() {
 					By("checking the JSON output", func() {
 						odoVersion = helper.Cmd("odo", "version", "-o", "json").ShouldPass().Out()
 						Expect(helper.IsJSON(odoVersion)).To(BeTrue())
-						helper.JsonPathSatisfies(odoVersion, "version", MatchRegexp(reJSONVersion))
+						helper.JsonPathSatisfiesAll(odoVersion, "version", MatchRegexp(reJSONVersion))
 						helper.JsonPathExist(odoVersion, "gitCommit")
 						if podman {
-							helper.JsonPathSatisfies(odoVersion, "podman.client.version", MatchRegexp(reJSONVersion), Equal(helper.GetPodmanVersion()))
+							helper.JsonPathSatisfiesAll(odoVersion, "podman.client.version", MatchRegexp(reJSONVersion), Equal(helper.GetPodmanVersion()))
 						} else {
-							helper.JsonPathSatisfies(odoVersion, "cluster.kubernetes.version", MatchRegexp(reJSONVersion))
+							helper.JsonPathSatisfiesAll(odoVersion, "cluster.kubernetes.version", MatchRegexp(reJSONVersion))
 							serverURL := oc.GetCurrentServerURL()
 							helper.JsonPathContentIs(odoVersion, "cluster.serverURL", serverURL)
 							if !helper.IsKubernetesCluster() {
@@ -169,7 +169,7 @@ var _ = Describe("odo generic", func() {
 									// A blank serverVersion might indicate a user permission error on certain clusters (observed with a developer account on Prow nightly jobs)
 									m = Not(m)
 								}
-								helper.JsonPathSatisfies(odoVersion, "cluster.openshift", m)
+								helper.JsonPathSatisfiesAll(odoVersion, "cluster.openshift", m)
 							}
 						}
 					})
@@ -205,10 +205,10 @@ var _ = Describe("odo generic", func() {
 			By("checking JSON output", func() {
 				odoVersion := helper.Cmd("odo", "version", "--client", "-o", "json").ShouldPass().Out()
 				Expect(helper.IsJSON(odoVersion)).To(BeTrue())
-				helper.JsonPathSatisfies(odoVersion, "version", MatchRegexp(reJSONVersion))
+				helper.JsonPathSatisfiesAll(odoVersion, "version", MatchRegexp(reJSONVersion))
 				helper.JsonPathExist(odoVersion, "gitCommit")
-				helper.JsonPathSatisfies(odoVersion, "cluster", BeEmpty())
-				helper.JsonPathSatisfies(odoVersion, "podman", BeEmpty())
+				helper.JsonPathSatisfiesAll(odoVersion, "cluster", BeEmpty())
+				helper.JsonPathSatisfiesAll(odoVersion, "podman", BeEmpty())
 			})
 		})
 	})