0.7.2

Merge branch 'main' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl
0.7.1
2025-02-09 12:40:31 +03:00 · 2025-02-09 11:31:52 +03:00 · 2025-02-09 11:31:36 +03:00 · 2025-02-09 11:30:58 +03:00 · 2025-02-09 11:28:15 +03:00 · 2025-02-09 11:17:24 +03:00
11 changed files with 625 additions and 173 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -130,4 +130,10 @@ dist
 .yarn/install-state.gz
 .pnp.*

-.idea
+.idea
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
--- a/mocks/react-i18next.ts
+++ b/mocks/react-i18next.ts
@@ -0,0 +1,9 @@
+import localeRu from '../locales/ru.json';
+
+module.exports = {
+  useTranslation: (_, { keyPrefix }) => {
+    return {
+      t: (key: string) => localeRu[`${keyPrefix}.${key}`],
+    };
+  }
+};
--- a/e2e/example.spec.ts
+++ b/e2e/example.spec.ts
@@ -0,0 +1,26 @@
+import { test, expect } from '@playwright/test';
+
+test.beforeEach('check server is up', async ({ page }) => {
+  try {
+    await page.goto('http://localhost:8099/dry-wash');
+    const makeOrderText = page.getByText('Сделать заказ', { exact: true });
+    await expect(makeOrderText).toBeVisible();
+  } catch (error) {
+    console.error('server not up');
+    test.skip();
+  }
+});
+
+test('login', async ({ page }) => {
+  await page.goto('http://localhost:8099/dry-wash/arm');
+  await page.getByRole('textbox', { name: 'Username or email' }).click();
+  await page
+    .getByRole('textbox', { name: 'Username or email' })
+    .fill('237x237');
+  await page.getByRole('textbox', { name: 'Password' }).click();
+  await page.getByRole('textbox', { name: 'Password' }).fill('');
+  await page.getByRole('button', { name: 'Sign In' }).click();
+  await page.getByRole('heading', { name: 'Заказы' }).click();
+  await page.getByRole('link', { name: 'Мастера' }).click();
+  await page.getByRole('link', { name: 'Заказы' }).click();
+});
--- a/jest-preset-it/jest-preset.ts
+++ b/jest-preset-it/jest-preset.ts
@@ -9,9 +9,11 @@ module.exports = {
  clearMocks: true,
  moduleNameMapper: {
    '\\.(svg|webp)$': '<rootDir>/__mocks__/file',
+    'react-i18next': '<rootDir>/__mocks__/react-i18next',
  },
  testEnvironmentOptions: {
    customExportConditions: [''],
  },
  testEnvironment: 'jest-fixed-jsdom',
+  testPathIgnorePatterns: ['/node_modules/', '<rootDir>/e2e'],
 };
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "dry-wash",
-    "version": "0.5.0",
+    "version": "0.7.2",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "dry-wash",
-            "version": "0.5.0",
+            "version": "0.7.2",
            "license": "ISC",
            "dependencies": {
                "@babel/core": "^7.26.7",
@@ -48,7 +48,9 @@
            },
            "devDependencies": {
                "@eslint/js": "^9.14.0",
+                "@playwright/test": "^1.50.1",
                "@stylistic/eslint-plugin": "^2.10.1",
+                "@types/node": "^22.13.1",
                "@types/react-dom": "^18.3.1",
                "eslint": "^9.14.0",
                "eslint-plugin-import": "^2.31.0",
@@ -3619,6 +3621,21 @@
                "node": ">=14"
            }
        },
