remove jest

fey · fey · commit 59e493a7c81a · 2025-04-01T21:52:18.000+05:00
diff --git a/.yamllint b/.yamllint
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,10 @@
 FROM hexletbasics/base-image
 
 ENV NODE_PATH=/exercises-javascript/src
-ENV PATH=/exercises-javascript/bin:$PATH
+ENV PATH=/exercises-javascript/bin:/exercises-javascript/node_modules/.bin:$PATH
 
 WORKDIR /exercises-javascript
 
-RUN npm i -g vitest
 COPY package.json package-lock.json ./
 RUN npm ci
 
diff --git a/Makefile b/Makefile
@@ -8,23 +8,26 @@ compose:
 compose-build:
 	docker-compose build
 
+compose-down:
+	docker-compose down -v --remove-orphans
+
 compose-install:
-	docker-compose run exercises npm ci
+	docker-compose run --rm exercises npm ci
 
 code-lint:
 	npx eslint modules
 
 compose-bash:
-	docker-compose run exercises bash
+	docker-compose run --rm exercises bash
 
 compose-test:
-	docker-compose run exercises make test
+	docker-compose run --rm exercises make test
 
 compose-description-lint:
-	docker-compose run exercises make description-lint
+	docker-compose run --rm exercises make description-lint
 
 compose-schema-validate:
-	docker-compose run exercises make schema-validate
+	docker-compose run --rm exercises make schema-validate
 
 ci-check:
 	docker-compose --file docker-compose.yml build
diff --git a/bin/test.sh b/bin/test.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-npx jest --colors `pwd`/test.js
+FORCE_COLOR=1 vitest related --run `pwd`/test.js
diff --git a/bin/test2.sh b/bin/test2.sh
diff --git a/modules/10-basics/10-hello-world/Makefile b/modules/10-basics/10-hello-world/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/10-basics/20-comments/Makefile b/modules/10-basics/20-comments/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/10-basics/40-instructions/Makefile b/modules/10-basics/40-instructions/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/10-basics/45-testing/Makefile b/modules/10-basics/45-testing/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/10-basics/50-syntax-errors/Makefile b/modules/10-basics/50-syntax-errors/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/20-basic/Makefile b/modules/20-arithmetics/20-basic/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/25-operator/Makefile b/modules/20-arithmetics/25-operator/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/27-commutativity/Makefile b/modules/20-arithmetics/27-commutativity/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/30-composition/Makefile b/modules/20-arithmetics/30-composition/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/40-priority/Makefile b/modules/20-arithmetics/40-priority/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/50-float/Makefile b/modules/20-arithmetics/50-float/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/60-infinity/Makefile b/modules/20-arithmetics/60-infinity/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/70-nan/Makefile b/modules/20-arithmetics/70-nan/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/20-arithmetics/80-linting/Makefile b/modules/20-arithmetics/80-linting/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/25-strings/10-quotes/Makefile b/modules/25-strings/10-quotes/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/25-strings/15-escape-characters/Makefile b/modules/25-strings/15-escape-characters/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/25-strings/20-string-concatenation/Makefile b/modules/25-strings/20-string-concatenation/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/25-strings/30-encoding/Makefile b/modules/25-strings/30-encoding/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/10-definition/Makefile b/modules/30-variables/10-definition/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/11-change/Makefile b/modules/30-variables/11-change/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/13-variables-naming/Makefile b/modules/30-variables/13-variables-naming/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/14-errors/Makefile b/modules/30-variables/14-errors/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/15-variables-expressions/Makefile b/modules/30-variables/15-variables-expressions/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/18-variable-concatenation/Makefile b/modules/30-variables/18-variable-concatenation/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/19-naming-style/Makefile b/modules/30-variables/19-naming-style/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/20-magic-numbers/Makefile b/modules/30-variables/20-magic-numbers/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/23-constants/Makefile b/modules/30-variables/23-constants/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/25-interpolation/Makefile b/modules/30-variables/25-interpolation/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/30-variables/30-symbols/Makefile b/modules/30-variables/30-symbols/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/33-data-types/10-primitive-data-types/Makefile b/modules/33-data-types/10-primitive-data-types/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/33-data-types/45-undefined/Makefile b/modules/33-data-types/45-undefined/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/33-data-types/47-data-types-immutability/Makefile b/modules/33-data-types/47-data-types-immutability/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/33-data-types/50-data-types-weak-typing/Makefile b/modules/33-data-types/50-data-types-weak-typing/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/100-call/Makefile b/modules/35-calling-functions/100-call/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/110-math/Makefile b/modules/35-calling-functions/110-math/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/120-function-signature/Makefile b/modules/35-calling-functions/120-function-signature/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/135-calling-functions-default-arguments/Makefile b/modules/35-calling-functions/135-calling-functions-default-arguments/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/150-calling-functions-expression/Makefile b/modules/35-calling-functions/150-calling-functions-expression/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/180-variadic-parameters/Makefile b/modules/35-calling-functions/180-variadic-parameters/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/270-deterministic/Makefile b/modules/35-calling-functions/270-deterministic/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/35-calling-functions/350-stdlib/Makefile b/modules/35-calling-functions/350-stdlib/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/38-properties/100-properties-syntax/Makefile b/modules/38-properties/100-properties-syntax/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/38-properties/200-properties-methods/Makefile b/modules/38-properties/200-properties-methods/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/38-properties/300-properties-immutability/Makefile b/modules/38-properties/300-properties-immutability/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/38-properties/400-properties-expressions/Makefile b/modules/38-properties/400-properties-expressions/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/38-properties/500-properties-chain-of-methods/Makefile b/modules/38-properties/500-properties-chain-of-methods/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/40-define-functions/100-define-functions-syntax/Makefile b/modules/40-define-functions/100-define-functions-syntax/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/40-define-functions/150-define-functions-return/Makefile b/modules/40-define-functions/150-define-functions-return/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/40-define-functions/320-define-functions-parameters/Makefile b/modules/40-define-functions/320-define-functions-parameters/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/40-define-functions/340-define-functions-default-parameters/Makefile b/modules/40-define-functions/340-define-functions-default-parameters/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/40-define-functions/450-define-functions-short-syntax/Makefile b/modules/40-define-functions/450-define-functions-short-syntax/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/45-logic/10-bool-type/Makefile b/modules/45-logic/10-bool-type/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/45-logic/15-predicates/Makefile b/modules/45-logic/15-predicates/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/45-logic/20-logic-combine-expressions/Makefile b/modules/45-logic/20-logic-combine-expressions/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/45-logic/25-logical-operators/Makefile b/modules/45-logic/25-logical-operators/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/45-logic/28-logical-negation/Makefile b/modules/45-logic/28-logical-negation/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/45-logic/70-logical-expressions/Makefile b/modules/45-logic/70-logical-expressions/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/48-conditionals/30-if/Makefile b/modules/48-conditionals/30-if/Makefile
@@ -1,3 +1,2 @@
 test:
