Reflect bats changes (https://github.com/exercism/bash/pull/541)

bin/run.sh

@@ -66,14 +66,17 @@ run_tests() {
     # Run tests and pipe output to results.out file.
 
     local slug="$1"
-    local test_file=${slug//-/_}_test.sh
+    local test_file=${slug//-/_}.bats
     local solution_dir="$2"
     local output_file="$3"
 
     echo "Running tests."
 
     cd "$solution_dir"
 
+    # test scripts may be (old) xxxx_test.sh
+    [[ -f "$test_file" ]] || test_file=${slug//-/_}_test.sh
+
     sed -i 's/load bats-extra.bash/load bats-extra/' "$test_file" || true
 
     echo "Test output:"

tests/data/middle_fails/expected_results.json

@@ -1 +1 @@
-{ "version": 2, "status": "fail", "tests": [{ "name": "say one", "status": "pass" },{ "name": "say two", "status": "fail", "message": "(in test file middle_fails_test.sh, line 12)\n  `[ \"$output\" == \"two\" ]' failed\n"},{ "name": "say three", "status": "pass" }]}
+{ "version": 2, "status": "fail", "tests": [{ "name": "say one", "status": "pass" },{ "name": "say two", "status": "fail", "message": "(in test file middle_fails.bats, line 12)\n  `[ \"$output\" == \"two\" ]' failed\n"},{ "name": "say three", "status": "pass" }]}

tests/data/missing_script/expected_results.json

@@ -1 +1 @@
-{ "version": 2, "status": "fail", "tests": [{ "name": "say hello", "status": "fail", "message": "(in test file missing_script_test.sh, line 5)\n  `[ \"$status\" -eq 0 ]' failed with status 127\n"}]}
+{ "version": 2, "status": "fail", "tests": [{ "name": "say hello", "status": "fail", "message": "(in test file missing_script.bats, line 5)\n  `[ \"$status\" -eq 0 ]' failed with status 127\n"}]}