[tests-only] refactor steps with password in them (#8656)

2 files changed, 17 insertions, 5 deletions

diff --git a/test/gui/shared/scripts/helpers/SetupClientHelper.py b/test/gui/shared/scripts/helpers/SetupClientHelper.py
index 5a572716f..61639bba8 100644
--- a/test/gui/shared/scripts/helpers/SetupClientHelper.py
+++ b/test/gui/shared/scripts/helpers/SetupClientHelper.py
@@ -55,7 +55,7 @@ def getPollingInterval():
     return pollingInterval
 
 
-def setUpClient(context, username, confFilePath):
+def setUpClient(context, username, displayName, confFilePath):
     userSetting = '''
     [Accounts]
     0/Folders/1/ignoreHiddenFiles=true
@@ -76,7 +76,7 @@ def setUpClient(context, username, confFilePath):
     userFirstName = username.split()
     userSetting = userSetting + getPollingInterval()
     args = {
-        'displayUserName': username,
+        'displayUserName': displayName,
         'davUserName': userFirstName[0].lower(),
         'displayUserFirstName': userFirstName[0],
         'client_sync_path': context.userData['clientSyncPath'],
diff --git a/test/gui/shared/steps/steps.py b/test/gui/shared/steps/steps.py
index 63a1ca41e..471d9349c 100644
--- a/test/gui/shared/steps/steps.py
+++ b/test/gui/shared/steps/steps.py
@@ -87,9 +87,21 @@ def step(context, displayname, host):
     )
 
 
-@Given('user "|any|" has set up a client with default settings and password "|any|"')
-def step(context, username, password):
-    setUpClient(context, username, confFilePath)
+def getDisplayname(username):
+    if username in defaultUsers.keys():
+        return defaultUsers[username]['displayname']
+
+
+def getPasswordForUser(username):
+    if username in defaultUsers.keys():
+        return defaultUsers[username]['password']
+
+
+@Given('user "|any|" has set up a client with default settings')
+def step(context, username):
+    password = getPasswordForUser(username)
+    displayName = getDisplayname(username)
+    setUpClient(context, username, displayName, confFilePath)
     enterUserPassword = EnterPassword()
     enterUserPassword.enterPassword(password)