Merge pull request meshery#7093 from Abhishek-kumar09/Abhi/cypress-fix

[Fix] Cypress integration Test failure
sivanaikk · Feb 15, 2023 · 5d8fc1b · 5d8fc1b
2 parents 12c7626 + 4da18f9
commit 5d8fc1b
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 23 deletions.
diff --git a/provider-ui/cypress/e2e/provider-ui.cy.js b/provider-ui/cypress/e2e/provider-ui.cy.js
@@ -14,7 +14,7 @@ describe('Provider UI', () => {
     it('selects None as provider', () => {
         cy
             .get('[data-cy="select_provider"]').click()
-            .get('#split-button-menu').contains('None').click()
+            .get('#split-button-menu').contains('None')
     })
 
     it('opens and closes modal to learn more about providers', () => {

diff --git a/provider-ui/cypress/fixtures/providers.json b/provider-ui/cypress/fixtures/providers.json
@@ -1,14 +1,26 @@
 {
     "Meshery": {
-        "ProviderType": "remote",
-        "DisplayName": "Meshery",
-        "Description": "Provider: Meshery (default)\n\t- persistent sessions \n\t- save environment setup \n\t- retrieve performance test results \n\t- free use",
-        "Capabilities": []
+        "provider_type": "remote",
+        "provider_name": "Meshery",
+        "provider_description": [
+            "Persistent sessions",
+            "Save environment configurations and user preferences",
+            "Store and retrieve patterns, filters, and application defintions",
+            "Retrieve performance and conformance test results",
+            "RBAC support",
+            "Free use"
+        ],
+        "provider_url": "https://meshery.layer5.io"
     },
     "None": {
-        "ProviderType": "local",
-        "DisplayName": "None",
-        "Description": "Provider: None\n\t- ephemeral sessions\n\t- environment setup not saved\n\t- no performance test result history\n\t- free use",
-        "Capabilities": []
+        "provider_type": "local",
+        "package_version": "v0.6.51",
+        "provider_name": "None",
+        "provider_description": [
+            "Ephemeral sessions",
+            "Environment setup not saved",
+            "No performance or conformance test result history",
+            "Free Use"
+        ]
     }
 }
diff --git a/ui/cypress/e2e/integration/settings_spec.js b/ui/cypress/e2e/integration/settings_spec.js
@@ -2,15 +2,13 @@ describe("Settings", () => {
   describe("Service Meshes", () => {
     before(() => {
       cy.visit("/settings");
+      cy.intercept("GET", "/api/system/adapters", { fixture: "getMeshAdapters.json" }).as("getMeshAdapters");
+      cy.intercept("POST", "/api/system/adapter/manage", { fixture: "postMeshManage.json" }).as("postMeshManage");
       cy.get('[data-cy="tabServiceMeshes"]').click();
     });
 
     it("select, submit, and confirm", () => {
-      cy.intercept("GET", "/api/system/adapters", { fixture: "getMeshAdapters.json" }).as("getMeshAdapters");
-      cy.intercept("POST", "/api/system/adapter/manage", { fixture: "postMeshManage.json" }).as("postMeshManage");
-
       cy.get(".MuiInputBase-input").type("localhost:10000{enter}");
-
       cy.get("[data-cy=btnSubmitMeshAdapter]").click();
       cy.wait("@postMeshManage");
       cy.wait("@getMeshAdapters");

diff --git a/ui/cypress/fixtures/getMeshAdapters.json b/ui/cypress/fixtures/getMeshAdapters.json
@@ -1,10 +1,72 @@
 [
-  "localhost:10004",
-  "localhost:10006",
-  "localhost:10008",
-  "localhost:10009",
-  "localhost:10000",
-  "localhost:10001",
-  "localhost:10002",
-  "localhost:10003"
+  {
+    "adapter_location": "localhost:10007",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10009",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10010",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10000",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10002",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10004",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10005",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10006",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10012",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  },
+  {
+    "adapter_location": "localhost:10001",
+    "name": "",
+    "version": "",
+    "git_commit_sha": "",
+    "ops": null
+  }
 ]
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/patches/subscriptions-transport-ws+0.9.19.patch b/ui/patches/subscriptions-transport-ws+0.9.19.patch
@@ -0,0 +1,22 @@
+diff --git a/node_modules/subscriptions-transport-ws/dist/client.js b/node_modules/subscriptions-transport-ws/dist/client.js
+index 3202dcd..ec570ce 100644
+--- a/node_modules/subscriptions-transport-ws/dist/client.js
++++ b/node_modules/subscriptions-transport-ws/dist/client.js
+@@ -122,11 +122,12 @@ var SubscriptionClient = (function () {
+                 this.unsubscribeAll();
+                 this.sendMessage(undefined, message_types_1.default.GQL_CONNECTION_TERMINATE, null);
+             }
+-            this.client.close();
+-            this.client.onopen = null;
+-            this.client.onclose = null;
+-            this.client.onerror = null;
+-            this.client.onmessage = null;
++            const client = this.client;
++            client.close();
++            client.onopen = null;
++            client.onclose = null;
++            client.onerror = null;
++            client.onmessage = null;
+             this.client = null;
+             this.eventEmitter.emit('disconnected');
+             if (!isForced) {