Skip to content

Move user creation without skeleton to core #730

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
phil-davis merged 2 commits into from
May 31, 2019
Merged

Move user creation without skeleton to core #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3305110
Move user creation without skeleton to core
paurakhsharma May 29, 2019
9adcb19
Change 'in the webUI' to 'on the webUI'
phil-davis May 31, 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
15 changes: 0 additions & 15 deletions tests/acceptance/features/bootstrap/ActivityContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,4 @@ public function setUpScenario(BeforeScenarioScope $scope) {
// Get all the contexts you need in this context
$this->featureContext = $environment->getContext('FeatureContext');
}

/**
* @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"]);
$this->featureContext->userHasBeenCreatedWithDefaultAttributes($user);
$this->featureContext->runOcc(["config:system:set skeletondirectory --value $path"]);
}
}
2 changes: 1 addition & 1 deletion tests/acceptance/features/bootstrap/WebUIActivityContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public function theActivityNumberShouldHaveAMessageSayingSharedFolderWithUser(
}
$avatarText = \strtoupper($user[0]);
//Need to add username initial at the beginning because if there is no avatar of the user then,
// the username initial is shown in the webUI
// the username initial is shown on the webui
$message = \sprintf($this->youSharedMsgFramework, $entry, $avatarText, $user);
$latestActivityMessage = $this->activityPage->getActivityMessageOfIndex($index - 1);
PHPUnit\Framework\Assert::assertEquals($message, $latestActivityMessage);
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/features/webUIActivityCreateUpdate/createFilesFolder.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,6 @@ Feature: Created files/folders activities
Scenario: Creating folders should be listed in the activity tab
Given user "user0" has created folder "/Doc1"
When the user browses to the files page
And the user opens the file action menu of folder "Doc1" in the webUI
And the user clicks the details file action in the webUI
And the user opens the file action menu of folder "Doc1" on the webui
And the user clicks the details file action on the webui
Then the activity number 1 should contain message "You created Doc1" in the activity tab
8 changes: 4 additions & 4 deletions tests/acceptance/features/webUIActivitySharingInternal/sharingInternal.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ Feature: Sharing file/folders activities
When the user browses directly to display the details of file "block-aligned.txt" in folder "/"
Then the activity number 1 should have message saying that the file is shared with user "User One" in the activity tab
And the activity number 2 should contain message "You created block-aligned.txt" in the activity tab
When the user opens the file action menu of folder "folder with space" in the webUI
And the user clicks the details file action in the webUI
When the user opens the file action menu of folder "folder with space" on the webui
And the user clicks the details file action on the webui
Then the activity number 1 should have message saying that the folder is shared with user "User Two" in the activity tab
And the activity number 2 should contain message "You created folder with space" in the activity tab

Expand All @@ -309,8 +309,8 @@ Feature: Sharing file/folders activities
And user "user1" has logged in using the webUI
When the user browses directly to display the details of file "block-aligned.txt" in folder "/"
Then the activity number 1 should have message saying that the file is shared by user "User Zero" in the activity tab
When the user opens the file action menu of folder "folder with space" in the webUI
And the user clicks the details file action in the webUI
When the user opens the file action menu of folder "folder with space" on the webui
And the user clicks the details file action on the webui
Then the activity number 1 should have message saying that the folder is shared by user "User Zero" in the activity tab

@issue-695
Expand Down