update tests

Dockerfile

@@ -1,11 +1,12 @@
 FROM hexletbasics/base-image
 
-WORKDIR /exercises-pre-course-javascript
-
-COPY . .
-
 ENV NODE_PATH /exercises-pre-course-javascript/src
+ENV PATH=/exercises-pre-course-javascript/bin:$PATH
 
+WORKDIR /exercises-pre-course-javascript
+
+RUN npm i -g vitest
+COPY package.json package-lock.json ./
 RUN npm ci
 
-ENV PATH=/exercises-pre-course-javascript/bin:$PATH
+COPY . .

bin/test2.sh

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

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

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

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

@@ -1,6 +1,14 @@
 // @ts-check
 
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'Hello, World!';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/10-basics/20-comments/Makefile

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

modules/10-basics/40-instructions/Makefile

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

modules/10-basics/40-instructions/test.js

@@ -1,6 +1,14 @@
 // @ts-check
 
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'Robert\nStannis\nRenly';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/10-basics/45-testing/Makefile

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

modules/10-basics/45-testing/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '9780262531962';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/10-basics/50-syntax-errors/Makefile

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

modules/10-basics/50-syntax-errors/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'What Is Dead May Never Die';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/20-basic/Makefile

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

modules/20-arithmetics/20-basic/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '9';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/25-operator/Makefile

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

modules/20-arithmetics/25-operator/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '87';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/27-commutativity/Makefile

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

modules/20-arithmetics/27-commutativity/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '243\n2';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/30-composition/Makefile

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

modules/20-arithmetics/30-composition/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '10.5';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/40-priority/Makefile

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

modules/20-arithmetics/40-priority/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '49';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/50-float/Makefile

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

modules/20-arithmetics/50-float/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 0.39 * 0.22;
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls[0]?.[0];
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/60-infinity/Makefile

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

modules/20-arithmetics/60-infinity/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = Infinity;
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls[0]?.[0];
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/70-nan/Makefile

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

modules/20-arithmetics/70-nan/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'NaN';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/20-arithmetics/80-linting/Makefile

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

modules/20-arithmetics/80-linting/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '4';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/25-strings/10-quotes/Makefile

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

modules/25-strings/10-quotes/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = "\"Khal Drogo's favorite word is \"athjahakar\"\"";
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/25-strings/15-escape-characters/Makefile

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

modules/25-strings/15-escape-characters/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '- Did Joffrey agree?\n- He did. He also said "I love using \\n".';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/25-strings/20-string-concatenation/Makefile

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

modules/25-strings/20-string-concatenation/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'Winter came for the House of Frey.';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/25-strings/30-encoding/Makefile

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

modules/25-strings/30-encoding/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = '~\n^\n%';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/30-variables/10-definition/Makefile

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

modules/30-variables/10-definition/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'What Is Dead May Never Die!';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/30-variables/11-change/Makefile

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

modules/30-variables/11-change/test.js

@@ -1,4 +1,12 @@
-import { expectOutput } from 'hexlet-basics/tests';
+import { expect, test, vi } from 'vitest'
 
 const expected = 'anneirB';
-expectOutput(expected);
+
+test('hello world', async () => {
+  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+  await import('./index.js')
+
+  const firstArg = consoleLogSpy.mock.calls.join('\n');
+
+  expect(firstArg).toBe(expected)
+})

modules/30-variables/13-variables-naming/Makefile

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