Merge pull request #319 from hexlet-basics/vitest-exerices

Vitest exerices

Author: fey

Dockerfile

@@ -1,16 +1,14 @@
 FROM hexletbasics/base-image:latest
 
-WORKDIR /exercises-typescript
-
-COPY package.json .
+ENV PATH=/exercises-typescript/bin:/exercises-typescript/node_modules/.bin:$PATH
+# ENV NODE_OPTIONS --max-old-space-size=4096
+# --experimental-vm-modules
+ENV CI=true
 
-COPY package-lock.json .
+WORKDIR /exercises-typescript
 
-RUN npm install
+RUN npm i -g vitest
+COPY package.json package-lock.json ./
+RUN npm ci
 
 COPY . .
-
-ENV PATH /exercises-typescript/bin:/exercises-typescript/node_modules/.bin:$PATH
-# ENV NODE_OPTIONS --max-old-space-size=4096
-# --experimental-vm-modules
-ENV CI true

Makefile

@@ -41,4 +41,4 @@ ci-check:
 	docker compose --file docker-compose.yml up --abort-on-container-exit
 
 test-fast:
-	npx jest
+	npx vitest

bin/test2.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+FORCE_COLOR=1 vitest related --run `pwd`/test.ts

eslint.config.js

@@ -0,0 +1,12 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  {files: ["**/*.{js,mjs,cjs,ts}"]},
+  {languageOptions: { globals: globals.browser }},
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+];

jest.config.js

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/10-hello-world/Makefile

@@ -1,8 +1,9 @@
+import { expect, test, vi } from 'vitest'
 import * as path from 'path';
-import * as sinon from 'sinon';
 
 test('hello world', async () => {
-  const spy = sinon.spy(console, 'log');
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
   await import(path.join(__dirname, 'index'));
-  sinon.assert.calledWith(spy, 'Hello, World!');
+  const firstArg = consoleLogSpy.mock.calls[0]?.[0];
+  expect(firstArg).toBe('Hello, World!')
 });

modules/10-basics/10-hello-world/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/20-typescript-as-a-second-language/Makefile

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
+ 
 
 // BEGIN
 function multiply(a: number, b: number) {

modules/10-basics/20-typescript-as-a-second-language/index.ts

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import multiply from './index';
 

modules/10-basics/20-typescript-as-a-second-language/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/30-variables/Makefile

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
+ 
 
 function repeat(text: string, count: number) {
   // BEGIN

modules/10-basics/30-variables/index.ts

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import repeat from './index';
 

modules/10-basics/30-variables/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/40-named-functions/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import getHiddenCard from './index';
 

modules/10-basics/40-named-functions/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/45-anonymous-functions/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import getEvenNumbers from './index';
 

modules/10-basics/45-anonymous-functions/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/50-arrays/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import filterAnagrams from './index';
 

modules/10-basics/50-arrays/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/55-objects/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import isComplete from './index';
 

modules/10-basics/55-objects/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/60-enums/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import buildModal, { ModalStatus } from './index';
 

modules/10-basics/60-enums/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/70-type-aliases/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import getOlderUser, { User } from './index';
 

modules/10-basics/70-type-aliases/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/80-any/Makefile

@@ -1,6 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+ 
+ 
+ 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 // BEGIN

modules/10-basics/80-any/index.ts

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import getParams from './index';
 
 test('function', () => {

modules/10-basics/80-any/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/10-basics/90-modules/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import authorize from './index';
 
 test('function', () => {

modules/10-basics/90-modules/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/10-function-as-parameter/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import filter from './index';
 
 test('function', () => {

modules/20-functions/10-function-as-parameter/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/20-optional-parameters-in-callbacks/Makefile

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+ 
 
 // BEGIN
 function map(numbers: number[], callback: (n: number, index: number) => number): number[] {

modules/20-functions/20-optional-parameters-in-callbacks/index.ts

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import map from './index';
 
 test('map', () => {

modules/20-functions/20-optional-parameters-in-callbacks/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/30-void/Makefile

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { expect, test } from 'vitest'
 import forEach from './index';
 
 test('forEach', () => {

modules/20-functions/30-void/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/35-never/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import fail from './index';
 
 test('function', () => {

modules/20-functions/35-never/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/40-unknown/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import isPlainObject from './index';
 
 test('function', () => {

modules/20-functions/40-unknown/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/70-destructuring/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import lessonsCount from './index';
 
 test('function', () => {

modules/20-functions/70-destructuring/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/80-rest-spread/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import max from './index';
 
 test('function', () => {

modules/20-functions/80-rest-spread/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/85-function-overloads/Makefile

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
+ 
 
 // BEGIN
 function newYearCongratulate(name: string): string;

modules/20-functions/85-function-overloads/index.ts

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import sayHello from './index';
 
 test('function', () => {

modules/20-functions/85-function-overloads/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/20-functions/90-type-narrowing/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import last from './index';
 
 test('function', () => {

modules/20-functions/90-type-narrowing/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/22-arrays/20-type-annotations/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import unique from './index';
 
 test('function', () => {

modules/22-arrays/20-type-annotations/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/22-arrays/25-multi-dimensional-arrays/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import getField from './index';
 
 test('function', () => {

modules/22-arrays/25-multi-dimensional-arrays/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/22-arrays/40-readonly-arrays/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import reverse from './index';
 
 test('function', () => {

modules/22-arrays/40-readonly-arrays/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/22-arrays/50-tuples/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import isTheSamePoint, { Point } from './index';
 
 test('function', () => {

modules/22-arrays/50-tuples/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/10-type-as-sets/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import type CustomType from './index';
 
 test('CustomType', () => {

modules/25-types/10-type-as-sets/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/20-union-types/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import lastIndex from './index';
 

modules/25-types/20-union-types/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/22-nullable/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import formatPrice from './index';
 
 test('formatPrice', () => {

modules/25-types/22-nullable/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/25-literal-types/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import startGame from './index';
 

modules/25-types/25-literal-types/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/30-intersection-types/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import addAdmin, { User, Permission } from './index';
 
 test('addAdmin', () => {

modules/25-types/30-intersection-types/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/40-assignability/Makefile

@@ -1,4 +1,5 @@
 import * as ta from 'type-assertions';
+import { expect, test } from 'vitest';
 
 import form from './index';
 

modules/25-types/40-assignability/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/50-type-hierarcy/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import getUserFriends, { UserResponse } from './index';
 
 test('getUserFriends', () => {

modules/25-types/50-type-hierarcy/test.ts

@@ -1,2 +1,2 @@
 test:
-	@ test.sh
+	@ test2.sh

modules/25-types/60-structural-typing/Makefile

@@ -1,3 +1,4 @@
+import { expect, test } from 'vitest'
 import handleData, { DataState, LoadingStatus } from './index';
 
 test('handleData', () => {