update test code

Author: PrajwolAmatya

test/gui/config.sample.ini

@@ -10,4 +10,6 @@ TEMP_FOLDER_PATH=
 CLIENT_CONFIG_DIR=
 GUI_TEST_REPORT_DIR=
 OCIS=false
-RECORD_VIDEO_ON_FAILURE=false
+RECORD_VIDEO_ON_FAILURE=false
+PREDEFINED_USERS=
+AUT_NAME=

test/gui/shared/scripts/helpers/ConfigHelper.py

@@ -75,6 +75,7 @@ def get_default_home_dir():
     'clientConfigDir': 'CLIENT_CONFIG_DIR',
     'guiTestReportDir': 'GUI_TEST_REPORT_DIR',
     'predefined_users': 'PREDEFINED_USERS',
+    'aut_name': 'AUT_NAME',
     'ocis': 'OCIS',
     'record_video_on_failure': 'RECORD_VIDEO_ON_FAILURE',
 }
@@ -99,6 +100,7 @@ def get_default_home_dir():
     'clientConfigDir': get_config_home(),
     'guiTestReportDir': os.path.abspath('../reports'),
     'predefined_users': False,
+    'aut_name': 'owncloud',
     'ocis': False,
     'record_video_on_failure': False,
     'files_for_upload': os.path.join(CURRENT_DIR.parent.parent, 'files-for-upload'),

test/gui/shared/scripts/helpers/SetupClientHelper.py

@@ -99,7 +99,7 @@ def start_client():
     check_keyring()
 
     squish.startApplication(
-        'owncloud -s'
+        f'{get_config("aut_name")} -s'
         + f' --logfile {get_config("clientLogFile")}'
         + ' --logdebug'
         + ' --logflush'

test/gui/shared/steps/account_context.py

@@ -313,13 +313,15 @@ def step(context, displayname):
 )
 def step(context, sync_path, wizard):
     sync_path = substitute_inline_codes(sync_path)
+    print('sync_path', sync_path)
 
     actual_sync_path = ''
     if wizard == 'configuration':
         actual_sync_path = AccountConnectionWizard.get_local_sync_path()
     else:
         actual_sync_path = SyncConnectionWizard.get_local_sync_path()
 
+    print('actual_sync_path', actual_sync_path)
     test.compare(
         actual_sync_path,
         sync_path,

test/gui/shared/steps/file_context.py

@@ -20,6 +20,7 @@
     prefix_path_namespace,
     remember_path,
 )
+from helpers.UserHelper import get_username_for_user
 
 
 def folder_exists(folder_path, timeout=1000):
@@ -103,6 +104,20 @@ def add_copy_suffix(resource_path, resource_type):
     'user "|any|" creates a file "|any|" with the following content inside the sync folder'
 )
 def step(context, username, filename):
+    if get_config('predefined_users'):
+        username = get_username_for_user(username)
+    file_content = '\n'.join(context.multiLineText)
+    file = get_resource_path(filename, username)
+    wait_and_write_file(file, file_content)
+
+
+@Given(
+    'user "|any|" has created a file "|any|" with the following content inside the sync folder of branded client'
+)
+def step(context, username, filename):
+    if not get_config('predefined_users'):
+        return
+    username = get_username_for_user(username)
     file_content = '\n'.join(context.multiLineText)
     file = get_resource_path(filename, username)
     wait_and_write_file(file, file_content)
@@ -116,6 +131,18 @@ def step(context, username, foldername):
 
 @Given('user "|any|" has created a folder "|any|" inside the sync folder')
 def step(context, username, foldername):
+    if get_config('predefined_users'):
+        username = get_username_for_user(username)
+    create_folder(foldername, username)
+
+
+@Given(
+    'user "|any|" has created a folder "|any|" inside the sync folder of branded client'
+)
+def step(context, username, foldername):
+    if not get_config('predefined_users'):
+        return
+    username = get_username_for_user(username)
     create_folder(foldername, username)
 
 
@@ -251,6 +278,8 @@ def step(context, item_type, resource):
 
 @When('user "|any|" creates the following files inside the sync folder:')
 def step(context, username):
+    if get_config('predefined_users'):
+        username = get_username_for_user(username)
     wait_for_client_to_be_ready()
 
     for row in context.table[1:]:

test/gui/shared/steps/server_context.py

@@ -1,5 +1,6 @@
 from helpers.api import provisioning, sharing_helper, webdav_helper as webdav
 import helpers.api.oc10 as oc
+from helpers.ConfigHelper import get_config
 
 from pageObjects.Toolbar import Toolbar
 
@@ -14,6 +15,8 @@ def step(context, app_name, action):
     regexp=True,
 )
 def step(context, user_name, resource_name):
+    if get_config('predefined_users'):
+        return
     test.compare(
         webdav.resource_exists(user_name, resource_name),
         False,
@@ -25,6 +28,8 @@ def step(context, user_name, resource_name):
     r'^as "([^"].*)" (?:file|folder) "([^"].*)" should exist in the server', regexp=True
 )
 def step(context, user_name, resource_name):
