NB-Public/circles
14
0
Fork 0
mirror of https://github.com/netzbegruenung/circles.git synced 2024-04-27 09:24:51 +02:00
Code Issues Projects Releases Wiki Activity

fix

Browse source 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2021-04-23 09:09:06 -01:00
parent 7c0e514d04
commit 6b8208dbf8
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Command/CirclesTest.php
View file

@ -137,7 +137,8 @@ class CirclesTest extends Base {
'Well, are you ?', '' 'Well, are you ?', ''
) )
->addOption('skip-init', '', InputOption::VALUE_NONE, 'Bypass Initialisation') ->addOption('skip-init', '', InputOption::VALUE_NONE, 'Bypass Initialisation')
->addOption('skip-setup', '', InputOption::VALUE_NONE, 'Bypass Circles Setup'); ->addOption('skip-setup', '', InputOption::VALUE_NONE, 'Bypass Circles Setup')
->addOption('only-setup', '', InputOption::VALUE_NONE, 'Stop after Circles Setup, pre-Sync');
} }
@ -206,6 +207,11 @@ class CirclesTest extends Base {
$this->configureCirclesApp(); $this->configureCirclesApp();
$this->confirmVersion(); $this->confirmVersion();
$this->confirmEmptyCircles(); $this->confirmEmptyCircles();
if ($this->input->getOption('only-setup')) {
return;
}
$this->syncCircles(); $this->syncCircles();
$this->t('Fresh installation status'); $this->t('Fresh installation status');
@ -563,7 +569,8 @@ class CirclesTest extends Base {
$localInstanceId = 'global-scale-1'; $localInstanceId = 'global-scale-1';
$name = self::$TEST_CIRCLES[0]; $name = self::$TEST_CIRCLES[0];
$owner = $this->getInstanceUsers($localInstanceId)[1]; $owner = $this->getInstanceUsers($localInstanceId)[1];
$dataCreatedCircle001 = $this->occ($localInstanceId, 'circles:manage:create --type user ' . $owner . ' ' . $name); $dataCreatedCircle001 =
$this->occ($localInstanceId, 'circles:manage:create --type user ' . $owner . ' ' . $name);
/** @var Circle $createdCircle */ /** @var Circle $createdCircle */
$createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class); $createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class);
$this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle; $this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle;
@ -1121,7 +1128,8 @@ class CirclesTest extends Base {
$circle = $this->getCircleByName($instanceId, $circleName); $circle = $this->getCircleByName($instanceId, $circleName);
$dataAddedMember = $dataAddedMember =
$this->occ( $this->occ(
$instanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $userId . ' --type ' . $type $instanceId,
'circles:members:add ' . $circle->getSingleId() . ' ' . $userId . ' --type ' . $type
); );
/** @var Member $addedMember */ /** @var Member $addedMember */
$addedMember = $this->deserialize($dataAddedMember, Member::class); $addedMember = $this->deserialize($dataAddedMember, Member::class);

24
testConfiguration.json
View file

@ -26,12 +26,12 @@
"test1", "test1",
"test9" "test9"
], ],
"group1": [ "groupOrange1": [
"test2", "test2",
"test3", "test3",
"test4" "test4"
], ],
"group2": [ "groupOrange2": [
"test3", "test3",
"test5", "test5",
"test7", "test7",
@ -70,12 +70,12 @@
"admin": [ "admin": [
"cult" "cult"
], ],
"group1": [ "groupGreen1": [
"test2", "test2",
"test3", "test3",
"test4" "test4"
], ],
"group2": [ "groupGreen2": [
"test1", "test1",
"test3", "test3",
"test5", "test5",
@ -114,12 +114,12 @@
"test4", "test4",
"test5" "test5"
], ],
"group1": [ "groupPurple1": [
"test5", "test5",
"test6", "test6",
"test7" "test7"
], ],
"group2": [ "groupPurple2": [
"test4", "test4",
"test5", "test5",
"test6", "test6",
@ -157,12 +157,12 @@
"cult", "cult",
"test6" "test6"
], ],
"group1": [ "groupPassive1": [
"test1", "test1",
"test7", "test7",
"test8" "test8"
], ],
"group2": [ "groupPassive2": [
"cult", "cult",
"test3", "test3",
"test4", "test4",
@ -204,10 +204,10 @@
"test5", "test5",
"test6" "test6"
], ],
"group1": [ "groupExternal1": [
"test2" "test2"
], ],
"group2": [ "groupExternal2": [
"test3", "test3",
"test4", "test4",
"test5", "test5",
@ -245,11 +245,11 @@
"cult", "cult",
"test7" "test7"
], ],
"group1": [ "groupTrusted1": [
"test1", "test1",
"test9" "test9"
], ],
"group2": [ "groupTrusted2": [
"test1", "test1",
"test3", "test3",
"test5", "test5",