apache · juzhiyuan · Aug 3, 2022 · Jul 31, 2022 · Jul 31, 2022 · Jul 31, 2022
diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml
@@ -25,6 +25,10 @@ defaults:
 jobs:
   web-e2e:
     name: Frontend e2e test
+    strategy:
+      fail-fast: false
+      matrix:
+        folderPrefix: ['consumer', 'route', 'plugin', 'rest']
     runs-on: ubuntu-latest
     services:
       etcd:
@@ -82,8 +86,7 @@ jobs:
 
       - name: Start frontend then test
         run: |
-          rm -rf cypress/integration/plugin
-          yarn test:e2e
+          yarn start-server-and-test 'cross-env SERVE_ENV=test yarn start' http-get://localhost:8000 'cross-env CYPRESS_SERVE_ENV=test yarn cypress run --spec "**/integration/${{matrix.folderPrefix}}/**.spec.js"'
 
       - name: Report e2e coverage
         run: npx nyc report --reporter=text-summary

diff --git a/.github/workflows/frontend-plugin-e2e-test.yml b/.github/workflows/frontend-plugin-e2e-test.yml
diff --git a/...ion/dashboard/dashboard-smoketest.spec.js → ...egration/rest/dashboard-smoketest.spec.js b/...ion/dashboard/dashboard-smoketest.spec.js → ...egration/rest/dashboard-smoketest.spec.js
diff --git a/.../integration/lang/switch-language.spec.js → ...gration/rest/lang-switch-language.spec.js b/.../integration/lang/switch-language.spec.js → ...gration/rest/lang-switch-language.spec.js
diff --git a/...reate-edit-delete-plugin-template.spec.js → ...reate-edit-delete-plugin-template.spec.js b/...reate-edit-delete-plugin-template.spec.js → ...reate-edit-delete-plugin-template.spec.js
diff --git a/...create-plugin-template-with-route.spec.js → ...create-plugin-template-with-route.spec.js b/...create-plugin-template-with-route.spec.js → ...create-plugin-template-with-route.spec.js
diff --git a/.../create_and_edit_and_delete_proto.spec.js → ...-create_and_edit_and_delete_proto.spec.js b/.../create_and_edit_and_delete_proto.spec.js → ...-create_and_edit_and_delete_proto.spec.js
diff --git a/...roto/table-auto-jump-when-no-data.spec.js → ...roto-table-auto-jump-when-no-data.spec.js b/...roto/table-auto-jump-when-no-data.spec.js → ...roto-table-auto-jump-when-no-data.spec.js
diff --git a/.../rawDataEditor/test-rawDataEditor.spec.js → .../rawDataEditor-test-rawDataEditor.spec.js b/.../rawDataEditor/test-rawDataEditor.spec.js → .../rawDataEditor-test-rawDataEditor.spec.js
diff --git a/...ervice/create-edit-delete-service.spec.js → ...ervice-create-edit-delete-service.spec.js b/...ervice/create-edit-delete-service.spec.js → ...ervice-create-edit-delete-service.spec.js
diff --git a/...reate-service-with-chash-upstream.spec.js → ...reate-service-with-chash-upstream.spec.js b/...reate-service-with-chash-upstream.spec.js → ...reate-service-with-chash-upstream.spec.js
diff --git a/...-service-with-not-select-upstream.spec.js → ...-service-with-not-select-upstream.spec.js b/...-service-with-not-select-upstream.spec.js → ...-service-with-not-select-upstream.spec.js
diff --git a/...e-with-service-discovery-upstream.spec.js → ...e-with-service-discovery-upstream.spec.js b/...e-with-service-discovery-upstream.spec.js → ...e-with-service-discovery-upstream.spec.js
diff --git a/...ervice/edit-service-with-upstream.spec.js → ...ervice-edit-service-with-upstream.spec.js b/...ervice/edit-service-with-upstream.spec.js → ...ervice-edit-service-with-upstream.spec.js
diff --git a/...ion/service/save-paginator-status.spec.js → ...est/service-save-paginator-status.spec.js b/...ion/service/save-paginator-status.spec.js → ...est/service-save-paginator-status.spec.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /* eslint-disable no-undef */
-import defaultSettings from '../../../config/defaultSettings';
+import defaultSettings from '../../../../../config/defaultSettings';
 
 context('Save Paginator Status', () => {
   const timeout = 300;

diff --git a/...vice/table-auto-jump-when-no-data.spec.js → ...vice-table-auto-jump-when-no-data.spec.js b/...vice/table-auto-jump-when-no-data.spec.js → ...vice-table-auto-jump-when-no-data.spec.js
diff --git a/...ation/settings/settings-smoketest.spec.js → ...tegration/rest/settings-smoketest.spec.js b/...ation/settings/settings-smoketest.spec.js → ...tegration/rest/settings-smoketest.spec.js
diff --git a/...ess/integration/ssl/ssl-smoketest.spec.js → ...ss/integration/rest/ssl-smoketest.spec.js b/...ess/integration/ssl/ssl-smoketest.spec.js → ...ss/integration/rest/ssl-smoketest.spec.js
diff --git a/...stream/create_and_delete_upstream.spec.js → ...stream-create_and_delete_upstream.spec.js b/...stream/create_and_delete_upstream.spec.js → ...stream-create_and_delete_upstream.spec.js
diff --git a/...it_upstream_with_custom_chash_key.spec.js → ...it_upstream_with_custom_chash_key.spec.js b/...it_upstream_with_custom_chash_key.spec.js → ...it_upstream_with_custom_chash_key.spec.js
diff --git a/...e_and_edit_upstream_with_no_nodes.spec.js → ...e_and_edit_upstream_with_no_nodes.spec.js b/...e_and_edit_upstream_with_no_nodes.spec.js → ...e_and_edit_upstream_with_no_nodes.spec.js
diff --git a/...ream/table-auto-jump-when-no-data.spec.js → ...ream-table-auto-jump-when-no-data.spec.js b/...ream/table-auto-jump-when-no-data.spec.js → ...ream-table-auto-jump-when-no-data.spec.js
diff --git a/web/cypress/integration/user/login.spec.js → ...press/integration/rest/user-login.spec.js b/web/cypress/integration/user/login.spec.js → ...press/integration/rest/user-login.spec.js
diff --git a/web/cypress/integration/user/logout.spec.js → ...ress/integration/rest/user-logout.spec.js b/web/cypress/integration/user/logout.spec.js → ...ress/integration/rest/user-logout.spec.js