[tests-only]fix object name for adding users

10 files changed, 112 insertions, 58 deletions

diff --git a/test/gui/config.ini b/test/gui/config.ini
index a238a0db1..238acfa5b 100644
--- a/test/gui/config.ini
+++ b/test/gui/config.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
-CLIENT_SYNC_PATH=
+CLIENT_SYNC_PATH_USER1=
+CLIENT_SYNC_PATH_USER2=
 BACKEND_HOST=http://localhost/owncloud-core/
 CLIENT_SYNC_TIMEOUT=
 MIDDLEWARE_URL=
diff --git a/test/gui/shared/scripts/bdd_hooks.py b/test/gui/shared/scripts/bdd_hooks.py
index 6191035b6..380847b53 100644
--- a/test/gui/shared/scripts/bdd_hooks.py
+++ b/test/gui/shared/scripts/bdd_hooks.py
@@ -30,8 +30,11 @@ def hook(context):
         'localBackendUrl': os.environ.get(
             'BACKEND_HOST', cfg.get('DEFAULT', 'BACKEND_HOST')
         ),
-        'clientSyncPath': os.environ.get(
-            'CLIENT_SYNC_PATH', cfg.get('DEFAULT', 'CLIENT_SYNC_PATH')
+        'clientSyncPathUser1': os.environ.get(
+            'CLIENT_SYNC_PATH_USER1', cfg.get('DEFAULT', 'CLIENT_SYNC_PATH_USER1')
+        ),
+        'clientSyncPathUser2': os.environ.get(
+            'CLIENT_SYNC_PATH_USER2', cfg.get('DEFAULT', 'CLIENT_SYNC_PATH_USER2')
         ),
         'clientSyncTimeout': os.environ.get(
             'CLIENT_SYNC_TIMEOUT', cfg.get('DEFAULT', 'CLIENT_SYNC_TIMEOUT')
@@ -46,11 +49,17 @@ def hook(context):
 
     if context.userData['localBackendUrl'] == '':
         context.userData['localBackendUrl'] = 'https://localhost:9200'
-    if context.userData['clientSyncPath'] == '':
-        context.userData['clientSyncPath'] = '/tmp/client-bdd/'
+    if context.userData['clientSyncPathUser1'] == '':
+        context.userData['clientSyncPathUser1'] = '/tmp/client-bdd-user1/'
+    else:
+        context.userData['clientSyncPathUser1'] = (
+            context.userData['clientSyncPathUser1'].rstrip("/") + "/"
+        )  # make sure there is always one trailing slash
+    if context.userData['clientSyncPathUser2'] == '':
+        context.userData['clientSyncPathUser2'] = '/tmp/client-bdd-user2/'
     else:
-        context.userData['clientSyncPath'] = (
-            context.userData['clientSyncPath'].rstrip("/") + "/"
+        context.userData['clientSyncPathUser2'] = (
+            context.userData['clientSyncPathUser2'].rstrip("/") + "/"
         )  # make sure there is always one trailing slash
     if context.userData['clientSyncTimeout'] == '':
         context.userData['clientSyncTimeout'] = 60
@@ -59,8 +68,11 @@ def hook(context):
             context.userData['clientSyncTimeout']
         )
 
-    if not os.path.exists(context.userData['clientSyncPath']):
-        os.makedirs(context.userData['clientSyncPath'])
+    if not os.path.exists(context.userData['clientSyncPathUser1']):
+        os.makedirs(context.userData['clientSyncPathUser1'])
+
+    if not os.path.exists(context.userData['clientSyncPathUser2']):
+        os.makedirs(context.userData['clientSyncPathUser2'])
 
     if context.userData['middlewareUrl'] == '':
         context.userData['middlewareUrl'] = 'http://localhost:3000/'
@@ -89,9 +101,20 @@ def hook(context):
         snooze(5)  # ToDo wait smarter till the app died
 
     # delete local files/folders
-    for filename in os.listdir(context.userData['clientSyncPath']):
+    for filename in os.listdir(context.userData['clientSyncPathUser1']):
+        test.log("Deleting :" + filename)
+        file_path = os.path.join(context.userData['clientSyncPathUser1'], filename)
+        try:
+            if os.path.isfile(file_path) or os.path.islink(file_path):
+                os.unlink(file_path)
+            elif os.path.isdir(file_path):
+                shutil.rmtree(file_path)
+        except Exception as e:
+            print('Failed to delete %s. Reason: %s' % (file_path, e))
+
+    for filename in os.listdir(context.userData['clientSyncPathUser2']):
         test.log("Deleting :" + filename)
-        file_path = os.path.join(context.userData['clientSyncPath'], filename)
+        file_path = os.path.join(context.userData['clientSyncPathUser2'], filename)
         try:
             if os.path.isfile(file_path) or os.path.islink(file_path):
                 os.unlink(file_path)
diff --git a/test/gui/shared/scripts/helpers/SetupClientHelper.py b/test/gui/shared/scripts/helpers/SetupClientHelper.py
index f882930d0..c054b4d26 100644
--- a/test/gui/shared/scripts/helpers/SetupClientHelper.py
+++ b/test/gui/shared/scripts/helpers/SetupClientHelper.py
@@ -8,7 +8,12 @@ confFilePath = confdir + 'owncloud.cfg'
 
 def substituteInLineCodes(context, value):
     value = value.replace('%local_server%', context.userData['localBackendUrl'])
-    value = value.replace('%client_sync_path%', context.userData['clientSyncPath'])
+    value = value.replace(
+        '%client_sync_path_user1%', context.userData['clientSyncPathUser1']
+    )
+    value = value.replace(
+        '%client_sync_path_user2%', context.userData['clientSyncPathUser2']
+    )
     value = value.replace(
         '%local_server_hostname%', urlparse(context.userData['localBackendUrl']).netloc
     )
@@ -78,7 +83,7 @@ def setUpClient(context, username, displayName, confFilePath):
         'displayUserName': displayName,
         'davUserName': userFirstName[0].lower(),
         'displayUserFirstName': userFirstName[0],
-        'client_sync_path': context.userData['clientSyncPath'],
+        'client_sync_path': context.userData['clientSyncPathUser1'],
         'local_server': context.userData['localBackendUrl'],
     }
     userSetting = userSetting.format(**args)
diff --git a/test/gui/shared/scripts/names.py b/test/gui/shared/scripts/names.py
index 783b35dbe..966a89a56 100644
--- a/test/gui/shared/scripts/names.py
+++ b/test/gui/shared/scripts/names.py
@@ -102,3 +102,4 @@ sharingDialog_Close_QPushButton = {"text": "Close", "type": "QPushButton", "unna
 stack_Enable_experimental_placeholder_mode_QPushButton = {"container": settings_stack_QStackedWidget, "text": "Enable experimental placeholder mode", "type": "QPushButton", "unnamed": 1, "visible": 1}
 disable_virtual_file_support_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Disable virtual file support?"}
 disable_virtual_file_support_Disable_support_QPushButton = {"text": "Disable support", "type": "QPushButton", "unnamed": 1, "visible": 1, "window": disable_virtual_file_support_QMessageBox}
+error_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Error"}
\ No newline at end of file
diff --git a/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py b/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py
index bba29edb3..2d56c124b 100644
--- a/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py
+++ b/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py
@@ -1,6 +1,7 @@
 import names
 import squish
 from helpers.SetupClientHelper import getClientDetails
+import test
 
 
 class AccountConnectionWizard:
@@ -11,11 +12,26 @@ class AccountConnectionWizard:
     SELECT_LOCAL_FOLDER = names.pbSelectLocalFolder_QPushButton
     DIRECTORY_NAME_BOX = names.fileNameEdit_QLineEdit
     CHOOSE_BUTTON = names.qFileDialog_Choose_QPushButton
-    CONNECT_BUTTON = names.owncloudWizard_qt_passive_wizardbutton1_QPushButton
+    FINISH_BUTTON = {
+        "name": "qt_wizard_finish",
+        "type": "QPushButton",
+        "visible": 1,
+        "window": names.owncloudWizard_OCC_OwncloudWizard,
+    }
+    ERROR_OK_BUTTON = {
+        "text": "OK",
+        "type": "QPushButton",
+        "unnamed": 1,
+        "visible": 1,
+        "window": names.error_QMessageBox,
+    }
 
     def __init__(self):
         pass
 
+    def sanitizeFolderPath(self, folderPath):
+        return folderPath.rstrip("/")
+
     def addAccount(self, context):
         server, user, password, localfolder = getClientDetails(context)
 
@@ -27,8 +43,16 @@ class AccountConnectionWizard:
         squish.type(squish.waitForObject(self.USERNAME_BOX), "<Tab>")
         squish.type(squish.waitForObject(self.PASSWORD_BOX), password)
         squish.clickButton(squish.waitForObject(self.NEXT_BUTTON))
+        try:
+            squish.clickButton(squish.waitForObject(self.ERROR_OK_BUTTON))
+        except LookupError:
+            pass
         squish.clickButton(squish.waitForObject(self.SELECT_LOCAL_FOLDER))
         squish.mouseClick(squish.waitForObject(self.DIRECTORY_NAME_BOX))
         squish.type(squish.waitForObject(self.DIRECTORY_NAME_BOX), localfolder)
         squish.clickButton(squish.waitForObject(self.CHOOSE_BUTTON))
-        squish.clickButton(squish.waitForObject(self.CONNECT_BUTTON))
+        test.compare(
+            str(squish.waitForObjectExists(self.SELECT_LOCAL_FOLDER).text),
+            self.sanitizeFolderPath(localfolder),
+        )
+        squish.clickButton(squish.waitForObject(self.FINISH_BUTTON))
diff --git a/test/gui/shared/scripts/pageObjects/PublicLinkDialog.py b/test/gui/shared/scripts/pageObjects/PublicLinkDialog.py
index 536bb002d..f89baa171 100644
--- a/test/gui/shared/scripts/pageObjects/PublicLinkDialog.py
+++ b/test/gui/shared/scripts/pageObjects/PublicLinkDialog.py
@@ -76,7 +76,7 @@ class PublicLinkDialog:
 
         test.compare(
             str(squish.waitForObjectExists(self.ITEM_TO_SHARE).text),
-            resource.replace(context.userData['clientSyncPath'], ''),
+            resource.replace(context.userData['clientSyncPathUser1'], ''),
         )
 
         if radioObjectName:
diff --git a/test/gui/shared/steps/steps.py b/test/gui/shared/steps/steps.py
index 85a99f70f..60b94c794 100644
--- a/test/gui/shared/steps/steps.py
+++ b/test/gui/shared/steps/steps.py
@@ -155,7 +155,7 @@ def isFileSynced(fileName):
 def waitForFileToBeSynced(context, fileName):
     waitFor(
         lambda: isFileSynced(
-            sanitizePath(context.userData['clientSyncPath'] + fileName)
+            sanitizePath(context.userData['clientSyncPathUser1'] + fileName)
         ),
         context.userData['clientSyncTimeout'] * 1000,
     )
@@ -164,7 +164,7 @@ def waitForFileToBeSynced(context, fileName):
 def waitForFolderToBeSynced(context, folderName):
     waitFor(
         lambda: isFolderSynced(
-            sanitizePath(context.userData['clientSyncPath'] + folderName)
+            sanitizePath(context.userData['clientSyncPathUser1'] + folderName)
         ),
         context.userData['clientSyncTimeout'] * 1000,
     )
@@ -277,7 +277,7 @@ def step(context, fileName):
 @When('the user creates a file "|any|" with the following content on the file system')
 def step(context, filename):
     fileContent = "\n".join(context.multiLineText)
-    f = open(context.userData['clientSyncPath'] + filename, "w")
+    f = open(context.userData['clientSyncPathUser1'] + filename, "w")
     f.write(fileContent)
     f.close()
 
@@ -309,7 +309,7 @@ def step(context, stepPart1):
 @Then('the file "|any|" should exist on the file system with the following content')
 def step(context, filePath):
     expected = "\n".join(context.multiLineText)
-    filePath = context.userData['clientSyncPath'] + filePath
+    filePath = context.userData['clientSyncPathUser1'] + filePath
     f = open(filePath, 'r')
     contents = f.read()
     test.compare(
@@ -331,7 +331,7 @@ def step(context):
 @Given('the user has changed the content of local file "|any|" to:')
 def step(context, filename):
     fileContent = "\n".join(context.multiLineText)
-    f = open(context.userData['clientSyncPath'] + filename, "w")
+    f = open(context.userData['clientSyncPathUser1'] + filename, "w")
     f.write(fileContent)
     f.close()
 
@@ -364,14 +364,14 @@ def step(context, filename):
     extpart = filename.split('.')[1]
     onlyfiles = [
         f
-        for f in listdir(context.userData['clientSyncPath'])
-        if isfile(join(context.userData['clientSyncPath'], f))
+        for f in listdir(context.userData['clientSyncPathUser1'])
+        if isfile(join(context.userData['clientSyncPathUser1'], f))
     ]
     found = False
     pattern = re.compile(buildConflictedRegex(filename))
     for file in onlyfiles:
         if pattern.match(file):
-            f = open(context.userData['clientSyncPath'] + file, 'r')
+            f = open(context.userData['clientSyncPathUser1'] + file, 'r')
             contents = f.read()
             if contents == expected:
                 found = True
@@ -738,7 +738,7 @@ def step(context, resource, content):
 
     snooze(5)
 
-    f = open(context.userData['clientSyncPath'] + resource, "w")
+    f = open(context.userData['clientSyncPathUser1'] + resource, "w")
     f.write(content)
     f.close()
 
diff --git a/test/gui/tst_addAccount/test.feature b/test/gui/tst_addAccount/test.feature
index 09e7c25bf..448f5d48c 100644
--- a/test/gui/tst_addAccount/test.feature
+++ b/test/gui/tst_addAccount/test.feature
@@ -11,10 +11,10 @@ Feature: adding accounts
     Scenario: Adding normal Account
         Given the user has started the client
         When the user adds the first account with
-            | server      | %local_server%     |
-            | user        | Alice              |
-            | password    | 1234               |
-            | localfolder | %client_sync_path% |
+          | server      | %local_server%           |
+          | user        | Alice                    |
+          | password    | 1234                     |
+          | localfolder | %client_sync_path_user1% |
         Then an account should be displayed with the displayname Alice Hansen and host %local_server_hostname%
 
 
@@ -22,9 +22,9 @@ Feature: adding accounts
         Given user "Brian" has been created on the server with default attributes and without skeleton files
         And user "Alice" has set up a client with default settings
         When the user adds an account with
-            | server      | %local_server%     |
-            | user        | Brian              |
-            | password    | AaBb2Cc3Dd4        |
-            | localfolder | %client_sync_path% |
+          | server      | %local_server%           |
+          | user        | Brian                    |
+          | password    | AaBb2Cc3Dd4              |
+          | localfolder | %client_sync_path_user2% |
         Then an account should be displayed with the displayname Alice Hansen and host %local_server_hostname%
         And an account should be displayed with the displayname Brian Murphy and host %local_server_hostname%
diff --git a/test/gui/tst_removeAccountConnection/test.feature b/test/gui/tst_removeAccountConnection/test.feature
index cae2a92d2..034c917cb 100644
--- a/test/gui/tst_removeAccountConnection/test.feature
+++ b/test/gui/tst_removeAccountConnection/test.feature
@@ -10,10 +10,10 @@ Feature: remove account connection
     And user "Brian" has been created on the server with default attributes and without skeleton files
     And user "Alice" has set up a client with default settings
     And the user has added an account with
-        | server      | %local_server%     |
-        | user        | Brian              |
-        | password    | AaBb2Cc3Dd4        |
-        | localfolder | %client_sync_path% |
+      | server      | %local_server%          |
+      | user        | Brian                   |
+      | password    | AaBb2Cc3Dd4             |
+      | localfolder | %client_sync_path_user2% |
     When the user removes the connection for user "Brian" and host %local_server_hostname%
     Then an account should be displayed with the displayname Alice Hansen and host %local_server_hostname%
 
diff --git a/test/gui/tst_sharing/test.feature b/test/gui/tst_sharing/test.feature
index 22504f1ec..f60aca156 100644
--- a/test/gui/tst_sharing/test.feature
+++ b/test/gui/tst_sharing/test.feature
@@ -13,14 +13,14 @@ Feature: Sharing
         Given user "Brian" has been created on the server with default attributes and without skeleton files
         And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" on the server
         And user "Alice" has set up a client with default settings
-        When the user adds "Brian Murphy" as collaborator of resource "%client_sync_path%/textfile0.txt" with permissions "edit,share" using the client-UI
-        Then user "Brian Murphy" should be listed in the collaborators list for file "%client_sync_path%/textfile0.txt" with permissions "edit,share" on the client-UI
+        When the user adds "Brian Murphy" as collaborator of resource "%client_sync_path_user1%/textfile0.txt" with permissions "edit,share" using the client-UI
+        Then user "Brian Murphy" should be listed in the collaborators list for file "%client_sync_path_user1%/textfile0.txt" with permissions "edit,share" on the client-UI
 
     @issue-7459
     Scenario: Progress indicator should not be visible after unselecting the password protection checkbox while sharing through public link
         Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" on the server
         And user "Alice" has set up a client with default settings
-        When the user opens the public links dialog of "%client_sync_path%/textfile0.txt" using the client-UI
+        When the user opens the public links dialog of "%client_sync_path_user1%/textfile0.txt" using the client-UI
         And the user toggles the password protection using the client-UI
         And the user toggles the password protection using the client-UI
         Then the password progress indicator should not be visible in the client-UI - expected to fail
@@ -31,7 +31,7 @@ Feature: Sharing
         And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" on the server
         And user "Alice" has shared file "/textfile0.txt" on the server with user "Brian" with "read, share" permission
         And user "Brian" has set up a client with default settings
-        When user "Brian" opens the sharing dialog of "%client_sync_path%/textfile0.txt" using the client-UI
+        When user "Brian" opens the sharing dialog of "%client_sync_path_user1%/textfile0.txt" using the client-UI
         Then the error text "The item is not shared with any users or groups" should be displayed in the sharing dialog
 
 
@@ -39,8 +39,8 @@ Feature: Sharing
         Given group "grp1" has been created on the server
         And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" on the server
         And user "Alice" has set up a client with default settings
-        When the user adds group "grp1" as collaborator of resource "%client_sync_path%/textfile0.txt" with permissions "edit,share" using the client-UI
-        Then group "grp1" should be listed in the collaborators list for file "%client_sync_path%/textfile0.txt" with permissions "edit,share" on the client-UI
+        When the user adds group "grp1" as collaborator of resource "%client_sync_path_user1%/textfile0.txt" with permissions "edit,share" using the client-UI
+        Then group "grp1" should be listed in the collaborators list for file "%client_sync_path_user1%/textfile0.txt" with permissions "edit,share" on the client-UI
 
 
     Scenario: User (non-author) can not share to a group to which the file is already shared
@@ -51,7 +51,7 @@ Feature: Sharing
         And user "Alice" has shared file "/textfile0.txt" on the server with user "Brian" with "read, share, update" permission
         And user "Alice" has shared file "/textfile0.txt" on the server with group "grp1" with "read, share, update" permission
         And user "Brian" has set up a client with default settings
-        When the user tires to share resource "%client_sync_path%/textfile0.txt" with the group "grp1" using the client-UI
+        When the user tires to share resource "%client_sync_path_user1%/textfile0.txt" with the group "grp1" using the client-UI
         Then the error "Path already shared with this group" should be displayed
 
 
@@ -61,7 +61,7 @@ Feature: Sharing
         And user "Brian" has been created on the server with default attributes and without skeleton files
         And user "Alice" has shared folder "simple-folder" on the server with user "Brian" with "all" permissions
         And user "Brian" has set up a client with default settings
-        When the user overwrites the file "simple-folder/textfile.txt" with content "overwrite ownCloud test text file"
+       When the user overwrites the file "simple-folder/textfile.txt" with content "overwrite ownCloud test text file"
         Then as "Brian" the file "simple-folder/textfile.txt" on the server should have the content "overwrite ownCloud test text file"
         And as "Alice" the file "simple-folder/textfile.txt" on the server should have the content "overwrite ownCloud test text file"
 
@@ -88,14 +88,14 @@ Feature: Sharing
         And user "Brian" has shared folder "Shares/simple-folder" on the server with user "Carol"
         And user "Brian" has set up a client with default settings
         And user "Alice" has updated the share permissions on the server for folder "/simple-folder" to "read" for user "Brian"
-        When user "Brian" opens the sharing dialog of "%client_sync_path%/Shares/simple-folder" using the client-UI
+        When user "Brian" opens the sharing dialog of "%client_sync_path_user1%/Shares/simple-folder" using the client-UI
         Then the error text "The file can not be shared because it was shared without sharing permission." should be displayed in the sharing dialog
 
     @smokeTest
     Scenario: simple sharing of a file by public link without password
         Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" on the server
         And user "Alice" has set up a client with default settings
-        When the user creates a new public link for file "%client_sync_path%/textfile0.txt" without password using the client-UI
+        When the user creates a new public link for file "%client_sync_path_user1%/textfile0.txt" without password using the client-UI
         Then as user "Alice" the file "textfile0.txt" should have a public link on the server
         And the public should be able to download the file "textfile0.txt" without password from the last created public link by "Alice" on the server
 
@@ -103,7 +103,7 @@ Feature: Sharing
     Scenario: simple sharing of a file by public link with password
         Given user "Alice" has set up a client with default settings
         And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt" on the server
-        When the user creates a new public link for file "%client_sync_path%/textfile0.txt" with password "pass123" using the client-UI
+        When the user creates a new public link for file "%client_sync_path_user1%/textfile0.txt" with password "pass123" using the client-UI
         Then as user "Alice" the file "textfile0.txt" should have a public link on the server
         And the public should be able to download the file "textfile0.txt" with password "pass123" from the last created public link by "Alice" on the server
 
@@ -115,7 +115,7 @@ Feature: Sharing
             | path       | textfile0.txt |
             | name       | Public link   |
             | expireDate | 2031-10-14    |
-        When the user opens the public links dialog of "%client_sync_path%/textfile0.txt" using the client-UI
+        When the user opens the public links dialog of "%client_sync_path_user1%/textfile0.txt" using the client-UI
         And the user edits the public link named "Public link" of file "textfile0.txt" changing following
             | expireDate | 2038-07-21 |
         Then the fields of the last public link share response of user "Alice" should include on the server
@@ -125,7 +125,7 @@ Feature: Sharing
     Scenario: simple sharing of a folder by public link without password
         Given user "Alice" has created folder "simple-folder" on the server
         And user "Alice" has set up a client with default settings
-        When the user creates a new public link with permissions "Download / View" for folder "%client_sync_path%/simple-folder" without password using the client-UI
+        When the user creates a new public link with permissions "Download / View" for folder "%client_sync_path_user1%/simple-folder" without password using the client-UI
         Then as user "Alice" the folder "simple-folder" should have a public link on the server
         And the public should be able to download the folder "lorem.txt" without password from the last created public link by "Alice" on the server
 
@@ -133,7 +133,7 @@ Feature: Sharing
     Scenario: simple sharing of a folder by public link with password
         Given user "Alice" has created folder "simple-folder" on the server
         And user "Alice" has set up a client with default settings
-        When the user creates a new public link with permissions "Download / View" for folder "%client_sync_path%/simple-folder" with password "pass123" using the client-UI
+        When the user creates a new public link with permissions "Download / View" for folder "%client_sync_path_user1%/simple-folder" with password "pass123" using the client-UI
         Then as user "Alice" the folder "simple-folder" should have a public link on the server
         And the public should be able to download the folder "lorem.txt" with password "pass123" from the last created public link by "Alice" on the server
 
@@ -146,7 +146,7 @@ Feature: Sharing
             | name        | Public link                  |
             | expireDate  | 2031-10-14                   |
             | permissions | read, update, create, delete |
-        When the user opens the public links dialog of "%client_sync_path%/simple-folder" using the client-UI
+        When the user opens the public links dialog of "%client_sync_path_user1%/simple-folder" using the client-UI
         And the user edits the public link named "Public link" of file "simple-folder" changing following
             | expireDate | 2038-07-21 |
         Then the fields of the last public link share response of user "Alice" on the server should include
@@ -156,7 +156,7 @@ Feature: Sharing
     Scenario Outline: simple sharing of folder by public link with different roles
         Given user "Alice" has created folder "simple-folder" on the server
         And user "Alice" has set up a client with default settings
-        When the user creates a new public link for folder "%client_sync_path%/simple-folder" using the client-UI with these details:
+        When the user creates a new public link for folder "%client_sync_path_user1%/simple-folder" using the client-UI with these details:
             | role | <role> |
         Then user "Alice" on the server should have a share with these details:
             | field       | value          |
@@ -176,7 +176,7 @@ Feature: Sharing
         Given user "Alice" has created folder "simple-folder" on the server
         And user "Alice" has created file "simple-folder/lorem.txt" on the server
         And user "Alice" has set up a client with default settings
-        When the user creates a new public link for folder "%client_sync_path%/simple-folder" with "Contributor" using the client-UI
+        When the user creates a new public link for folder "%client_sync_path_user1%/simple-folder" with "Contributor" using the client-UI
         Then user "Alice" on the server should have a share with these details:
             | field       | value          |
             | share_type  | public_link    |
@@ -194,11 +194,11 @@ Feature: Sharing
         And user "Alice" has shared folder "simple-folder" on the server with user "Brian" with "all" permissions
         And user "Alice" has shared file "lorem.txt" on the server with user "Brian" with "all" permissions
         And user "Alice" has set up a client with default settings
-        When the user removes permissions "<permissions>" for user "Brian Murphy" of resource "%client_sync_path%/simple-folder" using the client-UI
+        When the user removes permissions "<permissions>" for user "Brian Murphy" of resource "%client_sync_path_user1%/simple-folder" using the client-UI
         And the user closes the sharing dialog
-        And the user removes permissions "<permissions>" for user "Brian Murphy" of resource "%client_sync_path%/lorem.txt" using the client-UI
-        Then "<permissions>" permissions should not be displayed for user "Brian Murphy" for resource "%client_sync_path%/simple-folder" on the client-UI
-        And "<permissions>" permissions should not be displayed for user "Brian Murphy" for resource "%client_sync_path%/lorem.txt" on the client-UI
+        And the user removes permissions "<permissions>" for user "Brian Murphy" of resource "%client_sync_path_user1%/lorem.txt" using the client-UI
+        Then "<permissions>" permissions should not be displayed for user "Brian Murphy" for resource "%client_sync_path_user1%/simple-folder" on the client-UI
+        And "<permissions>" permissions should not be displayed for user "Brian Murphy" for resource "%client_sync_path_user1%/lorem.txt" on the client-UI
         And user "Alice" on the server should have a share with these details:
             | field       | value                        |
             | uid_owner   | Alice                        |