diff --git a/.github/workflows/templates/config.yaml b/.github/workflows/templates/config.yaml index b3d7e94e..df08d56c 100644 --- a/.github/workflows/templates/config.yaml +++ b/.github/workflows/templates/config.yaml @@ -4,7 +4,7 @@ tests: # name: capitalized noun form # testFilePrefix: node-update # for node-update.test.mjs - name: Integration - mochaPostfix: "--grep '.*\\/e2e\\/int\\/.*'" + mochaPostfix: "--grep '.*\\/e2e\\/integration\\/.*'" - name: Standard mochaPostfix: "--ignore '.*\\/unit\\/.*' --ignore '.*\\/e2e\\/commands\\/mirror_node.*' --ignore '.*\\/e2e\\/commands\\/node.*' --ignore '.*\\/e2e\\/commands\\/separate_node.*' --ignore '.*\\/e2e\\/commands\\/relay.*'" diff --git a/package.json b/package.json index f5a1af7b..314e4b20 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ }, "scripts": { "test": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Unit Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/unit' mocha --recursive --file 'test/setup.mjs' 'test/unit/**/*.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit.xml --check-leaks --timeout 20000", - "test-e2e-integration": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Integration All Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-integration' mocha --recursive --file 'test/setup.mjs' 'test/e2e/int/**/*.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-integration.xml --check-leaks --timeout 20000", + "test-e2e-integration": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Integration All Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-integration' mocha --recursive --file 'test/setup.mjs' 'test/e2e/integration/**/*.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-integration.xml --check-leaks --timeout 20000", "test-e2e-all": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E All Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-all' mocha --recursive --file 'test/setup.mjs' 'test/e2e/**/*.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-all.xml --check-leaks --timeout 20000", - "test-e2e-standard": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Standard Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-standard' mocha --recursive --file 'test/setup.mjs' 'test/e2e/**/*.mjs' --ignore 'test/unit/**/*.mjs' --ignore 'test/e2e/commands/mirror_node*.mjs' --ignore 'test/e2e/commands/node*.mjs' --ignore 'test/e2e/commands/separate_node*.mjs' --ignore 'test/e2e/commands/relay*.mjs' --ignore 'test/e2e/int/*' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-standard.xml --check-leaks --timeout 30000", + "test-e2e-standard": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Standard Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-standard' mocha --recursive --file 'test/setup.mjs' 'test/e2e/**/*.mjs' --ignore 'test/unit/**/*.mjs' --ignore 'test/e2e/commands/mirror_node*.mjs' --ignore 'test/e2e/commands/node*.mjs' --ignore 'test/e2e/commands/separate_node*.mjs' --ignore 'test/e2e/commands/relay*.mjs' --ignore 'test/e2e/integration/*' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-standard.xml --check-leaks --timeout 30000", "test-e2e-mirror-node": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Mirror Node Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-mirror-node' mocha --recursive --file 'test/setup.mjs' 'test/e2e/commands/mirror_node.test.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-mirror-node.xml --check-leaks --timeout 20000", "test-e2e-node-pem-stop": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Node PEM Stop Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-node-pem-stop' mocha --recursive --file 'test/setup.mjs' 'test/e2e/commands/node_pem_stop.test.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-node-pem-stop.xml --check-leaks --timeout 20000", "test-e2e-node-pem-kill": "cross-env NODE_OPTIONS=--experimental-vm-modules MOCHA_SUITE_NAME=\"Mocha E2E Node PEM Kill Tests\" nyc --reporter=text --reporter=html --report-dir='coverage/e2e-node-pem-kill' mocha --recursive --file 'test/setup.mjs' 'test/e2e/commands/node_pem_kill.test.mjs' --exit --reporter mocha-junit-reporter --reporter-options mochaFile=junit-e2e-node-pem-kill.xml --check-leaks --timeout 20000", diff --git a/test/e2e/int/core/account_manager.test.mjs b/test/e2e/integration/core/account_manager.test.mjs similarity index 100% rename from test/e2e/int/core/account_manager.test.mjs rename to test/e2e/integration/core/account_manager.test.mjs diff --git a/test/e2e/int/core/chart_manager.test.mjs b/test/e2e/integration/core/chart_manager.test.mjs similarity index 100% rename from test/e2e/int/core/chart_manager.test.mjs rename to test/e2e/integration/core/chart_manager.test.mjs diff --git a/test/e2e/int/core/dependency_managers/keytool_dependency_manager.test.mjs b/test/e2e/integration/core/dependency_managers/keytool_dependency_manager.test.mjs similarity index 100% rename from test/e2e/int/core/dependency_managers/keytool_dependency_manager.test.mjs rename to test/e2e/integration/core/dependency_managers/keytool_dependency_manager.test.mjs diff --git a/test/e2e/int/core/k8_e2e.test.mjs b/test/e2e/integration/core/k8_e2e.test.mjs similarity index 100% rename from test/e2e/int/core/k8_e2e.test.mjs rename to test/e2e/integration/core/k8_e2e.test.mjs diff --git a/test/e2e/int/core/package_downloader_e2e.test.mjs b/test/e2e/integration/core/package_downloader_e2e.test.mjs similarity index 100% rename from test/e2e/int/core/package_downloader_e2e.test.mjs rename to test/e2e/integration/core/package_downloader_e2e.test.mjs diff --git a/test/e2e/int/core/platform_installer_e2e.test.mjs b/test/e2e/integration/core/platform_installer_e2e.test.mjs similarity index 100% rename from test/e2e/int/core/platform_installer_e2e.test.mjs rename to test/e2e/integration/core/platform_installer_e2e.test.mjs