Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add page reload judgment #2370

Merged
merged 14 commits into from
May 6, 2022
Merged

feat: add page reload judgment #2370

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ddb64f0
feat: add page reload judgment
oil-oil Mar 9, 2022
629ca33
feat: add test case
oil-oil Mar 12, 2022
c9f1684
feat: add requestWithToken command
oil-oil Mar 15, 2022
b148e46
fix: modify manual action to send request
oil-oil Mar 15, 2022
6cfad8e
fix: udpate test case
oil-oil Mar 15, 2022
8278d2e
fix: add test case wait time
oil-oil Mar 15, 2022
2bfb532
fix: update test case
oil-oil Mar 15, 2022
d6274a5
fix: modify the test case code structure
oil-oil Mar 16, 2022
24fd393
fix: update proto test case
oil-oil Mar 16, 2022
8f616c3
fix: update test case
oil-oil Mar 16, 2022
a797c9b
fix: remove the force attribute of the click event
oil-oil Mar 22, 2022
ca5b007
fix: delete extra characters
oil-oil Mar 22, 2022
b23afeb
fix: update hook type
oil-oil Mar 30, 2022
5b6671c
fix: move requestWithToken position
oil-oil Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions web/cypress/integration/consumer/table-auto-jump-when-no-data.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ context('Table Auto Jump When No Data', () => {
deleteConsumerSuccess: 'Delete Consumer Successfully',
};

beforeEach(() => {
before(() => {
cy.login();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cy.login();
cy.login().then( () => { cy.requestWithToken({ method: 'PUT', payload, url: '/apisix/admin/consumers' });
});

Array.from({ length: 11 }).forEach((value, key) => {
const payload = {
Expand All @@ -59,12 +59,12 @@ context('Table Auto Jump When No Data', () => {
cy.contains('Consumer').click();
cy.get(selector.page_item).click();
cy.wait(1000);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why wait for 1 s?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oil-oil ping

cy.contains('Delete').click({ force: true });
cy.contains('Delete').click();
cy.get(selector.popoper)
.not(selector.popoprerHiden)
.contains('Confirm')
.should('be.visible')
.click({ force: true });
.click();
cy.get(selector.notification).should('contain', data.deleteConsumerSuccess);
cy.get(selector.notificationCloseIcon).click();
cy.url().should('contains', '/consumer/list?page=1&pageSize=10');
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/integration/proto/table-auto-jump-when-no-data.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ context('Batch Create Proto And Delete Proto', () => {
deleteProtoSuccess: 'Delete proto Successfully',
};

beforeEach(() => {
before(() => {
cy.login();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Array.from({ length: 11 }).forEach(async (value, key) => {
const payload = {
Expand Down
4 changes: 2 additions & 2 deletions web/cypress/integration/route/table-auto-jump-when-no-data.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ context('Table Auto Jump When No Data', () => {
deleteRouteSuccess: 'Delete Route Successfully',
};

beforeEach(() => {
before(() => {
cy.login();
Array.from({ length: 11 }).forEach((value, key) => {
const payload = {
Expand Down Expand Up @@ -75,7 +75,7 @@ context('Table Auto Jump When No Data', () => {
cy.get(selector.deleteAlert)
.should('be.visible')
.within(() => {
cy.contains('OK').click({ force: true });
cy.contains('OK').click();
});
cy.get(selector.notification).should('contain', data.deleteRouteSuccess);
cy.get(selector.notificationCloseIcon).click();
Expand Down
1 change: 1 addition & 0 deletions web/cypress/integration/upstream/table-auto-jump-when-no-data.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ context('Table Auto Jump When No Data', () => {
size: 320,
idle_timeout: 60,
requests: 1000,
ß,
},
nodes: {
'127.0.0.1': 1,
Expand Down