diff --git a/.env b/.env index f0e23e465..e16c98fba 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -SPRINT=sprint5 \ No newline at end of file +SPRINT=sprint5-with-bugs diff --git a/README.md b/README.md index 4e71caf0f..e9fbc3b03 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,62 @@ [![Run Playwright Tests ๐ŸŽญ](https://github.com/testsmith-io/practice-software-testing/actions/workflows/run-tests.yml/badge.svg)](https://github.com/testsmith-io/practice-software-testing/actions/workflows/run-tests.yml) + + +# ๐Ÿ›  Repository Rules + +To maintain code quality and a smooth development workflow, please adhere to the following rules: + +### ๐ŸŒฟ 1. Feature Branches +All feature development must take place in a separate branch. +* **Base branch:** Always branch off from `main`. +* **Naming convention:** `US-{your-storyID}`. + +**Example:** +```bash +# Update main to the latest version +git checkout main +git pull origin main + +# Create and switch to a new feature branch +git checkout -b US-E1.1 +``` + +### ๐Ÿงช 2. Local Development & Testing +Before requesting a Pull Request: +1. **Work on your code:** Make small, logical commits. +2. **Tester Verification:** Once you've completed your task, a tester must manually verify the changes in your local environment or a staging environment if available. + +**Example:** +```bash +# Add your changes +git add . +git commit -m "feat: refactor login page UI" + +# Keep your branch up to date with main +git fetch origin main +git merge origin/main +``` + +### ๐Ÿ”„ 3. Pull Requests (PR) +When the feature is ready and verified: +1. **Push your branch** to the remote repository. +2. **Open a Pull Request** targeting the `main` branch. +3. **Automated Tests:** GitHub Actions will automatically run the Playwright tests on your PR. +4. **Review:** Wait for at least one approval before merging. + +**Example:** +```bash +# Push your branch +git push origin feature/login-page-refactor + +# Go to GitHub and open a Pull Request +``` + +### ๐ŸŽญ 4. Automated Testing +Every Pull Request automatically triggers the Playwright test suite. +* Check the **Actions** tab on GitHub or the PR status to see if tests passed. +* If tests fail, fix the issues and push new commits to the same branch. + # Default accounts | First name | Last name | Role | E-mail | Password | diff --git a/init-data.sh b/init-data.sh index 192c3fbba..8d51b7d76 100755 --- a/init-data.sh +++ b/init-data.sh @@ -1 +1 @@ -docker-compose exec laravel-api php artisan migrate:fresh --seed --force \ No newline at end of file +docker compose exec laravel-api php artisan migrate:fresh --seed --force diff --git a/sprint5/API/.env b/sprint5/API/.env index 74067a547..0d1fd1cc3 100644 --- a/sprint5/API/.env +++ b/sprint5/API/.env @@ -16,10 +16,10 @@ LOG_DEPRECATIONS_CHANNEL=null LOG_LEVEL=debug DB_CONNECTION=mysql -DB_HOST=127.0.0.1 +DB_HOST=practice-software-testing-mariadb-1 DB_PORT=3306 DB_DATABASE=toolshop -DB_USERNAME=user +DB_USERNAME=root DB_PASSWORD=root BROADCAST_DRIVER=log