+        "node_modules/@playwright/test": {
+            "version": "1.50.1",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
+            "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
+            "dev": true,
+            "dependencies": {
+                "playwright": "1.50.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
        "node_modules/@popperjs/core": {
            "version": "2.11.8",
            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -4003,12 +4020,11 @@
            "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
        },
        "node_modules/@types/node": {
-            "version": "22.9.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
-            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
-            "license": "MIT",
+            "version": "22.13.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+            "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
            "dependencies": {
-                "undici-types": "~6.19.8"
+                "undici-types": "~6.20.0"
            }
        },
        "node_modules/@types/parse-json": {
@@ -12110,6 +12126,50 @@
                "node": ">=4"
            }
        },
+        "node_modules/playwright": {
+            "version": "1.50.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
+            "integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
+            "dev": true,
+            "dependencies": {
+                "playwright-core": "1.50.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
+            }
+        },
+        "node_modules/playwright-core": {
+            "version": "1.50.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
+            "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
+            "dev": true,
+            "bin": {
+                "playwright-core": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/playwright/node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
        "node_modules/popmotion": {
            "version": "11.0.3",
            "resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz",
@@ -14382,10 +14442,9 @@
            }
        },
        "node_modules/undici-types": {
-            "version": "6.19.8",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-            "license": "MIT"
+            "version": "6.20.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+            "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
        },
        "node_modules/unicode-canonical-property-names-ecmascript": {
            "version": "2.0.1",
--- a/package.json
+++ b/package.json
@@ -1,72 +1,74 @@
 {
-    "name": "dry-wash",
-    "version": "0.5.0",
-    "description": "<a id=\"readme-top\"></a>",
-    "main": "./src/index.tsx",
-    "scripts": {
-        "test": "jest -u",
-        "start": "brojs server --port=8099 --with-open-browser",
-        "build": "npm run clean && brojs build --dev",
-        "build:prod": "npm run clean && brojs build",
-        "clean": "rimraf dist",
-        "eslint": "npx eslint .",
-        "eslint:fix": "npx eslint . --fix",
-        "preversion": "npm run eslint"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "@brojs/cli": "^1.8.4",
-        "@babel/core": "^7.26.7",
-        "@babel/preset-env": "^7.26.7",
-        "@babel/preset-react": "^7.26.3",
-        "@babel/preset-typescript": "^7.26.0",
-        "@chakra-ui/icons": "^2.2.4",
-        "@chakra-ui/react": "^2.10.5",
-        "@emotion/react": "^11.4.1",
-        "@emotion/styled": "^11.3.0",
-        "@fontsource/open-sans": "^5.1.0",
-        "@lottiefiles/react-lottie-player": "^3.5.4",
-        "@pbe/react-yandex-maps": "^1.2.5",
-        "@reduxjs/toolkit": "^2.5.0",
-        "@testing-library/dom": "^10.4.0",
-        "@testing-library/react": "^16.2.0",
-        "@types/react": "^18.3.12",
-        "babel-jest": "^29.7.0",
-        "dayjs": "^1.11.13",
-        "express": "^4.21.1",
-        "framer-motion": "^6.2.8",
-        "i18next": "^23.16.4",
-        "jest": "^29.7.0",
-        "jest-environment-jsdom": "^29.7.0",
-        "jest-fixed-jsdom": "^0.0.9",
-        "keycloak-js": "^23.0.7",
-        "msw": "^2.7.0",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "react-hook-form": "^7.53.2",
-        "react-i18next": "^15.1.1",
-        "react-icons": "^5.3.0",
-        "react-phone-number-input": "^3.4.9",
-        "react-redux": "^9.2.0",
-        "react-router-dom": "^6.27.0",
-        "ts-jest": "^29.2.5",
-        "ts-node": "^10.9.2"
-    },
-    "devDependencies": {
-        "@eslint/js": "^9.14.0",
-        "@stylistic/eslint-plugin": "^2.10.1",
-        "@types/react-dom": "^18.3.1",
-        "eslint": "^9.14.0",
-        "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-react": "^7.37.2",
-        "globals": "^15.11.0",
-        "prettier": "3.3.3",
-        "typescript": "^5.7.3",
-        "typescript-eslint": "^8.12.2"
-    },
-    "jest": {
-        "preset": "./jest-preset-it/jest-preset.ts"
-    }
+  "name": "dry-wash",
+  "version": "0.7.2",
+  "description": "<a id=\"readme-top\"></a>",
+  "main": "./src/index.tsx",
+  "scripts": {
+    "test": "jest -u",
+    "start": "brojs server --port=8099 --with-open-browser",
+    "build": "npm run clean && brojs build --dev",
+    "build:prod": "npm run clean && brojs build",
+    "clean": "rimraf dist",
+    "eslint": "npx eslint .",
+    "eslint:fix": "npx eslint . --fix",
+    "preversion": "npm run eslint"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@babel/core": "^7.26.7",
+    "@babel/preset-env": "^7.26.7",
+    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-typescript": "^7.26.0",
+    "@brojs/cli": "^1.8.4",
+    "@chakra-ui/icons": "^2.2.4",
+    "@chakra-ui/react": "^2.10.5",
+    "@emotion/react": "^11.4.1",
+    "@emotion/styled": "^11.3.0",
+    "@fontsource/open-sans": "^5.1.0",
+    "@lottiefiles/react-lottie-player": "^3.5.4",
+    "@pbe/react-yandex-maps": "^1.2.5",
+    "@reduxjs/toolkit": "^2.5.0",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.2.0",
+    "@types/react": "^18.3.12",
+    "babel-jest": "^29.7.0",
+    "dayjs": "^1.11.13",
+    "express": "^4.21.1",
+    "framer-motion": "^6.2.8",
+    "i18next": "^23.16.4",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-fixed-jsdom": "^0.0.9",
+    "keycloak-js": "^23.0.7",
+    "msw": "^2.7.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-hook-form": "^7.53.2",
+    "react-i18next": "^15.1.1",
+    "react-icons": "^5.3.0",
+    "react-phone-number-input": "^3.4.9",
+    "react-redux": "^9.2.0",
+    "react-router-dom": "^6.27.0",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.14.0",
+    "@playwright/test": "^1.50.1",
+    "@stylistic/eslint-plugin": "^2.10.1",
+    "@types/node": "^22.13.1",
+    "@types/react-dom": "^18.3.1",
+    "eslint": "^9.14.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-react": "^7.37.2",
+    "globals": "^15.11.0",
+    "prettier": "3.3.3",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.12.2"
+  },
+  "jest": {
+    "preset": "./jest-preset-it/jest-preset.ts"
+  }
 }
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -0,0 +1,79 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// import dotenv from 'dotenv';
+// import path from 'path';
+// dotenv.config({ path: path.resolve(__dirname, '.env') });
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './tests',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://127.0.0.1:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'npm run start',
+  //   url: 'http://127.0.0.1:3000',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});
--- a/src/data/service/api.ts
+++ b/src/data/service/api.ts
@@ -16,7 +16,9 @@ type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &

 export const api = createApi({
  reducerPath: 'api',
-  baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
+  baseQuery: fetchBaseQuery({
+    baseUrl: new URL(getConfigValue('dry-wash.api'), location.origin).href,
+  }),
  tagTypes: ['Masters', 'Orders'],
  endpoints: (builder) => ({
    getMasters: builder.query<Master[], void>({
--- a/src/data/service/landing.api.ts
+++ b/src/data/service/landing.api.ts
@@ -13,7 +13,7 @@ export const landingApi = api.injectEndpoints({
    createOrder: mutation<CreateOrder.Response, CreateOrder.Params>({
      query: ({ body }) => ({
        url: `/order/create`,
-        params: { body },
+        body,
        method: 'POST'
      }),
      transformResponse: extractBodyFromResponse<CreateOrder.Response>,
--- a/src/pages/tests/snapshots/arm.test.tsx.snap
+++ b/src/pages/tests/snapshots/arm.test.tsx.snap
@@ -6,58 +6,58 @@ exports[`Arm Page render  1`] = `
    class="css-1yeiifd"
  >
    <div
-      class="css-1fp6kaj"
+      class="css-13owfwq"
    >
      <h2
-        class="chakra-heading css-9q1d0h"
+        class="chakra-heading css-173d1bl"
      >
-        title
+        Сухой мастер
      </h2>
      <div
-        class="chakra-stack css-1oen434"
+        class="chakra-stack css-1cggwyz"
      >
        <hr
          aria-orientation="horizontal"
-          class="chakra-divider css-1upb9tn"
+          class="chakra-divider css-svjswr"
        />
        <a
-          class="chakra-button css-uxt1e8"
+          class="chakra-button css-1kg18wp"
          href="/auth/login"
        >
-          orders
+          Заказы
        </a>
        <hr
          aria-orientation="horizontal"
-          class="chakra-divider css-1upb9tn"
+          class="chakra-divider css-svjswr"
        />
        <a
-          class="chakra-button css-uxt1e8"
+          class="chakra-button css-1kg18wp"
          href="/auth/login"
        >
-          master
+          Мастера
        </a>
        <hr
          aria-orientation="horizontal"
-          class="chakra-divider css-1upb9tn"
+          class="chakra-divider css-svjswr"
        />
      </div>
    </div>
    <div
-      class="css-sy55x5"
+      class="css-jiwy8d"
    >
      <div
-        class="css-hpgf8j"
+        class="css-1glkkdp"
      >
        <h2
-          class="chakra-heading css-r7q7qr"
+          class="chakra-heading css-1xer3cv"
        >
-          title
+          Заказы
        </h2>
        <div
-          class="css-1me9tx"
+          class="css-1u3smh"
        >
          <button
-            class="chakra-button css-4xx2wk"
+            class="chakra-button css-ez23ye"
            type="button"
          >
            <svg
@@ -72,12 +72,12 @@ exports[`Arm Page render  1`] = `
            </svg>
          </button>
          <p
-            class="chakra-text css-1bntq7d"
+            class="chakra-text css-52ukzg"
          >
-            2/2/2025
+            09.02.2025
          </p>
          <button
-            class="chakra-button css-4xx2wk"
+            class="chakra-button css-ez23ye"
            type="button"
          >
            <svg
@@ -93,7 +93,7 @@ exports[`Arm Page render  1`] = `
          </button>
        </div>
        <table
-          class="chakra-table css-0"
+          class="chakra-table css-5605sr"
        >
          <thead
            class="css-0"
@@ -102,34 +102,34 @@ exports[`Arm Page render  1`] = `
              class="css-0"
            >
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.carNumber
+                Номер машины
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.orderDate
+                Дата заказа
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.status
+                Статус
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.masters
+                Мастер
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.telephone
+                Телефон
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.location
+                Расположение
              </th>
            </tr>
          </thead>
@@ -140,11 +140,11 @@ exports[`Arm Page render  1`] = `
              class="css-0"
            >
              <td
-                class="css-12rlgei"
+                class="css-1v9gmks"
                colspan="6"
              >
                <div
-                  class="chakra-spinner css-1y7joxr"
+                  class="chakra-spinner css-1j92705"
                >
                  <span
                    class="css-8b45rq"
@@ -159,6 +159,10 @@ exports[`Arm Page render  1`] = `
      </div>
    </div>
  </div>
+  <span
+    hidden=""
+    id="__chakra_env"
+  />
 </div>
 `;

@@ -168,58 +172,58 @@ exports[`Arm Page render  2`] = `
    class="css-1yeiifd"
  >
    <div
-      class="css-1fp6kaj"
+      class="css-13owfwq"
    >
      <h2
-        class="chakra-heading css-9q1d0h"
+        class="chakra-heading css-173d1bl"
      >
-        title
+        Сухой мастер
      </h2>
      <div
-        class="chakra-stack css-1oen434"
+        class="chakra-stack css-1cggwyz"
      >
        <hr
          aria-orientation="horizontal"
-          class="chakra-divider css-1upb9tn"
+          class="chakra-divider css-svjswr"
        />
        <a
-          class="chakra-button css-uxt1e8"
+          class="chakra-button css-1kg18wp"
          href="/auth/login"
        >
-          orders
+          Заказы
        </a>
        <hr
          aria-orientation="horizontal"
-          class="chakra-divider css-1upb9tn"
+          class="chakra-divider css-svjswr"
        />
        <a
-          class="chakra-button css-uxt1e8"
+          class="chakra-button css-1kg18wp"
          href="/auth/login"
        >
-          master
+          Мастера
        </a>
        <hr
          aria-orientation="horizontal"
-          class="chakra-divider css-1upb9tn"
+          class="chakra-divider css-svjswr"
        />
      </div>
    </div>
    <div
-      class="css-sy55x5"
+      class="css-jiwy8d"
    >
      <div
-        class="css-hpgf8j"
+        class="css-1glkkdp"
      >
        <h2
-          class="chakra-heading css-r7q7qr"
+          class="chakra-heading css-1xer3cv"
        >
-          title
+          Заказы
        </h2>
        <div
-          class="css-1me9tx"
+          class="css-1u3smh"
        >
          <button
-            class="chakra-button css-4xx2wk"
+            class="chakra-button css-ez23ye"
            type="button"
          >
            <svg
@@ -234,12 +238,12 @@ exports[`Arm Page render  2`] = `
            </svg>
          </button>
          <p
-            class="chakra-text css-1bntq7d"
+            class="chakra-text css-52ukzg"
          >
-            2/2/2025
+            09.02.2025
          </p>
          <button
-            class="chakra-button css-4xx2wk"
+            class="chakra-button css-ez23ye"
            type="button"
          >
            <svg
@@ -255,7 +259,7 @@ exports[`Arm Page render  2`] = `
          </button>
        </div>
        <table
-          class="chakra-table css-0"
+          class="chakra-table css-5605sr"
        >
          <thead
            class="css-0"
@@ -264,34 +268,34 @@ exports[`Arm Page render  2`] = `
              class="css-0"
            >
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.carNumber
+                Номер машины
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.orderDate
+                Дата заказа
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.status
+                Статус
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.masters
+                Мастер
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.telephone
+                Телефон
              </th>
              <th
-                class="css-0"
+                class="css-1szkfps"
              >
-                table.header.location
+                Расположение
              </th>
            </tr>
          </thead>
@@ -302,24 +306,288 @@ exports[`Arm Page render  2`] = `
              class="css-0"
            >
              <td
-                class="css-12rlgei"
-                colspan="6"
+                class="css-zgoslk"
+              >
+                A123BC
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                24.11.2024
+                 
+                <br />
+              </td>
+              <td
+                class="css-zgoslk"
              >
                <div
-                  class="chakra-spinner css-1y7joxr"
+                  class="chakra-select__wrapper css-42b2qy"
                >
-                  <span
-                    class="css-8b45rq"
+                  <select
+                    class="chakra-select css-11j19cx"
                  >
-                    Loading...
-                  </span>
+                    <option
+                      value=""
+                    >
+                      Выберите статус
+                    </option>
+                    <option
+                      value="pending"
+                    >
+                      В ожидании
+                    </option>
+                    <option
+                      value="progress"
+                    >
+                      Выполняется
+                    </option>
+                    <option
+                      value="working"
+                    >
+                      В работе
+                    </option>
+                    <option
+                      value="canceled"
+                    >
+                      Отменено
+                    </option>
+                    <option
+                      value="complete"
+                    >
+                      Завершено
+                    </option>
+                  </select>
+                  <div
+                    class="chakra-select__icon-wrapper css-iohxn1"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="chakra-select__icon"
+                      focusable="false"
+                      role="presentation"
+                      style="width: 1em; height: 1em; color: currentColor;"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </div>
                </div>
              </td>
+              <td
+                class="css-zgoslk"
+              >
+                <div
+                  class="chakra-select__wrapper css-42b2qy"
+                >
+                  <select
+                    class="chakra-select css-161pkch"
+                  >
+                    <option
+                      value=""
+                    >
+                      Выберите мастера
+                    </option>
+                    <option
+                      value="Иван Иванов"
+                    >
+                      Иван Иванов
+                    </option>
+                    <option
+                      value="Олег Макаров"
+                    >
+                      Олег Макаров
+                    </option>
+                    <option
+                      value="Иван Галкин"
+                    >
+                      Иван Галкин
+                    </option>
+                  </select>
+                  <div
+                    class="chakra-select__icon-wrapper css-iohxn1"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="chakra-select__icon"
+                      focusable="false"
+                      role="presentation"
+                      style="width: 1em; height: 1em; color: currentColor;"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                <a
+                  class="chakra-link css-spn4bz"
+                  href="tel:"
+                >
+                  79001234563
+                </a>
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                Казань, ул. Баумана, 1
+              </td>
+            </tr>
+            <tr
+              class="css-0"
+            >
+              <td
+                class="css-zgoslk"
+              >
+                A245BC
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                24.11.2024
+                 
+                <br />
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                <div
+                  class="chakra-select__wrapper css-42b2qy"
+                >
+                  <select
+                    class="chakra-select css-lvra4l"
+                  >
+                    <option
+                      value=""
+                    >
+                      Выберите статус
+                    </option>
+                    <option
+                      value="pending"
+                    >
+                      В ожидании
+                    </option>
+                    <option
+                      value="progress"
+                    >
+                      Выполняется
+                    </option>
+                    <option
+                      value="working"
+                    >
+                      В работе
+                    </option>
+                    <option
+                      value="canceled"
+                    >
+                      Отменено
+                    </option>
+                    <option
+                      value="complete"
+                    >
+                      Завершено
+                    </option>
+                  </select>
+                  <div
+                    class="chakra-select__icon-wrapper css-iohxn1"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="chakra-select__icon"
+                      focusable="false"
+                      role="presentation"
+                      style="width: 1em; height: 1em; color: currentColor;"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                <div
+                  class="chakra-select__wrapper css-42b2qy"
+                >
+                  <select
+                    class="chakra-select css-161pkch"
+                  >
+                    <option
+                      value=""
+                    >
+                      Выберите мастера
+                    </option>
+                    <option
+                      value="Иван Иванов"
+                    >
+                      Иван Иванов
+                    </option>
+                    <option
+                      value="Олег Макаров"
+                    >
+                      Олег Макаров
+                    </option>
+                    <option
+                      value="Иван Галкин"
+                    >
+                      Иван Галкин
+                    </option>
+                  </select>
+                  <div
+                    class="chakra-select__icon-wrapper css-iohxn1"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="chakra-select__icon"
+                      focusable="false"
+                      role="presentation"
+                      style="width: 1em; height: 1em; color: currentColor;"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
+                        fill="currentColor"
+                      />
+                    </svg>
+                  </div>
+                </div>
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                <a
+                  class="chakra-link css-spn4bz"
+                  href="tel:"
+                >
+                  79001234567
+                </a>
+              </td>
+              <td
+                class="css-zgoslk"
+              >
+                Казань, ул. Баумана, 43
+              </td>
            </tr>
          </tbody>
        </table>
      </div>
    </div>
  </div>
+  <span
+    hidden=""
+    id="__chakra_env"
+  />
 </div>
 `;
--- a/src/pages/tests/arm.test.tsx
+++ b/src/pages/tests/arm.test.tsx
@@ -12,7 +12,11 @@ import { render, screen, waitFor } from '@testing-library/react';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import { BrowserRouter } from 'react-router-dom';
+import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
+import { Provider } from 'react-redux';

+import ErrorBoundary from '../../components/ErrorBoundary';
+import { store } from '../../__data__/store';
 import Page from '../arm';

 const server = setupServer(
@@ -87,17 +91,6 @@ const server = setupServer(
  }),
 );

-jest.mock('react-i18next', () => {
-  return {
-    useTranslation: () => {
-      return {
-        t: (key: never) => `${key}`,
-        i18n: {},
-      };
-    },
-  };
-});
-
 jest.mock('@brojs/cli', () => {
  return {
    getNavigationValue: () => '/auth/login',
@@ -116,9 +109,15 @@ describe('Arm Page', () => {
    });

    const { container } = render(
-      <BrowserRouter>
-        <Page mockUser={{ name: 'ilnaz' }} />
-      </BrowserRouter>,
+      <Provider store={store}>
+        <ChakraProvider theme={chakraTheme}>
+          <ErrorBoundary>
+            <BrowserRouter>
+              <Page mockUser={{ name: 'ilnaz' }} />
+            </BrowserRouter>
+          </ErrorBoundary>
+        </ChakraProvider>
+      </Provider>,
    );

    expect(container).toMatchSnapshot();
Author	SHA1	Message	Date
RustamRu	52fec13377	0.7.2 All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-09 12:40:31 +03:00
RustamRu	1d4b796a39	Merge branch 'main' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-09 11:31:52 +03:00
RustamRu	142067e9ce	0.7.1	2025-02-09 11:31:36 +03:00
Rustam	3c291baa0e	Merge pull request 'fix: create order request body (#81 )' (#84 ) from feature/order-form-upgrade into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #84	2025-02-09 11:30:58 +03:00
RustamRu	3cdc47b91b	fix: create order request body (#81 ) Some checks are pending it-academy/dry-wash-pl/pipeline/pr-main Build started... Details it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-09 11:28:15 +03:00
RustamRu	901d8d78a1	0.7.0 All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-09 11:17:24 +03:00
RustamRu	7736592830	fix: e2e tests All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-09 11:02:27 +03:00
RustamRu	8d447c9461	0.6.0 All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details	2025-02-09 10:20:21 +03:00
Primakov Alexandr Alexandrovich	6506b89dc7	Merge pull request 'feat: add playwright' (#83 ) from feature/playwright into main All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details Reviewed-on: #83	2025-02-09 10:12:42 +03:00
ilnaz	859fa4f2e1	feat: add playwright All checks were successful it-academy/dry-wash-pl/pipeline/head This commit looks good Details it-academy/dry-wash-pl/pipeline/pr-main This commit looks good Details	2025-02-09 09:57:04 +03:00