This is an automated email from the ASF dual-hosted git repository. sunyi 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 26b583c chore: fix spelling (#1519) 26b583c is described below commit 26b583c75c1fb55507b5d4da1d6b4b0fcd63fe1e Author: John Bampton <jbamp...@users.noreply.github.com> AuthorDate: Fri Feb 26 15:13:46 2021 +1000 chore: fix spelling (#1519) --- CHANGELOG.md | 6 +++--- .../handler/route_online_debug/route_online_debug.go | 2 +- api/internal/handler/upstream/upstream_test.go | 2 +- api/test/e2e/route_export_test.go | 4 ++-- api/test/shell/cli_test.sh | 6 +++--- web/cypress/integration/route/import_export_route.spec.js | 4 ++-- web/cypress/integration/route/online-debug.spec.js | 4 ++-- web/cypress/plugins/index.js | 2 +- web/src/components/Upstream/UpstreamForm.tsx | 12 ++++++------ 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7bb9f6..6d4713d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,7 +60,7 @@ This release mainly improves basic features, bugfix and adds test cases. ### Test Case -- Use ginkgo framwork to do backend E2E testing. [#1319](https://github.com/apache/apisix-dashboard/pull/1319) +- Use ginkgo framework to do backend E2E testing. [#1319](https://github.com/apache/apisix-dashboard/pull/1319) - Add action to check the version for release. [#1418](https://github.com/apache/apisix-dashboard/pull/1418) - Add test for make build. [#1421](https://github.com/apache/apisix-dashboard/pull/1421) - Remove the etcd dependency in part of unit test. [#1169](https://github.com/apache/apisix-dashboard/pull/1469) @@ -71,7 +71,7 @@ This release mainly improves basic features, bugfix and adds test cases. ### Doc -- Doc: add document for introducing bakend e2e test. [#1381](https://github.com/apache/apisix-dashboard/pull/1381) +- Doc: add document for introducing backend e2e test. [#1381](https://github.com/apache/apisix-dashboard/pull/1381) # 2.3.0 @@ -107,7 +107,7 @@ This release mainly improve basic features, bugfix and adds test cases. - Support access log for Manager API. [#994](https://github.com/apache/apisix-dashboard/pull/994) - Enhance error log for Manager API. [#977](https://github.com/apache/apisix-dashboard/pull/977) -- Integrate with code-mirror to have a fallback to plugins's render issue. [#898](https://github.com/apache/apisix-dashboard/pull/898) +- Integrate with code-mirror to have a fallback to plugins render issue. [#898](https://github.com/apache/apisix-dashboard/pull/898) - Support priority field in Route module. [#1006](https://github.com/apache/apisix-dashboard/pull/1006) - Add etcd basic auth support [#951](https://github.com/apache/apisix-dashboard/pull/951) diff --git a/api/internal/handler/route_online_debug/route_online_debug.go b/api/internal/handler/route_online_debug/route_online_debug.go index 3f8da4a..a419757 100644 --- a/api/internal/handler/route_online_debug/route_online_debug.go +++ b/api/internal/handler/route_online_debug/route_online_debug.go @@ -83,7 +83,7 @@ func (h *Handler) DebugRequestForwarding(c droplet.Context) (interface{}, error) return ret, err } - return &data.SpecCodeResponse{StatusCode: http.StatusBadRequest}, fmt.Errorf("protocol unspported %s", protocol) + return &data.SpecCodeResponse{StatusCode: http.StatusBadRequest}, fmt.Errorf("protocol unsupported %s", protocol) } type HTTPProtocolSupport struct { diff --git a/api/internal/handler/upstream/upstream_test.go b/api/internal/handler/upstream/upstream_test.go index 6ea8c7c..85ef525 100644 --- a/api/internal/handler/upstream/upstream_test.go +++ b/api/internal/handler/upstream/upstream_test.go @@ -1406,7 +1406,7 @@ func TestUpstream_Patch(t *testing.T) { } } -func TestUptreams_Delete(t *testing.T) { +func TestUpstreams_Delete(t *testing.T) { tests := []struct { caseDesc string giveInput *BatchDelete diff --git a/api/test/e2e/route_export_test.go b/api/test/e2e/route_export_test.go index 24cffa8..9088a7b 100644 --- a/api/test/e2e/route_export_test.go +++ b/api/test/e2e/route_export_test.go @@ -318,7 +318,7 @@ func TestRoute_Export(t *testing.T) { ExpectBody: "{\"components\":{},\"info\":{\"title\":\"RoutesExport\",\"version\":\"3.0.0\"},\"openapi\":\"3.0.0\",\"paths\":{" + exportStrR2 + "," + exportStrR1 + "}}", }, { - Desc: "use the exportall inerface to export all routes", + Desc: "use the exportall interface to export all routes", Object: ManagerApiExpect(t), Method: http.MethodGet, Path: "/apisix/admin/export/routes", @@ -2448,7 +2448,7 @@ func TestRoute_Export_Equal_URI(t *testing.T) { Sleep: sleepTime, }, { - Desc: "use the exportall inerface to export all routes", + Desc: "use the exportall interface to export all routes", Object: ManagerApiExpect(t), Method: http.MethodGet, Path: "/apisix/admin/export/routes/r1,r2,r3", diff --git a/api/test/shell/cli_test.sh b/api/test/shell/cli_test.sh index 75e3a32..749c297 100755 --- a/api/test/shell/cli_test.sh +++ b/api/test/shell/cli_test.sh @@ -345,7 +345,7 @@ sleep 6 clean_up # etcd prefix test -# disable etcd autentication +# disable etcd authentication resp=$(curl -L http://localhost:2379/v3/auth/authenticate -X POST -d '{"name": "root", "password": "root"}') etcd_token=$(echo ${resp}|grep -oE "token\".*\"(.*)\""|awk -F[:\"] '{print $4}') if [ -z "${etcd_token}" ]; then @@ -439,7 +439,7 @@ sleep 3 resp=$(curl http://127.0.0.1:9000/apisix/admin/user/login -H "Content-Type: application/json" -d '{"username":"admin", "password": "admin"}') token=$(echo "${resp}" | sed 's/{/\n/g' | sed 's/,/\n/g' | grep "token" | sed 's/:/\n/g' | sed '1d' | sed 's/}//g' | sed 's/"//g') if [ -z "${token}" ]; then - echo "login failed(mTLS connetct to ETCD)" + echo "login failed(mTLS connect to ETCD)" exit 1 fi @@ -448,7 +448,7 @@ resp=$(curl -ig -XPUT http://127.0.0.1:9000/apisix/admin/consumers -i -H "Conten respCode=$(echo "${resp}" | sed 's/{/\n/g'| sed 's/,/\n/g' | grep "code" | sed 's/:/\n/g' | sed '1d') respMessage=$(echo "${resp}" | sed 's/{/\n/g'| sed 's/,/\n/g' | grep "message" | sed 's/:/\n/g' | sed '1d') if [ "$respCode" != "0" ] || [ $respMessage != "\"\"" ]; then - echo "verify writing data failed(mTLS connetct to ETCD)" + echo "verify writing data failed(mTLS connect to ETCD)" exit 1 fi diff --git a/web/cypress/integration/route/import_export_route.spec.js b/web/cypress/integration/route/import_export_route.spec.js index d1f2e3c..d8730cf 100644 --- a/web/cypress/integration/route/import_export_route.spec.js +++ b/web/cypress/integration/route/import_export_route.spec.js @@ -89,9 +89,9 @@ context('import and export routes', () => { cy.contains(routeLocaleUS['page.route.button.exportOpenApi']).should('not.disabled'); // click Export OpenAPI Button cy.contains(routeLocaleUS['page.route.button.exportOpenApi']).click(); - // after click enabled export button, popup confirm should appeare + // after click enabled export button, popup confirm should appear cy.contains(routeLocaleUS['page.route.exportRoutesTips']).should('exist'); - // click Confirm button in the popup to download Json file(debault option) + // click Confirm button in the popup to download Json file(default option) cy.contains(componentLocaleUS['component.global.confirm']).click(); // export 2 routes with type yaml diff --git a/web/cypress/integration/route/online-debug.spec.js b/web/cypress/integration/route/online-debug.spec.js index 5acf8b8..1ff3906 100644 --- a/web/cypress/integration/route/online-debug.spec.js +++ b/web/cypress/integration/route/online-debug.spec.js @@ -48,7 +48,7 @@ context('Online debug', () => { cy.fixture('selector.json').as('domSelector'); }); - it('shoule not show the invalid url notification', function () { + it('should not show the invalid url notification', function () { cy.visit('/'); cy.contains(menuLocaleUS['menu.routes']).click(); @@ -66,7 +66,7 @@ context('Online debug', () => { }); }); - it('shoule not show the invalid url notification', function () { + it('should not show the invalid url notification', function () { cy.visit('/'); cy.contains(menuLocaleUS['menu.routes']).click(); diff --git a/web/cypress/plugins/index.js b/web/cypress/plugins/index.js index ba65a92..83fa824 100644 --- a/web/cypress/plugins/index.js +++ b/web/cypress/plugins/index.js @@ -26,7 +26,7 @@ module.exports = (on, config) => { on('task', { findFile(mask) { if (!mask) { - throw new Error('Missing a file mask to seach'); + throw new Error('Missing a file mask to search'); } return globby(mask).then((list) => { diff --git a/web/src/components/Upstream/UpstreamForm.tsx b/web/src/components/Upstream/UpstreamForm.tsx index 09aca93..3052dde 100644 --- a/web/src/components/Upstream/UpstreamForm.tsx +++ b/web/src/components/Upstream/UpstreamForm.tsx @@ -77,7 +77,7 @@ const UpstreamForm: React.FC<Props> = forwardRef( const [readonly, setReadonly] = useState( Boolean(form.getFieldValue('upstream_id')) || disabled, ); - const [hidenForm, setHidenForm] = useState(false); + const [hiddenForm, setHiddenForm] = useState(false); const timeoutFields = [ { @@ -103,12 +103,12 @@ const UpstreamForm: React.FC<Props> = forwardRef( const { upstream_id } = form.getFieldsValue(); if (upstream_id === 'None') { - setHidenForm(true); + setHiddenForm(true); if (required) { requestAnimationFrame(() => { form.resetFields(); form.setFieldsValue(DEFAULT_UPSTREAM); - setHidenForm(false); + setHiddenForm(false); }); } } else { @@ -120,7 +120,7 @@ const UpstreamForm: React.FC<Props> = forwardRef( if (!required && !Object.keys(formData).length) { requestAnimationFrame(() => { form.setFieldsValue({ upstream_id: 'None' }); - setHidenForm(true); + setHiddenForm(true); }); } } @@ -649,7 +649,7 @@ const UpstreamForm: React.FC<Props> = forwardRef( disabled={disabled} onChange={(upstream_id) => { setReadonly(Boolean(upstream_id)); - setHidenForm(Boolean(upstream_id === 'None')); + setHiddenForm(Boolean(upstream_id === 'None')); form.setFieldsValue(list.find((item) => item.id === upstream_id)); if (upstream_id === '') { form.resetFields(); @@ -673,7 +673,7 @@ const UpstreamForm: React.FC<Props> = forwardRef( </Form.Item> )} - {!hidenForm && ( + {!hiddenForm && ( <> <Form.Item label={formatMessage({ id: 'page.upstream.step.type' })}