test(graphql): fix broken tests for chaoscenter/graphql/server and …

…integrate mockery to generate mocks (#4372) * chore: add mockery Signed-off-by: smit thakkar <[email protected]> * chore: generate mocks Signed-off-by: smit thakkar <[email protected]> * test: fix broken tests Signed-off-by: smit thakkar <[email protected]> * docs: add instructions for generating mocks Signed-off-by: smit thakkar <[email protected]> * style: fix formatting on docs Signed-off-by: smit thakkar <[email protected]> * refactor: make mock initialisation dry and remove unused mocks Signed-off-by: smit thakkar <[email protected]> * style: fix lint errors Signed-off-by: smit thakkar <[email protected]> * style: fix lint errors Signed-off-by: smit thakkar <[email protected]> * style: fix lint errors Signed-off-by: smit thakkar <[email protected]> --------- Signed-off-by: smit thakkar <[email protected]>
litmuschaos · Jan 12, 2024 · 52593fb · 52593fb
1 parent 7a57192
commit 52593fb
Show file tree

Hide file tree

Showing 7 changed files with 692 additions and 222 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -66,6 +66,14 @@ To submit any kinds of improvements, please consider the following:
 
 If you are new to Go, consider reading [Effective Go](https://golang.org/doc/effective_go.html) and [Go Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments) for guidance on writing idiomatic Go code.
 
+### Generating/Updating Mocks for `chaoscenter/graphql/server`
+
+To generate new mocks or update existing mocks:
+
+-   Follow the instructions to install [mockery](https://vektra.github.io/mockery/latest/installation/).
+-   If generating mocks for existing interface simply run `mockery`.
+-   If generating mocks for new interface update [`.mockery.yaml`](././chaoscenter/graphql/server/.mockery.yaml) and run `mockery`.
+
 ---
 
 ## Pull Request Checklist :

diff --git a/chaoscenter/graphql/server/.mockery.yaml b/chaoscenter/graphql/server/.mockery.yaml
@@ -0,0 +1,20 @@
+with-expecter: true
+packages:
+  github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment/ops:
+    interfaces:
+      Service:
+        # Modify package-level config for this specific interface (if applicable)
+        config:
+          dir: "pkg/chaos_experiment/model/mocks"
+          filename: "service.go"
+          mockname: ChaosExperimentService
+          outpkg: mocks
+  github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment_run:
+    interfaces:
+      Service:
+        # Modify package-level config for this specific interface (if applicable)
+        config:
+          dir: "pkg/chaos_experiment_run/model/mocks"
+          filename: "service.go"
+          mockname: ChaosExperimentRunService
+          outpkg: mocks
diff --git a/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go b/chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go
diff --git a/chaoscenter/graphql/server/pkg/chaos_experiment/model/mocks/service.go b/chaoscenter/graphql/server/pkg/chaos_experiment/model/mocks/service.go
diff --git a/chaoscenter/graphql/server/pkg/chaos_experiment_run/model/mocks/service.go b/chaoscenter/graphql/server/pkg/chaos_experiment_run/model/mocks/service.go
diff --git a/chaoscenter/graphql/server/pkg/chaoshub/handler/handler_test.go b/chaoscenter/graphql/server/pkg/chaoshub/handler/handler_test.go
@@ -285,6 +285,7 @@ func TestGetChartsData(t *testing.T) {
 				RepoURL:    "https://github.com/litmuschaos/chaos-charts",
 				RepoBranch: "master",
 				IsPrivate:  false,
+				IsDefault:  false,
 			},
 			isError: false,
 		},
@@ -296,6 +297,7 @@ func TestGetChartsData(t *testing.T) {
 				RepoURL:    "invalid url",
 				RepoBranch: "master",
 				IsPrivate:  false,
+				IsDefault:  true,
 			},
 			isError: true,
 		},
@@ -304,7 +306,7 @@ func TestGetChartsData(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			if tc.isError {
 				// when
-				chartsPath := handler.GetChartsPath(tc.repoData, tc.projectID, false)
+				chartsPath := handler.GetChartsPath(tc.repoData, tc.projectID, tc.repoData.IsDefault)
 				_, err := handler.GetChartsData(chartsPath)
 				// then
 				assert.Error(t, err)
@@ -314,7 +316,7 @@ func TestGetChartsData(t *testing.T) {
 
 				err := chaosHubOps.GitClone(tc.repoData, tc.projectID)
 				assert.NoError(t, err)
-				chartsPath := handler.GetChartsPath(tc.repoData, tc.projectID, true)
+				chartsPath := handler.GetChartsPath(tc.repoData, tc.projectID, tc.repoData.IsDefault)
 				// when
 				_, err = handler.GetChartsData(chartsPath)
 				// then
@@ -386,11 +388,13 @@ func TestListPredefinedWorkflowDetails(t *testing.T) {
 		hubName   string
 		isError   bool
 	}{
-		{
-			name:      "success: list predefined workflows",
-			projectID: succeedProjectID,
-			hubName:   succeedName,
-		},
+		// Workflows were removed in v3.0.0
+		// TODO: Cleanup ListPredefinedWorkflowDetails if not needed
+		// {
+		// 	name:      "success: list predefined workflows",
+		// 	projectID: succeedProjectID,
+		// 	hubName:   succeedName,
+		// },
 		{
 			name:      "failure: Not defined workflows",
 			projectID: uuid.New().String(),

diff --git a/chaoscenter/graphql/server/pkg/chaoshub/ops/gitops_test.go b/chaoscenter/graphql/server/pkg/chaoshub/ops/gitops_test.go
@@ -49,7 +49,7 @@ func TestGetClonePath(t *testing.T) {
 	// when
 	path := chaosHubOps.GetClonePath(chaosHubConfig)
 	// then
-	assert.Equal(t, "/tmp/version/"+projectID+"/test", path)
+	assert.Equal(t, "/tmp/"+projectID+"/test", path)
 }
 
 // TestGitConfigConstruct is used to test the GitConfigConstruct function