-	@ test2.sh
-
+	@ test.sh
diff --git a/modules/48-conditionals/40-if-else/Makefile b/modules/48-conditionals/40-if-else/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/48-conditionals/50-else-if/Makefile b/modules/48-conditionals/50-else-if/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/48-conditionals/60-ternary-operator/Makefile b/modules/48-conditionals/60-ternary-operator/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/48-conditionals/65-switch/Makefile b/modules/48-conditionals/65-switch/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/10-while/Makefile b/modules/50-loops/10-while/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/20-aggregation-numbers/Makefile b/modules/50-loops/20-aggregation-numbers/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/23-aggregation-strings/Makefile b/modules/50-loops/23-aggregation-strings/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/25-iteration-over-string/Makefile b/modules/50-loops/25-iteration-over-string/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/26-conditions-inside-loops/Makefile b/modules/50-loops/26-conditions-inside-loops/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/28-build-strings/Makefile b/modules/50-loops/28-build-strings/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/30-syntax-sugar/Makefile b/modules/50-loops/30-syntax-sugar/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/50-mutators/Makefile b/modules/50-loops/50-mutators/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/55-return-from-loops/Makefile b/modules/50-loops/55-return-from-loops/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/modules/50-loops/70-for/Makefile b/modules/50-loops/70-for/Makefile
@@ -1,2 +1,2 @@
 test:
-	@ test2.sh
+	@ test.sh
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/tests.js b/src/tests.js

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		-npx jest --colors `pwd`/test.js
	`3`	+FORCE_COLOR=1 vitest related --run `pwd`/test.js
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`test:`
`2`		`- @ test2.sh`
	`2`	`+ @ test.sh`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,2 @@ @@
 test:
 -	@ test2.sh
+-
 +	@ test.sh