You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by li...@apache.org on 2021/05/18 00:14:03 UTC

[apisix-dashboard] branch master updated: chore: refactored test create-route-with-limit-req-form.spec.js (#1865)

This is an automated email from the ASF dual-hosted git repository.

liuxiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 23a997d  chore: refactored test create-route-with-limit-req-form.spec.js (#1865)
23a997d is described below

commit 23a997d211551deb60ea544de194bd9a7ec0b4ec
Author: Ayush das <ay...@gmail.com>
AuthorDate: Tue May 18 05:43:52 2021 +0530

    chore: refactored test create-route-with-limit-req-form.spec.js (#1865)
    
    * chore: refactored test create-route-with-limit-req-form.spec.js
    
    * chore: refactored test create-route-with-limit-req-form.spec.js
---
 .../route/create-route-with-limit-req-form.spec.js | 93 +++++++++++++---------
 1 file changed, 56 insertions(+), 37 deletions(-)

diff --git a/web/cypress/integration/route/create-route-with-limit-req-form.spec.js b/web/cypress/integration/route/create-route-with-limit-req-form.spec.js
index e215163..8e3dee3 100644
--- a/web/cypress/integration/route/create-route-with-limit-req-form.spec.js
+++ b/web/cypress/integration/route/create-route-with-limit-req-form.spec.js
@@ -18,70 +18,91 @@
 
 context('Create and delete route with limit-req form', () => {
   const selector = {
-    rate: "#rate",
-    burst: "#burst",
+    empty: '.ant-empty-normal',
+    name: '#name',
+    description: '#desc',
+    disabledSwitcher: '#disable',
+    drawer: '.ant-drawer-content',
+    pluginCardBordered: '.ant-card-bordered',
+    checkedSwitcher: '.ant-switch-checked',
+    nodes_0_host: '#nodes_0_host',
+    nodes_0_port: '#nodes_0_port',
+    nodes_0_weight: '#nodes_0_weight',
+    deleteAlert: '.ant-modal-body',
+    notificationCloseIcon: '.ant-notification-close-icon',
+    notification: '.ant-notification-notice-message',
+    rate: '#rate',
+    burst: '#burst',
     key: '#key',
-    remote_addr: "[title=remote_addr]"
-  }
+    remote_addr: '[title=remote_addr]',
+  };
+
+  const data = {
+    deleteRouteSuccess: 'Delete Route Successfully',
+    submitSuccess: 'Submit Successfully',
+    port: '80',
+    weight: 1,
+  };
 
   beforeEach(() => {
     cy.login();
-
-    cy.fixture('selector.json').as('domSelector');
-    cy.fixture('data.json').as('data');
   });
 
   it('should create route with limit-req form', function () {
     cy.visit('/');
     cy.contains('Route').click();
-    cy.get(this.domSelector.empty).should('be.visible');
+    cy.get(selector.empty).should('be.visible');
     cy.contains('Create').click();
     cy.contains('Next').click().click();
-    cy.get(this.domSelector.name).type('routeName');
-    cy.get(this.domSelector.description).type('desc');
+    cy.get(selector.name).type('routeName');
+    cy.get(selector.description).type('desc');
     cy.contains('Next').click();
 
-    cy.get(this.domSelector.nodes_0_host).type('127.0.0.1');
-    cy.get(this.domSelector.nodes_0_port).clear().type(this.data.port);
-    cy.get(this.domSelector.nodes_0_weight).clear().type(this.data.weight);
+    cy.get(selector.nodes_0_host).type('127.0.0.1');
+    cy.get(selector.nodes_0_port).clear().type(data.port);
+    cy.get(selector.nodes_0_weight).clear().type(data.weight);
     cy.contains('Next').click();
 
     // config limit-req plugin
-    cy.contains('limit-req').parents(this.domSelector.pluginCardBordered).within(() => {
-      cy.get('button').click({
-        force: true
+    cy.contains('limit-req')
+      .parents(selector.pluginCardBordered)
+      .within(() => {
+        cy.get('button').click({
+          force: true,
+        });
       });
-    });
 
-    cy.get(this.domSelector.drawer).should('be.visible').within(() => {
-      cy.get(this.domSelector.disabledSwitcher).click();
-      cy.get(this.domSelector.checkedSwitcher).should('exist');
-    });
+    cy.get(selector.drawer)
+      .should('be.visible')
+      .within(() => {
+        cy.get(selector.disabledSwitcher).click();
+        cy.get(selector.checkedSwitcher).should('exist');
+      });
 
     // config limit-req form without wrong data
-    cy.get(this.domSelector.drawer).within(() => {
+    cy.get(selector.drawer).within(() => {
       cy.contains('Submit').click({
         force: true,
       });
     });
-    cy.get(this.domSelector.notification).should('contain', 'Invalid plugin data');
-    cy.get(this.domSelector.notificationCloseIcon).click();
+    cy.get(selector.notification).should('contain', 'Invalid plugin data');
+    cy.get(selector.notificationCloseIcon).click();
 
     // config limit-req form
     cy.get(selector.rate).type(1);
     cy.get(selector.burst).type(0);
     cy.get(selector.key).click();
     cy.get(selector.remote_addr).click();
-    cy.get(this.domSelector.drawer).within(() => {
+    cy.get(selector.drawer).within(() => {
       cy.contains('Submit').click({
         force: true,
       });
     });
-    cy.get(this.domSelector.drawer).should('not.exist');
+    cy.get(selector.drawer).should('not.exist');
 
     cy.contains('button', 'Next').click();
     cy.contains('button', 'Submit').click();
-    cy.contains(this.data.submitSuccess);
+    cy.contains(data.submitSuccess);
 
     // back to route list page
     cy.contains('Goto List').click();
@@ -90,19 +111,17 @@ context('Create and delete route with limit-req form', () => {
 
   it('should delete the route', function () {
     cy.visit('/routes/list');
-    const {
-      domSelector,
-      data
-    } = this;
 
-    cy.get(domSelector.name).clear().type('routeName');
+    cy.get(selector.name).clear().type('routeName');
     cy.contains('Search').click();
     cy.contains('routeName').siblings().contains('More').click();
     cy.contains('Delete').click();
-    cy.get(domSelector.deleteAlert).should('be.visible').within(() => {
-      cy.contains('OK').click();
-    });
-    cy.get(domSelector.notification).should('contain', data.deleteRouteSuccess);
-    cy.get(domSelector.notificationCloseIcon).click();
+    cy.get(selector.deleteAlert)
+      .should('be.visible')
+      .within(() => {
+        cy.contains('OK').click();
+      });
+    cy.get(selector.notification).should('contain', data.deleteRouteSuccess);
+    cy.get(selector.notificationCloseIcon).click();
   });
 });