Clean-up from PR 47 (#59)

Author: SleeplessByte

.gitignore

@@ -26,3 +26,8 @@ yarn-error.log
 /out
 /production_node_modules
 /package.template.json
+
+# Fixture development files
+/test/fixtures/**/node_modules
+/test/fixtures/**/package-lock.json
+/test/fixtures/**/results.json

.prettierignore

@@ -8,3 +8,10 @@
 
 /.yarn
 /.yarnrc.yml
+
+# These are org-wide files (https://github.com/exercism/org-wide-files/)
+/.github/labels.yml
+/.github/workflows/sync-labels.yml
+
+/CODE_OF_CONDUCT.md
+/LICENSE

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 4.0.0
+
+- Add missing features from javascript-test-runner
+- Add proper corejs (and babel) support for mismatching solutions
+- Change implementation to support jest 29
+- Change package of `chalk` to lower major
+- Use Yarn 3
+
 ## 3.0.0
 
 - Rewritten for jest 17

bin/run.sh

@@ -104,7 +104,6 @@ echo ""
 configuration_file="${INPUT}.meta/config.json"
 local_configuration_file="${INPUT}.exercism/config.json"
 
-
 # Prepare the test file(s)
 mkdir -p "${OUTPUT}"
 
@@ -129,6 +128,17 @@ else
   fi;
 fi;
 
+if test -d "${OUTPUT}node_modules"; then
+  echo "Did not expect node_modules in output directory, but here we are"
+else
+  ln -s "${ROOT}/node_modules" "${OUTPUT}node_modules"
+  echo "Symlinked ${OUTPUT}node_modules (${ROOT}/node_modules)"
+fi;
+
+# Rename babel.config.js and package.json
+mv "${OUTPUT}babel.config.js" "${OUTPUT}babel.config.js.__exercism.bak" || true
+mv "${OUTPUT}package.json" "${OUTPUT}package.json.__exercism.bak" || true
+
 # Put together the path to the test results file
 result_file="${OUTPUT}results.json"
 
@@ -163,6 +173,10 @@ if [ $test_exit -eq 2 ]
 then
   echo "tsc compilation failed"
 
+  # Restore babel.config.js and package.json
+  mv "${OUTPUT}babel.config.js.__exercism.bak" "${OUTPUT}babel.config.js" || true
+  mv "${OUTPUT}package.json.__exercism.bak" "${OUTPUT}package.json" || true
+
   # Compose the message to show to the student
   #
   # TODO: interpret the tsc_result lines and pull out the source.
@@ -196,6 +210,10 @@ fi
 # Convert exit(1) (jest worked, but there are failing tests) to exit(0)
 test_exit=$?
 
+# Restore babel.config.js and package.json
+mv "${OUTPUT}babel.config.js.__exercism.bak" "${OUTPUT}babel.config.js" || true
+mv "${OUTPUT}package.json.__exercism.bak" "${OUTPUT}package.json" || true
+
 echo ""
 echo "Find the output at:"
 echo $result_file

run-in-docker.bat

@@ -0,0 +1,32 @@
+@@ -0,0 +1,31 @@
+@REM Only works in bash for windows and similar terminals that accept / paths
+
+@REM Synopsis:
+@REM Test runner for run.sh in a docker container
+@REM Takes the same arguments as run.sh (EXCEPT THAT SOLUTION AND OUTPUT PATH ARE RELATIVE)
+@REM Builds the Dockerfile
+@REM Runs the docker image passing along the initial arguments
+
+@REM Arguments:
+@REM $1: exercise slug
+@REM $2: **RELATIVE** path to solution folder (without trailing slash)
+@REM $3: **RELATIVE** path to output directory (without trailing slash)
+
+@REM Output:
+@REM Writes the tests output to the output directory
+
+@REM Example:
+@REM ./run-in-docker.bat two-fer ./relative/path/to/two-fer/solution/folder/ ./relative/path/to/output-directory/
+@REM ./run-in-docker.bat two-fer ./test/fixtures/two-fer/pass ./test/fixtures/two-fer/pass
+
+@REM build docker image
+docker build -t typescript-test-runner .
+
+@REM run image passing the arguments
+docker run^
+ --network none^
+ --read-only^
+ --mount type=bind,src=%cd%/%2,dst=/solution/^
+ --mount type=bind,src=%cd%/%3,dst=/output/^
+ --mount type=tmpfs,dst=/tmp^
+ typescript-test-runner %1 /solution/ /output/