From 58f358d028f40cde8ad2a6a6e742194ffe1eea0a Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 26 Nov 2020 11:21:53 +0100 Subject: [PATCH] Correct test case descriptions --- ...-with-alias-does-not-prevent-update-if-not-required.test | 6 +----- ...-with-alias-does-not-prevent-update-if-not-required.test | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/Composer/Test/Fixtures/installer/conflict-on-root-with-alias-does-not-prevent-update-if-not-required.test b/tests/Composer/Test/Fixtures/installer/conflict-on-root-with-alias-does-not-prevent-update-if-not-required.test index 454384206..df81a3a81 100644 --- a/tests/Composer/Test/Fixtures/installer/conflict-on-root-with-alias-does-not-prevent-update-if-not-required.test +++ b/tests/Composer/Test/Fixtures/installer/conflict-on-root-with-alias-does-not-prevent-update-if-not-required.test @@ -1,9 +1,5 @@ --TEST-- -Test that conflict on a branch alias is ignored if the alias is not required for installation. - -The alias ends up being marked installed anyway because the install step doesn't know that the branch alias which is -present in the lock file was ignored during resolution. This is acceptable as deps were resolvable without the alias -and we don't want to modify branch alias meta data in the lock file. +Test that root package conflict on a branch alias is ignored if the alias is not required for installation. --COMPOSER-- { "repositories": [ diff --git a/tests/Composer/Test/Fixtures/installer/conflict-with-alias-does-not-prevent-update-if-not-required.test b/tests/Composer/Test/Fixtures/installer/conflict-with-alias-does-not-prevent-update-if-not-required.test index e03cd0f2a..a7b47f119 100644 --- a/tests/Composer/Test/Fixtures/installer/conflict-with-alias-does-not-prevent-update-if-not-required.test +++ b/tests/Composer/Test/Fixtures/installer/conflict-with-alias-does-not-prevent-update-if-not-required.test @@ -1,5 +1,5 @@ --TEST-- -Test that conflict on a branch alias is ignored if the alias is not required for installation. +Test that conflict of a dependency with a branch alias of another dependency is ignored if the alias is not required for installation. --COMPOSER-- { "repositories": [