test: add the create and delete plugin in drawer #1597

stu01509 · 2021-03-15T23:23:02Z

Please answer these questions before submitting a pull request

Why submit this pull request?
Bugfix
New feature provided
Improve performance
Backport patches
Related issues
Fix test: delete button in plugin drawer #1411

New feature or improvement

Describe the details and related test reports.

Add the cypress test case to testing the plugin delete in the drawer.

Please add the corresponding test cases if necessary.

codecov-io · 2021-03-16T02:12:19Z

Codecov Report

Merging #1597 (8331f4a) into master (548bbe3) will increase coverage by 0.19%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1597      +/-   ##
==========================================
+ Coverage   71.05%   71.24%   +0.19%     
==========================================
  Files          47       47              
  Lines        3116     3116              
==========================================
+ Hits         2214     2220       +6     
+ Misses        658      653       -5     
+ Partials      244      243       -1

Flag	Coverage Δ
backend-e2e-test	`61.97% <ø> (+0.19%)`	⬆️
backend-e2e-test-ginkgo	`47.75% <ø> (-0.17%)`	⬇️
backend-unit-test	`51.81% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
api/internal/core/store/store.go	`89.15% <0.00%> (+1.20%)`	⬆️
api/internal/core/storage/etcd.go	`47.27% <0.00%> (+3.63%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 548bbe3...8331f4a. Read the comment docs.

juzhiyuan · 2021-03-16T05:33:28Z

also cc @guoqqqi to review

guoqqqi · 2021-03-16T08:38:59Z

web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js

+    cy.fixture('plugin-dataset.json').as('cases');
+    cy.get('@cases').then((cases) => {
+      cy.configurePlugins(cases);
+    });
+  });


In this test we don't need to create all the plugins, it takes up more time than necessary, we just need to create a few plugin examples to test that the deletion functions properly.

guoqqqi · 2021-03-16T08:41:01Z

web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js

