From 2b6c91799e7dbc2cda113c57f59ef3e49076036c Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 7 Jun 2019 09:29:38 +0545 Subject: [PATCH 1/2] Remove deprecated default attributes test steps --- .../features/bootstrap/Provisioning.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php index 5f306f681eb4..6183fef793bb 100644 --- a/tests/acceptance/features/bootstrap/Provisioning.php +++ b/tests/acceptance/features/bootstrap/Provisioning.php @@ -256,7 +256,6 @@ public function userHasBeenCreatedOnDatabaseBackend($user) { } /** - * @Given /^user "([^"]*)" has been created with default attributes$/ * @Given /^user "([^"]*)" has been created with default attributes and skeleton files$/ * * @param string $user @@ -331,21 +330,7 @@ public function theseUsersHaveBeenCreatedWithoutSkeletonFiles(TableNode $table) } /** - * @Given these users have been created with skeleton files: - * expects a table of users with the heading - * "|username|password|displayname|email|" - * password, displayname & email are optional - * - * @param TableNode $table - * - * @return void - */ - public function theseUsersHaveBeenCreatedWithSkeletonFiles(TableNode $table) { - $this->theseUsersHaveBeenCreated("", "", $table); - } - - /** - * @Given /^these users have been created\s?(with default attributes|with default attributes and skeleton files|)\s?(but not initialized|):$/ + * @Given /^these users have been created with ?(default attributes and|) skeleton files ?(but not initialized|):$/ * expects a table of users with the heading * "|username|password|displayname|email|" * password, displayname & email are optional From 57a08394e8e3e0c1d734abcca211d41153d01be9 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 7 Jun 2019 10:59:28 +0545 Subject: [PATCH 2/2] Adjust more 'with skeleton files' steps --- .../webUISharingAutocompletion/shareAutocompletion.feature | 2 +- .../features/webUISharingExternal/federationSharing.feature | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature index 208f8319f2c2..f07e20960ea0 100644 --- a/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature +++ b/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature @@ -65,7 +65,7 @@ Feature: Autocompletion of share-with names Given the administrator has set the minimum characters for sharing autocomplete to "4" And user "regularuser" has logged in using the webUI And the user has browsed to the files page - And these users have been created but not initialized: + And these users have been created with skeleton files but not initialized: | username | password | displayname | email | | use | %alt1% | Use | uz@oc.com.np | And the user has opened the share dialog for folder "simple-folder" diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature index 5c1a54afa26e..0a5db836a249 100644 --- a/tests/acceptance/features/webUISharingExternal/federationSharing.feature +++ b/tests/acceptance/features/webUISharingExternal/federationSharing.feature @@ -247,7 +247,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages Scenario: test sharing folder to a remote server and resharing it back to the local Given using server "LOCAL" - And these users have been created: + And these users have been created with skeleton files: | username | | user2 | When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI @@ -261,7 +261,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages Scenario: test resharing folder as readonly and set it as readonly by resharer Given using server "LOCAL" - And these users have been created: + And these users have been created with skeleton files: | username | | user2 | When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI @@ -279,7 +279,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages Scenario: test resharing folder and set it as readonly by owner Given using server "LOCAL" - And these users have been created: + And these users have been created with skeleton files: | username | | user2 | When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI