Skip to content

Commit

Permalink
Merge pull request #35360 from owncloud/stable10-user-creation-withou…
Browse files Browse the repository at this point in the history
…t-skeleton

[stable10] move user creation without skeleton from activity app
  • Loading branch information
phil-davis authored May 29, 2019
2 parents 777fd3d + c611fd6 commit fc9e072
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions tests/acceptance/features/bootstrap/Provisioning.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,25 @@ public function userHasBeenCreatedWithDefaultAttributes($user) {
}
}

/**
* @Given /^user "([^"]*)" has been created with default attributes and without skeleton files$/
*
* @param string $user
*
* @return void
*/
public function userHasBeenCreatedWithDefaultAttributesAndWithoutSkeletonFiles($user) {
$this->featureContext->runOcc(["config:system:get skeletondirectory"]);
$path = \trim($this->featureContext->getStdOutOfOccCommand());
$this->featureContext->runOcc(["config:system:delete skeletondirectory"]);
try {
$this->featureContext->userHasBeenCreatedWithDefaultAttributes($user);
} finally {
// restore skeletondirectory even if user creation failed
$this->featureContext->runOcc(["config:system:set skeletondirectory --value $path"]);
}
}

/**
* @Given /^these users have been created\s?(with default attributes|)\s?(but not initialized|):$/
* expects a table of users with the heading
Expand Down Expand Up @@ -2069,7 +2088,7 @@ public function theAdministratorGetsAllTheGroupsWhereUserIsSubadminUsingTheProvi
$fullUrl, $this->getAdminUsername(), $this->getAdminPassword()
);
}

/**
* @Given /^user "([^"]*)" has been made a subadmin of group "([^"]*)"$/
*
Expand Down Expand Up @@ -2790,7 +2809,7 @@ public function cleanupGroups() {
}
$this->usingServer($previousServer);
}

/**
* @BeforeScenario
*
Expand All @@ -2800,7 +2819,7 @@ public function rememberAppEnabledDisabledState() {
$this->enabledApps = $this->getEnabledApps();
$this->disabledApps = $this->getDisabledApps();
}

/**
* @AfterScenario
*
Expand Down

0 comments on commit fc9e072

Please sign in to comment.