@@ -45,7 +45,6 @@ context('Create and Delete Plugin List', () => {
      .then(() => {
        cy.get('.ant-drawer-footer').contains('button', 'Delete').click();
        cy.contains('button', 'Confirm').click({ force: true });
-        cy.get(this.domSelector.empty).should('be.visible');
      });


This assertion ensures that the plugin can be removed in its entirety properly, and I think it's best that we don't remove it

any update here?

guoqqqi · 2021-03-16T08:44:34Z

Hi, We need to test the functionality not only on the plug-in page but also on the route page and the service page to make sure it works.

LiteSun · 2021-03-19T07:01:12Z

ping~

nic-chen · 2021-03-19T10:46:00Z

ping @stu01509

…ete-plugin-in-darwer

stu01509 · 2021-03-19T13:51:08Z

Hi, We need to test the functionality not only on the plug-in page but also on the route page and the service page to make sure it works.

Hi

Actually, I only found it the plugin page, where could I find in the route page and services page?

guoqqqi · 2021-03-19T14:01:15Z

Hi,you can find it in the Create, Configure Plugin step.

guoqqqi · 2021-03-20T04:28:18Z

CI error: https://github.com/apache/apisix-dashboard/pull/1597/checks?check_run_id=2148899222
This CI error has been fixed in #1584.

stu01509 · 2021-03-20T05:20:50Z

Hi @guoqqqi and @juzhiyuan

Update the commit.

nic-chen · 2021-03-20T08:07:35Z

@stu01509 FE e2e test failed

…ete-plugin-in-darwer

guoqqqi · 2021-03-21T07:15:36Z

The CI error is because the plugin has not been removed. Please refer to：
web/cypress/integration/plugin/create-edit-delete-plugin.spec.js

…ete-plugin-in-darwer

stu01509 · 2021-03-21T14:25:40Z

I updated the commit, but it seems like occurred the error in backend test case.

guoqqqi · 2021-03-21T16:02:19Z

web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js

+ */
+/* eslint-disable no-undef */
+
+context('Create and Delete Plugin List', () => {


Suggested change

context('Create and Delete Plugin List', () => {

context('Delete Plugin List with the Drawer', () => {

guoqqqi · 2021-03-21T16:05:59Z

web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js

+    cy.contains('basic-auth').parents('.ant-card-bordered').within(() => {
+      cy.get('button').click({ force: true });
+    });
+
+    cy.get('.ant-drawer-content').should('be.visible').within(() => {
+      cy.get('#disable').click();
+      cy.get('.ant-switch-checked').should('exist');
+    });
+
+    cy.contains('button', 'Submit').click();
+    cy.get('.ant-drawer-content', { timeout }).should('not.exist');
+  });


Please use this.domSelector... and this.data..., refer to other test cases.

guoqqqi · 2021-03-21T16:08:52Z

web/cypress/integration/plugin/create-delete-in-drawer-plugin.spec.js

+    cy.visit('/plugin/list');
+    cy.get(this.domSelector.refresh).click();
+    cy.contains('button', 'Edit').click();
+    cy.get('.ant-drawer-footer').contains('button', 'Delete').click({ force: true });


The dom element can be moved to public data for other tests use.

guoqqqi · 2021-03-21T16:17:37Z

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

+    cy.contains('prometheus').parents('.ant-card-bordered').within(() => {
+      cy.get('button').click({ force: true });
+    });
+
+    cy.get('.ant-drawer-content').should('be.visible').within(() => {
+      cy.get('#disable').click();
+      cy.get('.ant-switch-checked').should('exist');
+    });
+
+    cy.contains('button', 'Submit').click();
+    cy.get('.ant-drawer-content', { timeout }).should('not.exist');
+
+    cy.contains('prometheus').parents('.ant-card-bordered').within(() => {
+      cy.get('button').click({ force: true });
    });
-    cy.contains('button', 'Cancel').click();
+
+    cy.get('.ant-drawer-footer').contains('button', 'Delete').click({ force: true });
+    cy.contains('button', 'Confirm').click({ force: true });
+


Also use this.domSelector.. and this.data...
I think another step should be added: check that the plugin was successfully removed after it was deleted.

guoqqqi · 2021-03-21T16:19:07Z

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

+    cy.contains('prometheus').parents('.ant-card-bordered').within(() => {
+      cy.get('button').click({ force: true });
+    });
+
+    cy.get('.ant-drawer-content').should('be.visible').within(() => {
+      cy.get('#disable').click();
+      cy.get('.ant-switch-checked').should('exist');
+    });
+
+    cy.contains('button', 'Submit').click();
+    cy.get('.ant-drawer-content', { timeout }).should('not.exist');
+
+    cy.contains('prometheus').parents('.ant-card-bordered').within(() => {
+      cy.get('button').click({ force: true });
+    });
+
+    cy.get('.ant-drawer-footer').contains('button', 'Delete').click({ force: true });
+    cy.contains('button', 'Confirm').click({ force: true });
+


stu01509 · 2021-03-22T00:33:21Z

Hi @guoqqqi

Update the commit, please review it again.

nic-chen · 2021-03-22T03:06:37Z

@stu01509 please sync codes from branch master

stu01509 · 2021-03-22T04:10:12Z

Hello @nic-chen

Update the commit.

LiteSun · 2021-03-22T08:41:49Z

Hi, @guoqqqi, I remember that you developed this delete feature, please make sure that this test is fully covered

web/cypress/fixtures/selector.json

guoqqqi · 2021-03-22T08:58:43Z

Hi, @stu01509 Again these pages need to be tested.

guoqqqi · 2021-03-22T09:25:48Z

As the function is in a public component, it can be tested once and there is no need to add tests for other pages. Thanks.

LiteSun · 2021-03-22T09:32:15Z

As the function is in a public component, it can be tested once and there is no need to add tests for other pages. Thanks.

The tests corresponding to route and service are unnecessary? @guoqqqi

stu01509 · 2021-03-22T09:33:51Z

Update the commit.

…u01509/apisix-dashboard into fix-#1411-add-delete-plugin-in-darwer

stu01509 added 2 commits March 16, 2021 07:19

test: add the create and delter plugin in drawer

4a93880

test: add the create and delter plugin in drawer

fc10167

nic-chen requested review from juzhiyuan, LiteSun and liuxiran March 16, 2021 03:51

guoqqqi reviewed Mar 16, 2021

View reviewed changes

stu01509 added 2 commits March 19, 2021 18:52

Merge remote-tracking branch 'upstream/master' into fix-#1411-add-del…

0fffb5e

…ete-plugin-in-darwer

test: add the create and delter plugin in drawer

bf6915f

test: adjust the create and delter plugin in drawer

9577f51

test: adjust the create and delter plugin in drawer

0054591

stu01509 added 3 commits March 20, 2021 16:19

test: adjust the create and delter plugin in drawer

053740e

Merge remote-tracking branch 'upstream/master' into fix-#1411-add-del…

6fe03a2

…ete-plugin-in-darwer

test: adjust the create and delter plugin in drawer

2e49eca

stu01509 added 6 commits March 21, 2021 15:55

test: adjust the create and delter plugin in drawer

9ec5acb

test: adjust the create and delter plugin in drawer

bb28992

test: adjust the create and delter plugin in drawer

1367477

test: adjust the create and delter plugin in drawer

99a4275

test: adjust the create and delter plugin in drawer

2a561ac

Merge remote-tracking branch 'upstream/master' into fix-#1411-add-del…

e7d7609

…ete-plugin-in-darwer

guoqqqi requested changes Mar 21, 2021

View reviewed changes

test: adjust test data.json and selector.json files

b7857f0

LiteSun and others added 2 commits March 22, 2021 12:07

Merge branch 'master' into fix-#1411-add-delete-plugin-in-darwer

af1f43f

Merge branch 'master' into fix-#1411-add-delete-plugin-in-darwer

8331f4a

LiteSun approved these changes Mar 22, 2021

View reviewed changes

guoqqqi reviewed Mar 22, 2021

View reviewed changes

web/cypress/fixtures/selector.json Outdated Show resolved Hide resolved

test: adjust test data.json and selector.json files

34b2d85

Merge branch 'fix-#1411-add-delete-plugin-in-darwer' of github.com:st…

9cdd1f2

…u01509/apisix-dashboard into fix-#1411-add-delete-plugin-in-darwer

juzhiyuan approved these changes Mar 22, 2021

View reviewed changes

bzp2010 approved these changes Mar 22, 2021

View reviewed changes

liuxiran approved these changes Mar 22, 2021

View reviewed changes

membphis approved these changes Mar 22, 2021

View reviewed changes

membphis merged commit 85efb37 into apache:master Mar 22, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: add the create and delete plugin in drawer #1597

test: add the create and delete plugin in drawer #1597

stu01509 commented Mar 15, 2021

codecov-io commented Mar 16, 2021 •

edited

Loading

juzhiyuan commented Mar 16, 2021

guoqqqi Mar 16, 2021

guoqqqi Mar 16, 2021

juzhiyuan Mar 19, 2021

guoqqqi commented Mar 16, 2021

LiteSun commented Mar 19, 2021

nic-chen commented Mar 19, 2021

stu01509 commented Mar 19, 2021

guoqqqi commented Mar 19, 2021

guoqqqi commented Mar 20, 2021

stu01509 commented Mar 20, 2021

nic-chen commented Mar 20, 2021

guoqqqi commented Mar 21, 2021

stu01509 commented Mar 21, 2021 •

edited

Loading

guoqqqi Mar 21, 2021

guoqqqi Mar 21, 2021

guoqqqi Mar 21, 2021

guoqqqi Mar 21, 2021

guoqqqi Mar 21, 2021

stu01509 commented Mar 22, 2021

nic-chen commented Mar 22, 2021

stu01509 commented Mar 22, 2021

LiteSun commented Mar 22, 2021

guoqqqi commented Mar 22, 2021

guoqqqi commented Mar 22, 2021

LiteSun commented Mar 22, 2021

stu01509 commented Mar 22, 2021

	context('Create and Delete Plugin List', () => {
	context('Delete Plugin List with the Drawer', () => {

test: add the create and delete plugin in drawer #1597

test: add the create and delete plugin in drawer #1597

Conversation

stu01509 commented Mar 15, 2021

New feature or improvement

Please add the corresponding test cases if necessary.

codecov-io commented Mar 16, 2021 • edited Loading

Codecov Report

juzhiyuan commented Mar 16, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guoqqqi commented Mar 16, 2021

LiteSun commented Mar 19, 2021

nic-chen commented Mar 19, 2021

stu01509 commented Mar 19, 2021

guoqqqi commented Mar 19, 2021

guoqqqi commented Mar 20, 2021

stu01509 commented Mar 20, 2021

nic-chen commented Mar 20, 2021

guoqqqi commented Mar 21, 2021

stu01509 commented Mar 21, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stu01509 commented Mar 22, 2021

nic-chen commented Mar 22, 2021

stu01509 commented Mar 22, 2021

LiteSun commented Mar 22, 2021

guoqqqi commented Mar 22, 2021

guoqqqi commented Mar 22, 2021

LiteSun commented Mar 22, 2021

stu01509 commented Mar 22, 2021

codecov-io commented Mar 16, 2021 •

edited

Loading

stu01509 commented Mar 21, 2021 •

edited

Loading