diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 88d45941..735b0fcf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,18 +43,18 @@ jobs: # runs-on: ubuntu-latest # services: - # redmine-60002: - # image: redmine:6.0.2 + # redmine-60005: + # image: redmine:6.0.5 # ports: - # - "6002:3000" + # - "5060:3000" # env: # # Workaround: Remove secret for Rails 7.2 so it will be generated automatically # # @see https://github.com/docker-library/redmine/issues/349#issuecomment-2516634932 # # REDMINE_SECRET_KEY_BASE: supersecretkey # REDMINE_PLUGINS_MIGRATE: true # volumes: - # - /home/runner/work/_temp/redmine-60002_data/files:/usr/src/redmine/files - # - /home/runner/work/_temp/redmine-60002_data/sqlite:/usr/src/redmine/sqlite + # - /home/runner/work/_temp/redmine-60005_data/files:/usr/src/redmine/files + # - /home/runner/work/_temp/redmine-60005_data/sqlite:/usr/src/redmine/sqlite # options: --health-cmd="wget -O /dev/null http://localhost:3000" --health-start-period=30s --health-interval=30s --health-timeout=30s --health-retries=3 # strategy: @@ -83,7 +83,7 @@ jobs: # uses: "ramsey/composer-install@v2" # - name: Run behat - # run: vendor/bin/behat --config tests/Behat/behat.yml --profile=github-actions --suite=redmine_60002 + # run: vendor/bin/behat --config tests/Behat/behat.yml --profile=github-actions --suite=redmine_60005 code-quality: name: Check ${{ matrix.tool }} (PHP ${{ matrix.php }}) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38abf75e..9d54e028 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Improvement in `Redmine\Client\AbstractApi::retrieveData()` by using `total_count` from redmine response to avoid unnecessary http requests. -- Behaviour-driven tests are run against Redmine 6.0.2, 5.1.4, 5.0.10. +- Behaviour-driven tests are run against Redmine 6.0.5, 5.1.8, 5.0.12. ### Deprecated diff --git a/composer.json b/composer.json index b519ce25..e4351b77 100644 --- a/composer.json +++ b/composer.json @@ -53,9 +53,9 @@ "scripts": { "bdt": [ "Composer\\Config::disableProcessTimeout", - "@behat --format=progress --suite=redmine_60002", - "@behat --format=progress --suite=redmine_50105", - "@behat --format=progress --suite=redmine_50010" + "@behat --format=progress --suite=redmine_60005", + "@behat --format=progress --suite=redmine_50108", + "@behat --format=progress --suite=redmine_50012" ], "behat": "behat --config tests/Behat/behat.yml", "codestyle": "php-cs-fixer fix", diff --git a/docker-compose.yml b/docker-compose.yml index 356a582c..794e3d7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./:/var/www/project/ # Location of the project for php-fpm. Note this should be the same for NGINX.* redmine-dev: - image: redmine:6.0.2 + image: redmine:6.0.5 ports: - "3000:3000" environment: @@ -26,39 +26,39 @@ services: # Make sure the following services are configured in: # - /tests/Behat/behat.yml - redmine-60002: - image: redmine:6.0.2 + redmine-60005: + image: redmine:6.0.5 ports: - - "6002:3000" + - "5060:3000" environment: # Workaround: Remove secret for Rails 7.2 so it will be generated automatically # @see https://github.com/docker-library/redmine/issues/349#issuecomment-2516634932 # REDMINE_SECRET_KEY_BASE: supersecretkey REDMINE_PLUGINS_MIGRATE: true volumes: - - ./.docker/redmine-60002_data/files:/usr/src/redmine/files - - ./.docker/redmine-60002_data/sqlite:/usr/src/redmine/sqlite + - ./.docker/redmine-60005_data/files:/usr/src/redmine/files + - ./.docker/redmine-60005_data/sqlite:/usr/src/redmine/sqlite - redmine-50105: - image: redmine:5.1.5 + redmine-50108: + image: redmine:5.1.8 user: "1000:1000" ports: - - "5105:3000" + - "5051:3000" environment: REDMINE_SECRET_KEY_BASE: supersecretkey REDMINE_PLUGINS_MIGRATE: true volumes: - - ./.docker/redmine-50105_data/files:/usr/src/redmine/files - - ./.docker/redmine-50105_data/sqlite:/usr/src/redmine/sqlite + - ./.docker/redmine-50108_data/files:/usr/src/redmine/files + - ./.docker/redmine-50108_data/sqlite:/usr/src/redmine/sqlite - redmine-50010: - image: redmine:5.0.10 + redmine-50012: + image: redmine:5.0.12 user: "1000:1000" ports: - - "5010:3000" + - "5050:3000" environment: REDMINE_SECRET_KEY_BASE: supersecretkey REDMINE_PLUGINS_MIGRATE: true volumes: - - ./.docker/redmine-50010_data/files:/usr/src/redmine/files - - ./.docker/redmine-50010_data/sqlite:/usr/src/redmine/sqlite + - ./.docker/redmine-50012_data/files:/usr/src/redmine/files + - ./.docker/redmine-50012_data/sqlite:/usr/src/redmine/sqlite diff --git a/tests/Behat/behat.yml b/tests/Behat/behat.yml index 58834adf..f8a6d7f0 100644 --- a/tests/Behat/behat.yml +++ b/tests/Behat/behat.yml @@ -3,36 +3,36 @@ default: default: paths: - '%paths.base%/features' - redmine_60002: + redmine_60005: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '6.0.2' + redmineVersion: '6.0.5' rootPath: '%paths.base%/../../.docker' - redmine_50105: + redmine_50108: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '5.1.5' + redmineVersion: '5.1.8' rootPath: '%paths.base%/../../.docker' - redmine_50010: + redmine_50012: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '5.0.10' + redmineVersion: '5.0.12' rootPath: '%paths.base%/../../.docker' github-actions: suites: - redmine_60002: + redmine_60005: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '6.0.2' + redmineVersion: '6.0.5' rootPath: '/home/runner/work/_temp' - redmine_50105: + redmine_50108: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '5.1.5' + redmineVersion: '5.1.8' rootPath: '/home/runner/work/_temp' - redmine_50010: + redmine_50012: contexts: - Redmine\Tests\Behat\Bootstrap\FeatureContext: - redmineVersion: '5.0.10' + redmineVersion: '5.0.12' rootPath: '/home/runner/work/_temp' diff --git a/tests/RedmineExtension/RedmineVersion.php b/tests/RedmineExtension/RedmineVersion.php index 13f3f6d8..976c7e81 100644 --- a/tests/RedmineExtension/RedmineVersion.php +++ b/tests/RedmineExtension/RedmineVersion.php @@ -6,6 +6,30 @@ enum RedmineVersion: string { + /** + * Redmine 6.0.5 + * + * @link https://www.redmine.org/versions/209 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_6_0#605-2025-04-20 + */ + case V6_0_5 = '6.0.5'; + + /** + * Redmine 6.0.4 + * + * @link https://www.redmine.org/versions/206 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_6_0#604-2025-03-10 + */ + case V6_0_4 = '6.0.4'; + + /** + * Redmine 6.0.3 + * + * @link https://www.redmine.org/versions/203 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_6_0#603-2025-01-29 + */ + case V6_0_3 = '6.0.3'; + /** * Redmine 6.0.2 * @@ -30,6 +54,30 @@ enum RedmineVersion: string */ case V6_0_0 = '6.0.0'; + /** + * Redmine 5.1.8 + * + * @link https://www.redmine.org/versions/208 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_1#518-2025-04-20 + */ + case V5_1_8 = '5.1.8'; + + /** + * Redmine 5.1.7 + * + * @link https://www.redmine.org/versions/205 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_1#517-2025-03-10 + */ + case V5_1_7 = '5.1.7'; + + /** + * Redmine 5.1.6 + * + * @link https://www.redmine.org/versions/204 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_1#516-2025-01-29 + */ + case V5_1_6 = '5.1.6'; + /** * Redmine 5.1.5 * @@ -78,6 +126,24 @@ enum RedmineVersion: string */ case V5_1_0 = '5.1.0'; + /** + * Redmine 5.0.12 + * + * @link https://www.redmine.org/versions/207 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_0#5012-2025-03-10 + */ + + case V5_0_12 = '5.0.12'; + + /** + * Redmine 5.0.11 + * + * @link https://www.redmine.org/versions/200 + * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_0#5011-2025-01-30 + */ + + case V5_0_11 = '5.0.11'; + /** * Redmine 5.0.10 *