test: Improve the test 035 (#867)

- Rework the test script to be clearer. - Add the versions of the package detected. - Pin the versions to avoid having the output changing.
humbug · Nov 1, 2023 · 49bd7fa · 49bd7fa
1 parent cff4a1b
commit 49bd7fa
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 91 deletions.
diff --git a/.makefile/e2e.file b/.makefile/e2e.file
@@ -324,7 +324,7 @@ e2e_035: $(PHP_SCOPER_PHAR_BIN) fixtures/set035-composer-files-autoload/vendor f
 	composer --working-dir=build/set035-composer-files-autoload/scoped-guzzle5-include dump-autoload
 	rm -rf build/set035-composer-files-autoload/guzzle5-include || true
 
-	php build/set035-composer-files-autoload/index.php &> build/set035-composer-files-autoload/output || true
+	php build/set035-composer-files-autoload/index.php 2>&1 > build/set035-composer-files-autoload/output
 	php build/set035-composer-files-autoload/test.php
 
 .PHONY: e2e_036

diff --git a/fixtures/set035-composer-files-autoload/composer.json b/fixtures/set035-composer-files-autoload/composer.json
@@ -1,6 +1,6 @@
 {
     "bin": "index.php",
     "require": {
-        "guzzlehttp/guzzle": "^6.0"
+        "guzzlehttp/guzzle": "^6.5.8"
     }
 }
diff --git a/fixtures/set035-composer-files-autoload/composer.lock b/fixtures/set035-composer-files-autoload/composer.lock
diff --git a/fixtures/set035-composer-files-autoload/guzzle5-include/composer.json b/fixtures/set035-composer-files-autoload/guzzle5-include/composer.json
@@ -1,6 +1,6 @@
 {
     "bin": "index.php",
     "require": {
-        "guzzlehttp/guzzle": "^5.0"
+        "guzzlehttp/guzzle": "5.3.4"
     }
 }
diff --git a/fixtures/set035-composer-files-autoload/guzzle5-include/composer.lock b/fixtures/set035-composer-files-autoload/guzzle5-include/composer.lock