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.

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

test: add frontend e2e test (edit and search route) #1093

Merged
merged 18 commits into from
Dec 29, 2020
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,25 @@

context('Create and Delete Route', () => {
const name = `routeName${new Date().valueOf()}`;
const newName = `newName${new Date().valueOf()}`;
const sleepTime = 100;

beforeEach(() => {
// init login
cy.login();
})

it('create route', () => {
it('should create route', () => {
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
// go to route create page
cy.visit('/');
cy.contains('Route').click();
cy.contains('Create').click();

// input Name And Description
// input name and description
cy.get('#name').type(name);
cy.get('#desc').type('desc');

// input Request Basic Define
// input request basic define
cy.get('#hosts_0').type('11.11.11.11');
cy.get('[data-cy=addHost]').click();
cy.get('#hosts_1').type('12.12.12.12');
Expand All @@ -43,7 +45,7 @@ context('Create and Delete Route', () => {
cy.get('#remote_addrs_1').type('10.10.10.10');
cy.contains('Advanced Routing Matching Conditions').parent().siblings().contains('Create').click();

// create Advanced Routing Matching Conditions
// create advanced routing matching conditions
cy.get('#position').click();
cy.contains('Cookie').click();
cy.get('.ant-modal').within(() => {
Expand All @@ -56,6 +58,7 @@ context('Create and Delete Route', () => {

// go to step2
cy.contains('Next').click();
cy.wait(sleepTime * 3);
cy.get('#nodes_0_host').type('12.12.12.12')

// go to step3
Expand All @@ -70,18 +73,35 @@ context('Create and Delete Route', () => {
// go to step4
cy.contains('Next').click();
cy.contains('Submit').click();
cy.contains('SubmitSuccessfully');
cy.contains('Submit Successfully');

// back to route list page
cy.contains('Return Route List').click();
cy.contains('Goto List').click();
cy.url().should('contains', 'routes/list');
});

it('delete the route', () => {
it('should edit the route', () => {
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
cy.visit('/');
cy.contains('Route').click();
cy.contains('Edit').click();
// input new name and newdescription
cy.get('#name').clear().type(newName);
cy.get('#desc').clear().type('new desc');
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Submit').click();
cy.contains('Submit Successfully');
cy.contains('Goto List').click();
cy.url().should('contains', 'routes/list');
cy.contains(newName).siblings().should('contain', 'new desc')
});

it('should delete the route', () => {
cy.visit('/routes/list');
cy.get('[title=Name]').type(name);
cy.contains('查 询').click();
cy.contains(name).siblings().contains('Delete').click();
cy.get('[title=Name]').type(newName);
cy.contains('Query').click();
cy.contains(newName).siblings().contains('Delete').click();
cy.contains('button', 'Confirm').click();
cy.get('.ant-notification-notice-message').should('contain', 'Delete Route Successfully');
})
Expand Down
85 changes: 85 additions & 0 deletions web/cypress/integration/route/search-route.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint-disable no-undef */

context('Create and Search Route', () => {
beforeEach(() => {
// init login
cy.login();
})

it('should create route test1, test2, test3', () => {
// go to route create page
cy.visit('/');
cy.contains('Route').click();
for (let i = 0; i < 3; i++) {
cy.contains('Create').click();
cy.get('#name').type('test' + i);
cy.get('#desc').type('desc' + i);
cy.get('#hosts_0').type('11.11.11.11');
cy.contains('Next').click();
cy.wait(400);
cy.get('#nodes_0_host').type('12.12.12.12', {
timeout: 500
});
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Submit').click();
cy.contains('Submit Successfully');
// back to route list page
cy.contains('Goto List').click();
cy.url().should('contains', 'routes/list');
}

});

it('should search the route', () => {
cy.visit('/');
cy.contains('Route').click();
// full match
cy.get('[title=Name]').type('test1');
cy.contains('Query').click();
cy.contains('test1').siblings().should('contain', 'desc1')
cy.contains('test0').should('not.exist');
cy.contains('test2').should('not.exist');
// partial match
cy.reload()
cy.get('[title=Name]').type('test');
cy.contains('Query').click();
cy.contains('test0').siblings().should('contain', 'desc0')
cy.contains('test1').siblings().should('contain', 'desc1')
cy.contains('test2').siblings().should('contain', 'desc2')
// no match
cy.reload()
cy.get('[title=Name]').type('testx');
cy.contains('Query').click();
cy.contains('test0').should('not.exist');
cy.contains('test1').should('not.exist');
cy.contains('test2').should('not.exist');

});

it('should delete the route', () => {
cy.visit('/routes/list');
for (let i = 0; i < 3; i++) {
cy.contains('test' + i).siblings().contains('Delete').click();
cy.contains('button', 'Confirm').click();
cy.get('.ant-notification-notice-message').should('contain', 'Delete Route Successfully');
cy.wait(300);
}
})
})
36 changes: 36 additions & 0 deletions web/src/hooks/useForceIntl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { useEffect } from 'react';
import { getIntl } from 'umi';

/**
* Force convert some texts with i18n
*/
const useForceIntl = () => {
useEffect(() => {
const hasProTable = Boolean(document.querySelector('.ant-pro-table-search'));

if (!hasProTable) {
return;
}

const { locale } = getIntl();
if (locale === 'zh-cn') {
return;
}

// NOTE: i18n in https://procomponents.ant.design/components/table/ is not working
const i18nMapper = [
['//span[text()="查 询"]', 'Query'],
['//span[text()="重 置"]', 'Reset'],
];

i18nMapper.forEach(([XPathExpression, targetText]) => {
const ele = document.evaluate(XPathExpression, document).iterateNext() as HTMLElement;
if (!ele) {
return;
}
ele.innerText = targetText;
});
}, []);
};

export default useForceIntl;
4 changes: 4 additions & 0 deletions web/src/pages/Consumer/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ import { history, useIntl } from 'umi';
import { PlusOutlined } from '@ant-design/icons';

import { timestampToLocaleString } from '@/helpers';
import useForceIntl from '@/hooks/useForceIntl';

import { fetchList, remove } from './service';

const Page: React.FC = () => {
useForceIntl()

const ref = useRef<ActionType>();
const { formatMessage } = useIntl();

Expand Down
3 changes: 3 additions & 0 deletions web/src/pages/Route/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ import { history, useIntl } from 'umi';
import { PlusOutlined, BugOutlined } from '@ant-design/icons';

import { timestampToLocaleString } from '@/helpers';
import useForceIntl from '@/hooks/useForceIntl';
import { fetchList, remove, fetchLabelList, updateRouteStatus } from './service';
import { DebugDrawView } from './components/DebugViews';


const { OptGroup, Option } = Select;

const Page: React.FC = () => {
useForceIntl()
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved

const ref = useRef<ActionType>();
const { formatMessage } = useIntl();

Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Route/components/ResultView/ResultView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const ResultView: React.FC<Props> = (props) => {
return (
<Result
status="success"
title={`${formatMessage({ id: 'component.global.submit' })}${formatMessage({
title={`${formatMessage({ id: 'component.global.submit' })} ${formatMessage({
id: 'component.status.success',
})}`}
extra={[
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Route/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/
export default {
'page.route.button.returnList': 'Return Route List',
'page.route.button.returnList': 'Goto List',
'page.route.button.send': 'Send',
'page.route.onlineDebug': 'Online Debug',

Expand Down
2 changes: 2 additions & 0 deletions web/src/pages/SSL/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ import { PlusOutlined } from '@ant-design/icons';

import { fetchList, remove as removeSSL } from '@/pages/SSL/service';
import { timestampToLocaleString } from '@/helpers';
import useForceIntl from '@/hooks/useForceIntl';

const Page: React.FC = () => {
useForceIntl()
const tableRef = useRef<ActionType>();
const { formatMessage } = useIntl();

Expand Down
4 changes: 4 additions & 0 deletions web/src/pages/Service/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
import { PlusOutlined } from '@ant-design/icons';
import { Button, notification, Popconfirm, Space } from 'antd';

import useForceIntl from '@/hooks/useForceIntl';

import { fetchList, remove } from './service';

const Page: React.FC = () => {
useForceIntl()

const ref = useRef<ActionType>();
const { formatMessage } = useIntl();

Expand Down
3 changes: 3 additions & 0 deletions web/src/pages/Upstream/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ import { Popconfirm, Button, notification } from 'antd';
import { history, useIntl } from 'umi';
import { PlusOutlined } from '@ant-design/icons';
import { timestampToLocaleString } from '@/helpers';
import useForceIntl from '@/hooks/useForceIntl';

import { fetchList, remove } from './service';

const Page: React.FC = () => {
useForceIntl()

const ref = useRef<ActionType>();

const { formatMessage } = useIntl();
Expand Down