+    if get_config('predefined_users'):
+        return
     test.compare(
         webdav.resource_exists(user_name, resource_name),
         True,
@@ -34,6 +39,8 @@ def step(context, user_name, resource_name):
 
 @Then('as "|any|" the file "|any|" should have the content "|any|" in the server')
 def step(context, user_name, file_name, content):
+    if get_config('predefined_users'):
+        return
     text_content = webdav.get_file_content(user_name, file_name)
     test.compare(
         text_content,
@@ -115,11 +122,15 @@ def step(context, user_name, folder_name, items_number):
 
 @Given('user "|any|" has created folder "|any|" in the server')
 def step(context, user, folder_name):
+    if get_config('predefined_users'):
+        return
     webdav.create_folder(user, folder_name)
 
 
 @Given('user "|any|" has uploaded file with content "|any|" to "|any|" in the server')
 def step(context, user, file_content, file_name):
+    if get_config('predefined_users'):
+        return
     webdav.create_file(user, file_name, file_content)
 
 

test/gui/shared/steps/sync_context.py

@@ -1,3 +1,4 @@
+import re
 import squish
 
 from pageObjects.SyncConnectionWizard import SyncConnectionWizard
@@ -17,6 +18,7 @@
     substitute_inline_codes,
     get_resource_path,
 )
+from helpers.UserHelper import get_displayname_for_user
 
 
 @When('using sync connection folder "|any|"')
@@ -205,6 +207,8 @@ def step(context, folder_name):
 
 @When('the user syncs the "|any|" space')
 def step(context, space_name):
+    if get_config('predefined_users'):
+        space_name = 'My Folder'
     SyncConnectionWizard.sync_space(space_name)
 
 
@@ -354,6 +358,9 @@ def step(context):
         resource = row[0]
         status = row[1]
         account = substitute_inline_codes(row[2])
+        if get_config('predefined_users'):
+            displayname = get_displayname_for_user(row[2].split()[0].strip())
+            account = re.sub(r'^[^@]+', displayname, account)
         test.compare(
             Activity.check_not_synced_table(resource, status, account),
             True,

test/gui/suite.conf

@@ -4,5 +4,6 @@ HOOK_SUB_PROCESSES=false
 IMPLICITAUTSTART=false
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
+TEST_CASES=
 VERSION=3
 WRAPPERS=Qt

test/gui/tst_addAccount/test.feature

@@ -67,10 +67,11 @@ Feature: adding accounts
         When the user selects download everything option in advanced section
         Then the "Enable virtual file support" button should be available
 
-    @skipOnOC10
+    @skipOnOC10 @predefined_users
     Scenario: Add space manually from sync connection window
         Given user "Alice" has created folder "simple-folder" in the server
         And the user has started the client
+        And user "Alice" has created a folder "simple-folder" inside the sync folder of branded client
         And the user has entered the following account information:
             | server   | %local_server% |
             | user     | Alice          |

test/gui/tst_deletFilesFolders/test.feature

@@ -1,3 +1,4 @@
+@predefined_users
 Feature: deleting files and folders
   	As a user
   	I want to delete files and folders
@@ -10,6 +11,10 @@ Feature: deleting files and folders
     Scenario Outline: Delete a file
         Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "<fileName>" in the server
         And user "Alice" has set up a client with default settings
+        And user "Alice" has created a file "<fileName>" with the following content inside the sync folder of branded client
+            """
+            ownCloud test text file 0
+            """
         When the user deletes the file "<fileName>"
         And the user waits for the files to sync
         Then as "Alice" file "<fileName>" should not exist in the server
@@ -23,6 +28,7 @@ Feature: deleting files and folders
     Scenario Outline: Delete a folder
         Given user "Alice" has created folder "<folderName>" in the server
         And user "Alice" has set up a client with default settings
+        And user "Alice" has created a folder "<folderName>" inside the sync folder of branded client
         When the user deletes the folder "<folderName>"
         And the user waits for the files to sync
         Then as "Alice" file "<folderName>" should not exist in the server
@@ -38,6 +44,16 @@ Feature: deleting files and folders
         And user "Alice" has created folder "test-folder1" in the server
         And user "Alice" has created folder "test-folder2" in the server
         And user "Alice" has set up a client with default settings
+        And user "Alice" has created a file "textfile1.txt" with the following content inside the sync folder of branded client
+            """
+            test file 1
+            """
+        And user "Alice" has created a file "textfile2.txt" with the following content inside the sync folder of branded client
+            """
+            test file 2
+            """
+        And user "Alice" has created a folder "test-folder1" inside the sync folder of branded client
+        And user "Alice" has created a folder "test-folder2" inside the sync folder of branded client
         When the user deletes the file "textfile1.txt"
         And the user deletes the folder "test-folder1"
         And the user waits for the files to sync

test/gui/tst_syncing/test.feature

@@ -6,7 +6,7 @@ Feature: Syncing files
     Background:
         Given user "Alice" has been created in the server with default attributes
 
-    @smokeTest @issue-9281
+    @smokeTest @issue-9281 @predefined_users
     Scenario: Syncing a file to the server
         Given user "Alice" has set up a client with default settings
         When user "Alice" creates a file "lorem-for-upload.txt" with the following content inside the sync folder
@@ -19,12 +19,18 @@ Feature: Syncing files
         Then the file "lorem-for-upload.txt" should have status "Uploaded" in the activity tab
         And as "Alice" the file "lorem-for-upload.txt" should have the content "test content" in the server
 
-
+    @predefined_users
     Scenario: Syncing all files and folders from the server
         Given user "Alice" has created folder "simple-folder" in the server
         And user "Alice" has created folder "large-folder" in the server
         And user "Alice" has uploaded file with content "test content" to "uploaded-lorem.txt" in the server
         And user "Alice" has set up a client with default settings
+        And user "Alice" has created a folder "simple-folder" inside the sync folder of branded client
+        And user "Alice" has created a folder "large-folder" inside the sync folder of branded client
+        And user "Alice" has created a file "uploaded-lorem.txt" with the following content inside the sync folder of branded client
+            """
+            test content
+            """
         Then the file "uploaded-lorem.txt" should exist on the file system
         And the file "uploaded-lorem.txt" should exist on the file system with the following content
             """