Merge pull request #525 from Scalingo/tests

fix(test): update Composer fixtures

Author: Frzk

Makefile

@@ -1,12 +1,12 @@
-STACK := "scalingo-20"
+STACK := "scalingo-22"
 BASH_COMMAND := /bin/bash
 
 .DEFAULT := all
 
 all: test
 test: test20 test22
 
-test22: STACK := "scalingo-22"
+test20: STACK := "scalingo-20"
 
 test20 test22: BASH_COMMAND := test/run
 test20 test22: IMAGE := "scalingo/$(STACK):latest"

test/composer

@@ -6,14 +6,14 @@ test::composer::classic() {
 # Specifying the Composer version only via environment.
 #
 
-    COMPOSER_VERSION="2.7.0"
+    COMPOSER_VERSION="${latest_composer["${STACK}"]}"
     export COMPOSER_VERSION
 
     test::utils::setupFixture "defaults/composer"
     test::utils::compile
     test::helpers::enter_prod
 
-    test::helpers::composer "2.7.0"
+    test::helpers::composer "${latest_composer["${STACK}"]}"
 }
 
 test::composer::composer() {
@@ -22,11 +22,11 @@ test::composer::composer() {
 # Specifying the Composer version only via composer.json.
 #
 
-    test::utils::setupFixture "composer-2.7.0/composer"
+    test::utils::setupFixture "composer-latest/composer"
     test::utils::compile
     test::helpers::enter_prod
 
-    test::helpers::composer "2.7.0"
+    test::helpers::composer "${latest_composer["${STACK}"]}"
 }
 
 test::composer::composer_over_lower_classic() {
@@ -37,14 +37,14 @@ test::composer::composer_over_lower_classic() {
 # specified in COMPOSER_VERSION.
 #
 
-    COMPOSER_VERSION="2.6.0"
+    COMPOSER_VERSION="2.7.0"
     export COMPOSER_VERSION
 
-    test::utils::setupFixture "composer-2.7.0/composer"
+    test::utils::setupFixture "composer-latest/composer"
     test::utils::compile
     test::helpers::enter_prod
 
-    test::helpers::composer "2.7.0"
+    test::helpers::composer "${latest_composer["${STACK}"]}"
 }
 
 test::composer::composer_over_higher_classic() {
@@ -55,12 +55,12 @@ test::composer::composer_over_higher_classic() {
 # specified in COMPOSER_VERSION.
 #
 
-    COMPOSER_VERSION="2.7.0"
+    COMPOSER_VERSION="2.8.11"
     export COMPOSER_VERSION
 
-    test::utils::setupFixture "composer-2.6.0/composer"
+    test::utils::setupFixture "composer-2.2.25/composer"
     test::utils::compile
     test::helpers::enter_prod
 
-    test::helpers::composer "2.6.0"
+    test::helpers::composer "2.2.25"
 }

test/defaults

@@ -3,16 +3,19 @@
 declare -gA default_php
 declare -gA default_nginx
 declare -gA default_composer
+declare -gA latest_composer
 
 # Defaults for scalingo-20:
 default_php["scalingo-20"]="8.1."
 default_nginx["scalingo-20"]="1.26."
 default_composer["scalingo-20"]="2.8."
+latest_composer["scalingo-20"]="2.8.8"
 
 # Defaults for scalingo-22:
 default_php["scalingo-22"]="8.1."
 default_nginx["scalingo-22"]="1.28."
 default_composer["scalingo-22"]="2.8."
+latest_composer["scalingo-22"]="2.8.11"
 
 
 test::defaults::classic() {

test/fixtures/composer-2.6.0/composer/composer.json renamed to test/fixtures/composer-2.2.25/composer/composer.json

@@ -2,7 +2,7 @@
     "extra": {
         "paas": {
             "engines": {
-                "composer": "2.6.0"
+                "composer": "2.2.25"
             }
         }
     }

test/fixtures/composer-2.6.0/composer/composer.lock renamed to test/fixtures/composer-2.2.25/composer/composer.lock

@@ -2,7 +2,7 @@
     "extra": {
         "paas": {
             "engines": {
-                "composer": "2.7.0"
+                "composer": "2.8.11"
             }
         }
     }

test/fixtures/composer-2.7.0/composer/composer.json renamed to test/fixtures/composer-2.8.11/composer/composer.json

@@ -0,0 +1 @@
+composer-2.8.11

test/fixtures/composer-2.7.0/composer/composer.lock renamed to test/fixtures/composer-2.8.11/composer/composer.lock

@@ -74,3 +74,4 @@ test::php84::extensions::optional_builtin() {
 
 	test::helpers::enabled_extensions "${optional_builtin_extensions_84[@]}"
 }
+