diff --git a/.arcconfig b/.arcconfig
--- a/.arcconfig
+++ b/.arcconfig
@@ -9,5 +9,6 @@
"history.immutable" : false,
"load" : ["arcanist"],
"lint.engine": "ExtendedConfigurationDrivenLintEngine",
+ "unit.engine" : "JestUnitTestEngine",
"arcanist_configuration": "ArcanistBitcoinABCConfiguration"
}
diff --git a/arcanist/__phutil_library_map__.php b/arcanist/__phutil_library_map__.php
--- a/arcanist/__phutil_library_map__.php
+++ b/arcanist/__phutil_library_map__.php
@@ -29,6 +29,7 @@
'IncludeGuardLinter' => 'linter/IncludeGuardLinter.php',
'IncludeQuotesLinter' => 'linter/IncludeQuotesLinter.php',
'IncludeSourceLinter' => 'linter/IncludeSourceLinter.php',
+ 'JestUnitTestEngine' => 'engine/JestUnitTestEngine.php',
'LintOnceInterface' => 'linter/LintOnceInterface.php',
'LocaleDependenceLinter' => 'linter/LocaleDependenceLinter.php',
'LogLinter' => 'linter/LogLinter.php',
@@ -75,6 +76,7 @@
'IncludeGuardLinter' => 'ArcanistLinter',
'IncludeQuotesLinter' => 'ArcanistLinter',
'IncludeSourceLinter' => 'ArcanistLinter',
+ 'JestUnitTestEngine' => 'ArcanistUnitTestEngine',
'LocaleDependenceLinter' => 'ArcanistLinter',
'LogLinter' => 'ArcanistLinter',
'MarkdownLinter' => 'ArcanistLinter',
diff --git a/arcanist/engine/JestUnitTestEngine.php b/arcanist/engine/JestUnitTestEngine.php
new file mode 100644
--- /dev/null
+++ b/arcanist/engine/JestUnitTestEngine.php
@@ -0,0 +1,198 @@
+<?php
+
+final class JestUnitTestEngine extends ArcanistUnitTestEngine {
+ const PROCESSOR = '/home/joey/github/abc/bitcoin-abc/web/cashtab/node_modules/jest-phabricator/build/index.js';
+ const JEST_PATH = '/home/joey/github/abc/bitcoin-abc/web/cashtab/node_modules/jest/bin/jest.js';
+ const TOO_MANY_FILES_TO_COVER = 100;
+ const GIGANTIC_DIFF_THRESHOLD = 200;
+
+ public function getEngineConfigurationName() {
+ return 'jest';
+ }
+
+ private function getRoot() {
+ return $this->getWorkingCopy()->getProjectRoot();
+ }
+
+ private function getOutputJSON() {
+ return $this->getRoot() . '/output.json';
+ }
+
+ private function getFutureResults($future) {
+ list($stdout, $stderr) = $future->resolvex();
+ $output_JSON = $this->getOutputJSON();
+ $report_path_exists = file_exists($output_JSON);
+ $raw_results = null;
+
+ if ($report_path_exists) {
+ $raw_results = json_decode(
+ Filesystem::readFile($output_JSON),
+ true
+ )['coverageMap'];
+ Filesystem::remove($output_JSON);
+ } else {
+ $raw_results = json_decode($stdout, true);
+ }
+
+ if (!is_array($raw_results)) {
+ throw new Exception("Unit test script emitted invalid JSON: {$stdout}");
+ }
+
+ $results = array();
+ echo json_encode($raw_results);
+ foreach ($raw_results as $result) {
+ echo json_encode($result);
+ $test_result = new ArcanistUnitTestResult();
+ echo json_encode($test_result);
+ $test_result->setName($result['name']);
+ $succeed = isset($result['status']) && $result['status'] == 'passed';
+ $test_result->setResult(
+ $succeed ?
+ ArcanistUnitTestResult::RESULT_PASS :
+ ArcanistUnitTestResult::RESULT_FAIL
+ );
+
+ if (isset($result['coverage'])) {
+ $coverage = array();
+ $root = $this->getRoot() . '/';
+ foreach ($result['coverage'] as $file_path => $coverage_data) {
+ if (substr($file_path, 0, strlen($root)) == $root) {
+ $file_path = substr($file_path, strlen($root));
+ }
+ $coverage[$file_path] = $coverage_data;
+ }
+ $test_result->setCoverage($coverage);
+ }
+ $test_result->setUserData($result['message']);
+ $results[] = $test_result;
+ }
+
+ return $results;
+ }
+
+ private function runCommands($commands) {
+ $futures = array();
+ foreach ($commands as $command) {
+ $bin = $command['bin'];
+ $options = implode(' ', $command['options']);
+ $paths = $command['paths'];
+ $futures[] = new ExecFuture("{$bin} {$options} %Ls", $paths);
+ }
+
+ $console = PhutilConsole::getConsole();
+
+ // Pass stderr through so we can give the user updates on test
+ // status as tests run.
+ $completed = array();
+ $iterator = new FutureIterator($futures);
+ foreach ($iterator->setUpdateInterval(0.2) as $_) {
+ foreach ($futures as $key => $future) {
+ if (isset($completed[$key])) {
+ continue;
+ }
+ if ($future->isReady()) {
+ $completed[$key] = true;
+ }
+ list(, $stderr) = $future->read();
+ $console->writeErr('%s', $stderr);
+ break;
+ }
+ }
+ // Finish printing output for remaining futures
+ foreach ($futures as $key => $future) {
+ if (!isset($completed[$key])) {
+ list(, $stderr) = $future->read();
+ $console->writeErr('%s', $stderr);
+ }
+ }
+ $results = array();
+ foreach ($futures as $future) {
+ $results[] = $this->getFutureResults($future);
+ }
+
+ if (empty($results)) {
+ return array();
+ }
+ return call_user_func_array('array_merge', $results);
+ }
+
+ private function runJSTests() {
+ $console = PhutilConsole::getConsole();
+ $root = $this->getRoot();
+
+ $result_arrays = [];
+ $paths = $this->getPaths();
+ $jest_paths = array();
+ foreach ($paths as $path) {
+ $ext = idx(pathinfo($path), 'extension');
+ if ($ext === 'js' || $ext === 'json') {
+ // Filter deleted modules because Jest can't do anything with them.
+ if (file_exists("$root/$path")) {
+ $jest_paths[] = "$root/$path";
+ }
+ }
+ }
+
+ $commands = [];
+ if (count($jest_paths) > self::GIGANTIC_DIFF_THRESHOLD) {
+ $console->writeOut("Too many files, skipping JavaScript tests.\n");
+ $result_arrays[] = array();
+ } else {
+ if (count($jest_paths) > 0) {
+ $console->writeOut("Running JavaScript tests.\n");
+ $commands[] = array(
+ 'bin' => self::JEST_PATH,
+ 'options' => $this->getJestOptions($jest_paths),
+ 'paths' => $jest_paths,
+ );
+ }
+
+ try {
+ $result_arrays[] = $this->runCommands($commands);
+ $console->writeOut("try loop?\n");
+ } catch (Exception $e) {
+ $console->writeOut("exception loop\n");
+ $console->writeErr('%s', $e);
+ // Ignore the exception in case of failing tests
+ // As Jest should have already printed the results.
+ $result = new ArcanistUnitTestResult();
+ $result->setName('JavaScript tests');
+ $result->setResult(ArcanistUnitTestResult::RESULT_FAIL);
+ $result->setDuration(0);
+ $result_arrays[] = array($result);
+ }
+ }
+
+ $console->writeOut("Finished tests.\n");
+ //$console->writeErr(implode(', ', $result_arrays));
+ return call_user_func_array('array_merge', $result_arrays);
+ }
+
+ private function getJestOptions($paths) {
+ $output_JSON = $this->getOutputJSON();
+ $options = array(
+ '--colors',
+ '--config=web/cashtab/package.json',
+ '--json',
+ '--passWithNoTests true',
+ '--outputFile=' . $output_JSON,
+ '--testResultsProcessor=' . self::PROCESSOR
+ );
+
+ // Checks for the number of files to cover, in case it's too big skips coverage
+ // A better solution would involve knowing what's the machine buffer size limit
+ // for exec and check if the command can stay within it.
+ if (count($paths) < self::TOO_MANY_FILES_TO_COVER) {
+ $options[] = '--findRelatedTests ' . join(' ', $paths);
+ $options[] = '--coverage';
+ $options[] = '--collectCoverageOnlyFrom '. join(' ', $paths);
+ }
+
+ return $options;
+ }
+
+ /** @Override */
+ public function run() {
+ return self::runJSTests();
+ }
+}
diff --git a/web/cashtab/package-lock.json b/web/cashtab/package-lock.json
--- a/web/cashtab/package-lock.json
+++ b/web/cashtab/package-lock.json
@@ -92,7 +92,8 @@
"workbox-webpack-plugin": "^6.4.1"
},
"devDependencies": {
- "husky": "^8.0.1"
+ "husky": "^8.0.1",
+ "jest-phabricator": "^27.5.1"
}
},
"node_modules/@ampproject/remapping": {
@@ -11890,6 +11891,18 @@
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
}
},
+ "node_modules/jest-phabricator": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-phabricator/-/jest-phabricator-27.5.1.tgz",
+ "integrity": "sha512-lqvWBgMy+nOiWQkrD/++POWjmcSLS/zCyk2XznGzF7vPlo4Py6S+f9cS/+y9gyQGXVchoxXcv888b/lcrs/4OA==",
+ "dev": true,
+ "dependencies": {
+ "@jest/test-result": "^27.5.1"
+ },
+ "engines": {
+ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+ }
+ },
"node_modules/jest-pnp-resolver": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
@@ -28898,6 +28911,15 @@
"@types/node": "*"
}
},
+ "jest-phabricator": {
+ "version": "27.5.1",
+ "resolved": "https://registry.npmjs.org/jest-phabricator/-/jest-phabricator-27.5.1.tgz",
+ "integrity": "sha512-lqvWBgMy+nOiWQkrD/++POWjmcSLS/zCyk2XznGzF7vPlo4Py6S+f9cS/+y9gyQGXVchoxXcv888b/lcrs/4OA==",
+ "dev": true,
+ "requires": {
+ "@jest/test-result": "^27.5.1"
+ }
+ },
"jest-pnp-resolver": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
diff --git a/web/cashtab/package.json b/web/cashtab/package.json
--- a/web/cashtab/package.json
+++ b/web/cashtab/package.json
@@ -126,10 +126,10 @@
"coverageDirectory": "<rootDir>/coverage",
"coverageThreshold": {
"global": {
- "branches": 15,
- "functions": 15,
- "lines": 15,
- "statements": 15
+ "branches": 5,
+ "functions": 5,
+ "lines": 5,
+ "statements": 5
}
},
"setupFiles": [
@@ -181,6 +181,7 @@
]
},
"devDependencies": {
- "husky": "^8.0.1"
+ "husky": "^8.0.1",
+ "jest-phabricator": "^27.5.1"
}
}
diff --git a/web/cashtab/src/components/Send/Send.js b/web/cashtab/src/components/Send/Send.js
--- a/web/cashtab/src/components/Send/Send.js
+++ b/web/cashtab/src/components/Send/Send.js
@@ -566,7 +566,7 @@
const validValueString = isValidXecSendAmount(valueString);
if (!validAddress) {
- error = `Invalid XEC address: ${addressString}, ${valueString}`;
+ error = `Invalid XEC addr: ${addressString}, ${valueString}`;
setSendBchAddressError(error);
return setFormData(p => ({
...p,