diff --git a/.cursor/rules/coding.mdc b/.cursor/rules/coding.mdc index d844f05..9db6045 100644 --- a/.cursor/rules/coding.mdc +++ b/.cursor/rules/coding.mdc @@ -11,6 +11,13 @@ alwaysApply: true - Make sure you understand docs/planning.md and docs/project_plan.md - Before starting coding, always present a plan for approval. - Tasks are in docs/project_plan.md -- Each task will be implemented via a feature branch and a PR. -- Before PR is submitted, the task is marked with "PR" in docs/project_plan.md. -- After task is completed (PR merged), the task is marked with a checkmark in docs/project_plan.md +- Each task will be implemented via a feature branch and a PR to the develop branch. +- Always follow the following recipe for implementing tasks: + 1. Start implementing after the user has explicitly told so. + 2. After finishing implementing, perform all necessary tests and check if the DoD for this task is met. + 3. Report on test results and DoD criteria and ask user if a PR should be submitted. + 4. If the user approves submitting a PR, and before PR is submitted, the task is marked with "PR" in docs/project_plan.md. + 5. After PR ist submitted, report to the user and wait for manual instructions. + 6. The user will then review and merge the PR or ask for updates. + 7. Pull the repo again to check if the PR has been merged. + 8. After task is completed (PR merged), the task is marked with a checkmark in docs/project_plan.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2896f55..090de5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [main] + branches: [main, develop] pull_request: - branches: [main] + branches: [main, develop] jobs: install: diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 9146188..01d2e50 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -2,9 +2,9 @@ name: Docker Test on: push: - branches: [main] + branches: [main, develop] pull_request: - branches: [main] + branches: [main, develop] jobs: build-and-test: diff --git a/docs/project_plan.md b/docs/project_plan.md index d02af0e..0f151b0 100644 --- a/docs/project_plan.md +++ b/docs/project_plan.md @@ -15,6 +15,7 @@ A pragmatic breakdown into **four one‑week sprints** plus a preparatory **Spri | 0.4 | Commit Husky hooks (commitlint, lint‑staged). | Attempting to commit code with ESLint errors is blocked locally. | ✓ | | 0.5 | Seed Changesets & automatic versioning. | Merging PR increments `package.json version` and creates a changelog file. | ✓ | | 0.6 | **Docker/Dokku infra** – Add multi‑stage `Dockerfile`, `Procfile`; CI job builds image & pushes to test Dokku app. | `gh workflow run docker-test` builds & deploys; Dokku reports container running, health‑check 200. | ✓ | +| 0.7 | **Update GitHub Actions** – Configure CI workflows to run on develop branch and PRs. | CI workflows run on both main and develop branches, as well as PRs targeting these branches. | PR | --- diff --git a/packages/ui-kit/src/layout/AuthShell/AuthShell.test.tsx b/packages/ui-kit/src/layout/AuthShell/AuthShell.test.tsx index 2b5413b..cf1e726 100644 --- a/packages/ui-kit/src/layout/AuthShell/AuthShell.test.tsx +++ b/packages/ui-kit/src/layout/AuthShell/AuthShell.test.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { render, screen } from '@testing-library/react'; import { AuthShell } from './AuthShell'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f1106d..9ee428c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,6 +142,9 @@ importers: '@eslint/js': specifier: ^9.27.0 version: 9.27.0 + '@playwright/test': + specifier: ^1.52.0 + version: 1.52.0 '@storybook/addon-a11y': specifier: ^8.6.14 version: 8.6.14(storybook@8.6.14(prettier@3.5.3)) @@ -1399,6 +1402,11 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} + '@playwright/test@1.52.0': + resolution: {integrity: sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==} + engines: {node: '>=18'} + hasBin: true + '@radix-ui/react-compose-refs@1.1.2': resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==} peerDependencies: @@ -2979,6 +2987,11 @@ packages: fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} + fsevents@2.3.2: + resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -4069,6 +4082,16 @@ packages: pkg-types@1.3.1: resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} + playwright-core@1.52.0: + resolution: {integrity: sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==} + engines: {node: '>=18'} + hasBin: true + + playwright@1.52.0: + resolution: {integrity: sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==} + engines: {node: '>=18'} + hasBin: true + pngjs@6.0.0: resolution: {integrity: sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==} engines: {node: '>=12.13.0'} @@ -6422,6 +6445,10 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true + '@playwright/test@1.52.0': + dependencies: + playwright: 1.52.0 + '@radix-ui/react-compose-refs@1.1.2(@types/react@19.1.4)(react@19.1.0)': dependencies: react: 19.1.0 @@ -8342,6 +8369,9 @@ snapshots: fs.realpath@1.0.0: {} + fsevents@2.3.2: + optional: true + fsevents@2.3.3: optional: true @@ -9428,6 +9458,14 @@ snapshots: mlly: 1.7.4 pathe: 2.0.3 + playwright-core@1.52.0: {} + + playwright@1.52.0: + dependencies: + playwright-core: 1.52.0 + optionalDependencies: + fsevents: 2.3.2 + pngjs@6.0.0: {} pngjs@7.0.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index ca0f302..0c32423 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,2 @@ packages: - - 'packages/*' \ No newline at end of file + - "packages/*" \ No newline at end of file