feat: added default values & missing fields to Upstream

web/cypress/fixtures/selector.json

@@ -1,37 +1,33 @@
 {
   "codeMirror": ".CodeMirror",
   "username": "#username",
-
   "languageSwitcher": ".ant-space-align-center",
   "dropdown": ".rc-virtual-list",
   "notification": ".ant-notification-notice-message",
   "drawerBody": ".ant-drawer-wrapper-body",
   "notificationCloseIcon": ".ant-notification-close-icon",
   "notificationDesc": ".ant-notification-notice-description",
   "errorNotification:": ".ant-notification-notice-error",
-
   "pluginCard": ".ant-card",
   "pluginCardBordered": ".ant-card-bordered",
   "pageContent": ".ant-pro-page-container",
-
-  "tableBody":".ant-table-tbody",
+  "tableBody": ".ant-table-tbody",
   "tableCell": ".ant-table-cell",
   "empty": ".ant-empty-normal",
   "refresh": ".anticon-reload",
   "codemirror": ".CodeMirror",
   "disabledSwitcher": "#disable",
   "checkedSwitcher": ".ant-switch-checked",
   "deleteButton": ".ant-btn-dangerous",
-
   "name": "#name",
   "nodes_0_host": "#nodes_0_host",
   "nodes_0_port": "#nodes_0_port",
+  "nodes_0_weight": "#nodes_0_weight",
   "upstream_id": "#upstream_id",
   "input": ":input",
   "nameSelector": "[title=Name]",
   "serviceSelector": "[title=test_service]",
   "nameSearch": "[title=Name]",
-
   "description": "#desc",
   "upstreamSelector": "[data-cy=upstream_selector]",
   "addHost": "[data-cy=addHost]",
@@ -43,27 +39,21 @@
   "ruleCard": ".ant-modal",
   "operator": "#operator",
   "value": "#value",
-
   "fileSelector": "[type=file]",
   "fileTypeRadio": "[type=radio]",
   "fileSelectorClose": ".ant-modal-close",
-
   "debugUri": "#debugUri",
-
   "hosts_0": "#hosts_0",
   "labels_0_labelKey": "#labels_0_labelKey",
   "labels_0_labelValue": "#labels_0_labelValue",
   "labelSelector": "[title=Labels]",
   "labelSelect_0": ".ant-select-selection-overflow",
-
   "pageContainer": ".ant-pro-page-container",
   "notificationMessage": ".ant-notification-notice-message",
   "avatar": ".ant-space-align-center",
   "grafanaURL": "#grafanaURL",
   "explain": ".ant-form-item-explain",
-
   "upstreamType": ".ant-select-item-option-content",
-
   "errorExplain": ".ant-form-item-explain",
   "usernameInput": "#control-ref_username",
   "passwordInput": "#control-ref_password",
@@ -76,7 +66,6 @@
   "notificationClose": ".anticon-close",
   "redirectURIInput": "#redirectURI",
   "redirectCodeSelector": "#ret_code",
-
   "paginationOptions": ".ant-pagination-options",
   "fiftyPerPage": "[title=\"50 / page\"]",
   "twentyPerPage": "[title=\"20 / page\"]",
@@ -85,7 +74,6 @@
   "pageTwoActived": ".ant-pagination-item-2.ant-pagination-item-active",
   "selectDropdown": ".ant-select-dropdown",
   "codeMirrorMode": "[data-cy='code-mirror-mode']",
-  "selectJSON":".ant-select-dropdown [label=JSON]",
-
+  "selectJSON": ".ant-select-dropdown [label=JSON]",
   "deleteAlert": ".ant-modal-body"
-}
+}

web/cypress/integration/pluginTemplate/create-plugin-template-with-route.spec.js

@@ -46,6 +46,8 @@ context('Create PluginTemplate Binding To Route', () => {
     cy.get(this.domSelector.name).type(this.data.routeName);
     cy.contains('Next').click();
     cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
+    cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+    cy.get(this.domSelector.nodes_0_weight).clear().type(1);
     cy.contains('Next').click();
     cy.contains('Custom').should('be.visible');
     cy.get(this.domSelector.customSelector).click();

web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js

@@ -31,6 +31,8 @@ context('Can select service_id skip upstream in route', () => {
 
     cy.get(this.domSelector.name).type(this.data.upstreamName);
     cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
+    cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+    cy.get(this.domSelector.nodes_0_weight).clear().type(1);
     cy.contains('Next').click();
     cy.contains('Submit').click();
     cy.get(this.domSelector.notification).should('contain', this.data.createUpstreamSuccess);

web/cypress/integration/service/create-edit-delete-service.spec.js

@@ -35,6 +35,8 @@ context('Create and Delete Service ', () => {
     cy.get(this.domSelector.description).type(this.data.description);
     cy.get(this.domSelector.nodes_0_host).click();
     cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
+    cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+    cy.get(this.domSelector.nodes_0_weight).clear().type(1);
 
     cy.contains('Next').click();
 

web/cypress/integration/service/edit-service-with-upstream.spec.js

@@ -30,6 +30,8 @@ context('Edit Service with Upstream', () => {
     cy.contains('Create').click();
     cy.get(this.domSelector.name).type(this.data.upstreamName);
     cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
+    cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+    cy.get(this.domSelector.nodes_0_weight).clear().type(1);
     cy.contains('Next').click();
     cy.contains('Submit').click();
     cy.get(this.domSelector.notification).should('contain', this.data.createUpstreamSuccess);

web/cypress/integration/upstream/create_and_delete_upstream.spec.js

@@ -34,6 +34,7 @@ context('Create and Delete Upstream', () => {
 
     cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
     cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+    cy.get(this.domSelector.nodes_0_weight).clear().type(1);
     cy.contains('Next').click();
     cy.contains('Submit').click();
     cy.get(this.domSelector.notification).should('contain', this.data.createUpstreamSuccess);
@@ -78,18 +79,19 @@ context('Create and Delete Upstream', () => {
     cy.get(this.domSelector.upstreamType).within(() => {
       cy.contains('CHash').click();
     });
-    cy.get('#hash_on').click();
+    cy.get('#hash_on').click({ force: true });
     cy.get(this.domSelector.upstreamType).within(() => {
       cy.contains('vars').click();
     });
-    cy.get('#key').click();
+    cy.get('#key').click({ force: true });
     cy.get(this.domSelector.upstreamType).within(() => {
       cy.contains('remote_addr').click();
     });
 
     // add first upstream node
     cy.get(this.domSelector.nodes_0_host).type(this.data.ip1);
     cy.get(this.domSelector.nodes_0_port).clear().type('7000');
+    cy.get(this.domSelector.nodes_0_weight).clear().type(1);
 
     // add second upstream node
     cy.get('.ant-btn-dashed').click();