Drop spawned web server in Composer repository tests

Since Composer 2.6, relative local paths are possible for repositories of type composer: composer/composer#11526
heroku · Nov 28, 2023 · 5a8ceb9 · 5a8ceb9
1 parent 2d6f4b7
commit 5a8ceb9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "8.1"
-          tools: "composer:2.4"
+          tools: "composer:2.6"
       - name: Hatchet setup
         run: bundle exec hatchet ci:setup
       - name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …-develop (since we are not building main or a tag)

diff --git a/test/fixtures/platform/repository/futurepaks/composer.json b/test/fixtures/platform/repository/futurepaks/composer.json
@@ -34,7 +34,7 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

diff --git a/test/fixtures/platform/repository/priorities/composer-canonical.json b/test/fixtures/platform/repository/priorities/composer-canonical.json
@@ -30,12 +30,12 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json",
+            "url": "./packages-custom.json",
             "canonical": false
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

diff --git a/test/fixtures/platform/repository/priorities/composer-default.json b/test/fixtures/platform/repository/priorities/composer-default.json
@@ -30,11 +30,11 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json"
+            "url": "./packages-custom.json"
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

diff --git a/test/fixtures/platform/repository/priorities/composer-exclude.json b/test/fixtures/platform/repository/priorities/composer-exclude.json
@@ -30,12 +30,12 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json",
+            "url": "./packages-custom.json",
             "exclude": ["heroku-sys/ext-redis"]
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

diff --git a/test/fixtures/platform/repository/priorities/composer-only.json b/test/fixtures/platform/repository/priorities/composer-only.json
@@ -30,12 +30,12 @@
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages-custom.json",
+            "url": "./packages-custom.json",
             "only": ["heroku-sys/ext-igbinary"]
         },
         {
             "type": "composer",
-            "url": "http://localhost:8080/packages.json"
+            "url": "./packages.json"
         },
         {
             "type": "package",

diff --git a/test/spec/platform_spec.rb b/test/spec/platform_spec.rb
@@ -142,17 +142,8 @@
 	end
 
 	describe "Repository" do
-		after(:each) do
-			Process.kill("TERM", @pid)
-			Process.wait(@pid)
-		end
-
 		it "can hold packages compatible with future versions of the buildpack the current version will ignore" do
 			Dir.chdir("test/fixtures/platform/repository/futurepaks") do |cwd|
-				# we spawn a web server that serves packages.json, like a real composer repository
-				# this is to ensure that Composer really uses ComposerRepository behavior for provide/replace declarations
-				@pid = spawn("php -S localhost:8080")
-
 				cmd = "composer install --dry-run"
 				stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}")
 				expect(status.exitstatus).to eq(0), "dry run install failed, stderr: #{stderr}, stdout: #{stdout}"
@@ -164,9 +155,6 @@
 
 		it "combined with a custom repository installs packages from that repo according to the priority given" do
 			Dir.chdir("test/fixtures/platform/repository/priorities") do |cwd|
-				# we spawn a web server that serves packages*.json, like a real composer repository
-				# this is to ensure that Composer really uses ComposerRepository behavior for priorities etc
-				@pid = spawn("php -S localhost:8080")
 				Dir.glob("composer-*.json") do |testcase|
 					cmd = "COMPOSER=#{testcase} composer install --dry-run"
 					stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}")