diff --git a/modules/40-define-functions/150-define-functions-return/Makefile b/modules/40-define-functions/150-define-functions-return/Makefile index d0d0a48..990011b 100644 --- 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: - @ test.sh + @ test2.sh diff --git a/modules/40-define-functions/150-define-functions-return/test.js b/modules/40-define-functions/150-define-functions-return/test.js index 0b0e7ca..3c89ec5 100644 --- a/modules/40-define-functions/150-define-functions-return/test.js +++ b/modules/40-define-functions/150-define-functions-return/test.js @@ -1,6 +1,6 @@ // @ts-check -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/40-define-functions/320-define-functions-parameters/Makefile b/modules/40-define-functions/320-define-functions-parameters/Makefile index d0d0a48..990011b 100644 --- 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: - @ test.sh + @ test2.sh diff --git a/modules/40-define-functions/320-define-functions-parameters/test.js b/modules/40-define-functions/320-define-functions-parameters/test.js index 9f1e6cf..94f41ca 100644 --- a/modules/40-define-functions/320-define-functions-parameters/test.js +++ b/modules/40-define-functions/320-define-functions-parameters/test.js @@ -1,6 +1,6 @@ // @ts-check -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/40-define-functions/340-define-functions-default-parameters/Makefile b/modules/40-define-functions/340-define-functions-default-parameters/Makefile index d0d0a48..990011b 100644 --- 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: - @ test.sh + @ test2.sh diff --git a/modules/40-define-functions/340-define-functions-default-parameters/test.js b/modules/40-define-functions/340-define-functions-default-parameters/test.js index 0bd6dab..f7966cd 100644 --- a/modules/40-define-functions/340-define-functions-default-parameters/test.js +++ b/modules/40-define-functions/340-define-functions-default-parameters/test.js @@ -1,6 +1,6 @@ // @ts-check -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/40-define-functions/450-define-functions-short-syntax/Makefile b/modules/40-define-functions/450-define-functions-short-syntax/Makefile index d0d0a48..990011b 100644 --- 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: - @ test.sh + @ test2.sh diff --git a/modules/40-define-functions/450-define-functions-short-syntax/test.js b/modules/40-define-functions/450-define-functions-short-syntax/test.js index 948f783..729ad22 100644 --- a/modules/40-define-functions/450-define-functions-short-syntax/test.js +++ b/modules/40-define-functions/450-define-functions-short-syntax/test.js @@ -1,6 +1,6 @@ // @ts-check -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/45-logic/10-bool-type/Makefile b/modules/45-logic/10-bool-type/Makefile index d0d0a48..990011b 100644 --- a/modules/45-logic/10-bool-type/Makefile +++ b/modules/45-logic/10-bool-type/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/45-logic/10-bool-type/test.js b/modules/45-logic/10-bool-type/test.js index 83bfa07..d4c5488 100644 --- a/modules/45-logic/10-bool-type/test.js +++ b/modules/45-logic/10-bool-type/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/45-logic/15-predicates/Makefile b/modules/45-logic/15-predicates/Makefile index d0d0a48..990011b 100644 --- a/modules/45-logic/15-predicates/Makefile +++ b/modules/45-logic/15-predicates/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/45-logic/15-predicates/test.js b/modules/45-logic/15-predicates/test.js index 0c7bdea..18ab079 100644 --- a/modules/45-logic/15-predicates/test.js +++ b/modules/45-logic/15-predicates/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/45-logic/20-logic-combine-expressions/Makefile b/modules/45-logic/20-logic-combine-expressions/Makefile index d0d0a48..990011b 100644 --- a/modules/45-logic/20-logic-combine-expressions/Makefile +++ b/modules/45-logic/20-logic-combine-expressions/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/45-logic/20-logic-combine-expressions/test.js b/modules/45-logic/20-logic-combine-expressions/test.js index b72ae09..f9c667a 100644 --- a/modules/45-logic/20-logic-combine-expressions/test.js +++ b/modules/45-logic/20-logic-combine-expressions/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/45-logic/25-logical-operators/Makefile b/modules/45-logic/25-logical-operators/Makefile index d0d0a48..990011b 100644 --- a/modules/45-logic/25-logical-operators/Makefile +++ b/modules/45-logic/25-logical-operators/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/45-logic/25-logical-operators/test.js b/modules/45-logic/25-logical-operators/test.js index bb15b2f..306888c 100644 --- a/modules/45-logic/25-logical-operators/test.js +++ b/modules/45-logic/25-logical-operators/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/45-logic/28-logical-negation/Makefile b/modules/45-logic/28-logical-negation/Makefile index d0d0a48..990011b 100644 --- a/modules/45-logic/28-logical-negation/Makefile +++ b/modules/45-logic/28-logical-negation/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/45-logic/28-logical-negation/test.js b/modules/45-logic/28-logical-negation/test.js index 0179921..1d0f612 100644 --- a/modules/45-logic/28-logical-negation/test.js +++ b/modules/45-logic/28-logical-negation/test.js @@ -1,6 +1,6 @@ // @ts-check -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/45-logic/70-logical-expressions/Makefile b/modules/45-logic/70-logical-expressions/Makefile index d0d0a48..990011b 100644 --- a/modules/45-logic/70-logical-expressions/Makefile +++ b/modules/45-logic/70-logical-expressions/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/45-logic/70-logical-expressions/test.js b/modules/45-logic/70-logical-expressions/test.js index b62d088..fc24996 100644 --- a/modules/45-logic/70-logical-expressions/test.js +++ b/modules/45-logic/70-logical-expressions/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/48-conditionals/30-if/Makefile b/modules/48-conditionals/30-if/Makefile index b7c38a9..943ecde 100644 --- a/modules/48-conditionals/30-if/Makefile +++ b/modules/48-conditionals/30-if/Makefile @@ -1,3 +1,3 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/48-conditionals/30-if/test.js b/modules/48-conditionals/30-if/test.js index 13d4949..a5346bf 100644 --- a/modules/48-conditionals/30-if/test.js +++ b/modules/48-conditionals/30-if/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/48-conditionals/40-if-else/Makefile b/modules/48-conditionals/40-if-else/Makefile index d0d0a48..990011b 100644 --- a/modules/48-conditionals/40-if-else/Makefile +++ b/modules/48-conditionals/40-if-else/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/48-conditionals/40-if-else/test.js b/modules/48-conditionals/40-if-else/test.js index 3167ede..6241c85 100644 --- a/modules/48-conditionals/40-if-else/test.js +++ b/modules/48-conditionals/40-if-else/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/48-conditionals/50-else-if/Makefile b/modules/48-conditionals/50-else-if/Makefile index d0d0a48..990011b 100644 --- a/modules/48-conditionals/50-else-if/Makefile +++ b/modules/48-conditionals/50-else-if/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/48-conditionals/50-else-if/test.js b/modules/48-conditionals/50-else-if/test.js index 8914324..7021534 100644 --- a/modules/48-conditionals/50-else-if/test.js +++ b/modules/48-conditionals/50-else-if/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/48-conditionals/60-ternary-operator/Makefile b/modules/48-conditionals/60-ternary-operator/Makefile index d0d0a48..990011b 100644 --- a/modules/48-conditionals/60-ternary-operator/Makefile +++ b/modules/48-conditionals/60-ternary-operator/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/48-conditionals/60-ternary-operator/test.js b/modules/48-conditionals/60-ternary-operator/test.js index 27ced3b..3511e44 100644 --- a/modules/48-conditionals/60-ternary-operator/test.js +++ b/modules/48-conditionals/60-ternary-operator/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/48-conditionals/65-switch/Makefile b/modules/48-conditionals/65-switch/Makefile index d0d0a48..990011b 100644 --- a/modules/48-conditionals/65-switch/Makefile +++ b/modules/48-conditionals/65-switch/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/48-conditionals/65-switch/test.js b/modules/48-conditionals/65-switch/test.js index d1b283f..cb177f0 100644 --- a/modules/48-conditionals/65-switch/test.js +++ b/modules/48-conditionals/65-switch/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/20-aggregation-numbers/Makefile b/modules/50-loops/20-aggregation-numbers/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/20-aggregation-numbers/Makefile +++ b/modules/50-loops/20-aggregation-numbers/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/20-aggregation-numbers/test.js b/modules/50-loops/20-aggregation-numbers/test.js index 358506b..3daa692 100644 --- a/modules/50-loops/20-aggregation-numbers/test.js +++ b/modules/50-loops/20-aggregation-numbers/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/23-aggregation-strings/Makefile b/modules/50-loops/23-aggregation-strings/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/23-aggregation-strings/Makefile +++ b/modules/50-loops/23-aggregation-strings/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/23-aggregation-strings/test.js b/modules/50-loops/23-aggregation-strings/test.js index 57d2a67..75c0563 100644 --- a/modules/50-loops/23-aggregation-strings/test.js +++ b/modules/50-loops/23-aggregation-strings/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/26-conditions-inside-loops/Makefile b/modules/50-loops/26-conditions-inside-loops/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/26-conditions-inside-loops/Makefile +++ b/modules/50-loops/26-conditions-inside-loops/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/26-conditions-inside-loops/test.js b/modules/50-loops/26-conditions-inside-loops/test.js index 5f6ce00..140d912 100644 --- a/modules/50-loops/26-conditions-inside-loops/test.js +++ b/modules/50-loops/26-conditions-inside-loops/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/28-build-strings/Makefile b/modules/50-loops/28-build-strings/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/28-build-strings/Makefile +++ b/modules/50-loops/28-build-strings/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/28-build-strings/test.js b/modules/50-loops/28-build-strings/test.js index 4af85ab..9c50671 100644 --- a/modules/50-loops/28-build-strings/test.js +++ b/modules/50-loops/28-build-strings/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/30-syntax-sugar/Makefile b/modules/50-loops/30-syntax-sugar/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/30-syntax-sugar/Makefile +++ b/modules/50-loops/30-syntax-sugar/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/30-syntax-sugar/test.js b/modules/50-loops/30-syntax-sugar/test.js index 496b844..1f6c329 100644 --- a/modules/50-loops/30-syntax-sugar/test.js +++ b/modules/50-loops/30-syntax-sugar/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/50-mutators/Makefile b/modules/50-loops/50-mutators/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/50-mutators/Makefile +++ b/modules/50-loops/50-mutators/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/50-mutators/test.js b/modules/50-loops/50-mutators/test.js index ed01b63..4f306b8 100644 --- a/modules/50-loops/50-mutators/test.js +++ b/modules/50-loops/50-mutators/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/55-return-from-loops/Makefile b/modules/50-loops/55-return-from-loops/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/55-return-from-loops/Makefile +++ b/modules/50-loops/55-return-from-loops/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/55-return-from-loops/test.js b/modules/50-loops/55-return-from-loops/test.js index 5fde2c4..4b92cc2 100644 --- a/modules/50-loops/55-return-from-loops/test.js +++ b/modules/50-loops/55-return-from-loops/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => { diff --git a/modules/50-loops/70-for/Makefile b/modules/50-loops/70-for/Makefile index d0d0a48..990011b 100644 --- a/modules/50-loops/70-for/Makefile +++ b/modules/50-loops/70-for/Makefile @@ -1,2 +1,2 @@ test: - @ test.sh + @ test2.sh diff --git a/modules/50-loops/70-for/test.js b/modules/50-loops/70-for/test.js index 65ceba9..d9fe59c 100644 --- a/modules/50-loops/70-for/test.js +++ b/modules/50-loops/70-for/test.js @@ -1,4 +1,4 @@ -import { test, expect } from '@jest/globals'; +import { test, expect } from 'vitest'; import f from './index.js'; test('test', () => {