Skip to content

move user creation without skeleton from activity app #35355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpakach merged 2 commits into from
May 29, 2019
Merged

move user creation without skeleton from activity app #35355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
819b252
move user creation without skeleton from activity app
paurakhsharma May 29, 2019
1d88479
Add error handling on user creation
paurakhsharma May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions tests/acceptance/features/bootstrap/Provisioning.php
View file
Open in desktop
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"]);

@individual-it individual-it May 30, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@paurakhsharma this breaks CI in activity app

      Notice: Undefined property: FeatureContext::$featureContext in /var/www/owncloud/server/tests/acceptance/features/bootstrap/Provisioning.php line 282

see https://drone.owncloud.com/owncloud/activity/419/180

$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