From 23339e44b826e5ccd853cd2a63a8bb041ae2efc9 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 17 Jul 2020 15:35:21 +0200 Subject: [PATCH] Fix alias tests to use default-branches --- .../Fixtures/poolbuilder/alias-priority-conflicting.test | 9 ++++++--- .../Fixtures/poolbuilder/alias-with-reference.test | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-priority-conflicting.test b/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-priority-conflicting.test index 4386df5ac..e8c0c7af6 100644 --- a/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-priority-conflicting.test +++ b/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-priority-conflicting.test @@ -35,16 +35,19 @@ Check root aliases are loaded { "name": "req/pkg", "version": "dev-master", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "source": { "reference": "forked", "type": "git", "url": "" } + "source": { "reference": "forked", "type": "git", "url": "" }, + "default-branch": true }, { "name": "req/pkg", "version": "dev-master", "extra": { "branch-alias": { "dev-master": "1.0.x-dev" } }, - "source": { "reference": "master", "type": "git", "url": "" } + "source": { "reference": "master", "type": "git", "url": "" }, + "default-branch": true }, { "name": "package/a", "version": "dev-master", - "require": { "req/pkg": "dev-master" } + "require": { "req/pkg": "dev-master" }, + "default-branch": true } ] diff --git a/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-with-reference.test b/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-with-reference.test index f7ef17b2f..51274b275 100644 --- a/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-with-reference.test +++ b/tests/Composer/Test/DependencyResolver/Fixtures/poolbuilder/alias-with-reference.test @@ -35,7 +35,8 @@ Check root aliases get selected correctly [ { "name": "a/aliased", "version": "dev-master", - "source": { "reference": "orig", "type": "git", "url": "" } + "source": { "reference": "orig", "type": "git", "url": "" }, + "default-branch": true }, { "name": "a/aliased", "version": "1.0"