From 7d0d11eb15c430d1b65193ffe68a3effa6a432bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20KUBLER?= Date: Wed, 22 Apr 2026 14:31:30 +0200 Subject: [PATCH] chore(tests): update tests following nginx 1.30.0 release --- test/defaults | 4 ++-- .../nginx-1.21.6/composer/composer.lock | 18 --------------- .../nginx-1.22.1/composer/composer.json | 9 -------- .../nginx-1.22.1/composer/composer.lock | 18 --------------- .../nginx-1.28.0/composer/composer.json | 9 -------- .../composer/composer.json | 2 +- .../composer/composer.lock | 10 ++++----- test/nginx | 22 +++++++++---------- 8 files changed, 19 insertions(+), 73 deletions(-) delete mode 100644 test/fixtures/nginx-1.21.6/composer/composer.lock delete mode 100644 test/fixtures/nginx-1.22.1/composer/composer.json delete mode 100644 test/fixtures/nginx-1.22.1/composer/composer.lock delete mode 100644 test/fixtures/nginx-1.28.0/composer/composer.json rename test/fixtures/{nginx-1.21.6 => nginx-1.30.0}/composer/composer.json (73%) rename test/fixtures/{nginx-1.28.0 => nginx-1.30.0}/composer/composer.lock (71%) diff --git a/test/defaults b/test/defaults index 78e27c3f..013ee99b 100644 --- a/test/defaults +++ b/test/defaults @@ -7,13 +7,13 @@ declare -gA latest_composer # Defaults for scalingo-22: default_php["scalingo-22"]="8.4." # This one depends on the semver stable rule configuration -default_nginx["scalingo-22"]="1.28." +default_nginx["scalingo-22"]="1.30." default_composer["scalingo-22"]="2.9." latest_composer["scalingo-22"]="2.9.7" # Defaults for scalingo-24: default_php["scalingo-24"]="8.4." -default_nginx["scalingo-24"]="1.28." +default_nginx["scalingo-24"]="1.30." default_composer["scalingo-24"]="2.9." latest_composer["scalingo-24"]="2.9.7" diff --git a/test/fixtures/nginx-1.21.6/composer/composer.lock b/test/fixtures/nginx-1.21.6/composer/composer.lock deleted file mode 100644 index 4f967fe3..00000000 --- a/test/fixtures/nginx-1.21.6/composer/composer.lock +++ /dev/null @@ -1,18 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "df7fd9ca7fdce9bf5ca88bbdb6baeb5f", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.2.0" -} diff --git a/test/fixtures/nginx-1.22.1/composer/composer.json b/test/fixtures/nginx-1.22.1/composer/composer.json deleted file mode 100644 index 14d4f7a0..00000000 --- a/test/fixtures/nginx-1.22.1/composer/composer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extra": { - "paas": { - "engines": { - "nginx": "1.22.1" - } - } - } -} diff --git a/test/fixtures/nginx-1.22.1/composer/composer.lock b/test/fixtures/nginx-1.22.1/composer/composer.lock deleted file mode 100644 index 6f29c345..00000000 --- a/test/fixtures/nginx-1.22.1/composer/composer.lock +++ /dev/null @@ -1,18 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "5de61e8cb50f2a8cfa605126cf684bcc", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.2.0" -} diff --git a/test/fixtures/nginx-1.28.0/composer/composer.json b/test/fixtures/nginx-1.28.0/composer/composer.json deleted file mode 100644 index ed11ecc4..00000000 --- a/test/fixtures/nginx-1.28.0/composer/composer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extra": { - "paas": { - "engines": { - "nginx": "1.28.0" - } - } - } -} diff --git a/test/fixtures/nginx-1.21.6/composer/composer.json b/test/fixtures/nginx-1.30.0/composer/composer.json similarity index 73% rename from test/fixtures/nginx-1.21.6/composer/composer.json rename to test/fixtures/nginx-1.30.0/composer/composer.json index f79531f9..d8c98567 100644 --- a/test/fixtures/nginx-1.21.6/composer/composer.json +++ b/test/fixtures/nginx-1.30.0/composer/composer.json @@ -2,7 +2,7 @@ "extra": { "paas": { "engines": { - "nginx": "1.21.6" + "nginx": "1.30.0" } } } diff --git a/test/fixtures/nginx-1.28.0/composer/composer.lock b/test/fixtures/nginx-1.30.0/composer/composer.lock similarity index 71% rename from test/fixtures/nginx-1.28.0/composer/composer.lock rename to test/fixtures/nginx-1.30.0/composer/composer.lock index 4f967fe3..b1550954 100644 --- a/test/fixtures/nginx-1.28.0/composer/composer.lock +++ b/test/fixtures/nginx-1.30.0/composer/composer.lock @@ -4,15 +4,15 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "df7fd9ca7fdce9bf5ca88bbdb6baeb5f", + "content-hash": "fc8642a81ca80de7a7ef6d333c934a66", "packages": [], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.2.0" + "platform": {}, + "platform-dev": {}, + "plugin-api-version": "2.6.0" } diff --git a/test/nginx b/test/nginx index 63009315..85e0f54f 100644 --- a/test/nginx +++ b/test/nginx @@ -7,19 +7,19 @@ test::nginx::classic() { # # Test a deployment of a classic app (not using Composer) -# Specifying we want Nginx 1.22.1 via environment +# Specifying we want Nginx 1.30.0 via environment # We don't test every step here, we just test that the Nginx version is # the one expected. # - NGINX_VERSION="1.28.0" + NGINX_VERSION="1.30.0" export NGINX_VERSION test::utils::setupFixture "defaults/classic" test::utils::compile test::helpers::enter_prod - test::helpers::nginx "1.28.0" + test::helpers::nginx "1.30.0" } test::nginx::composer() { @@ -28,11 +28,11 @@ test::nginx::composer() { # Specifying the nginx version only via composer.json # - test::utils::setupFixture "nginx-1.28.0/composer" + test::utils::setupFixture "nginx-1.30.0/composer" test::utils::compile test::helpers::enter_prod - test::helpers::nginx "1.28.0" + test::helpers::nginx "1.30.0" } #test::composer::nginx_version_via_env() { @@ -59,14 +59,14 @@ test::nginx::composer_over_lower_classic() { # specified in NGINX_VERSION. # - NGINX_VERSION="1.28.0" + NGINX_VERSION="1.29.0" export NGINX_VERSION - test::utils::setupFixture "nginx-1.29.0/composer" + test::utils::setupFixture "nginx-1.30.0/composer" test::utils::compile test::helpers::enter_prod - test::helpers::nginx "1.29.0" + test::helpers::nginx "1.30.0" } test::nginx::composer_over_higher_classic() { @@ -77,12 +77,12 @@ test::nginx::composer_over_higher_classic() { # specified in NGINX_VERSION. # - NGINX_VERSION="1.29.0" + NGINX_VERSION="1.30.0" export NGINX_VERSION - test::utils::setupFixture "nginx-1.28.0/composer" + test::utils::setupFixture "nginx-1.29.0/composer" test::utils::compile test::helpers::enter_prod - test::helpers::nginx "1.28.0" + test::helpers::nginx "1.29.0" }