added tests for adding folder to sync

Author: PrajwolAmatya

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

@@ -127,6 +127,7 @@ def setUpClient(username, displayName, space="Personal"):
     0/url={local_server}
     0/user={displayUserFirstName}
     0/version=1
+    0\supportsSpaces={supportsSpaces}
     version=2
     '''
 
@@ -154,6 +155,7 @@ def setUpClient(username, displayName, space="Personal"):
         'local_server': server_url,
         'oauth': 'true' if is_ocis else 'false',
         'vfs': 'wincfapi' if isWindows() else 'off',
+        'supportsSpaces': 'true' if is_ocis else 'false',
     }
     userSetting = userSetting.format(**args)
 

test/gui/shared/scripts/names.py

@@ -49,3 +49,5 @@
 o_folderList_Personal_QModelIndex = {"column": 0, "container": stack_folderList_QTreeView, "text": "Personal", "type": "QModelIndex"}
 add_Folder_Sync_Connection_tableView_QTableView = {"name": "tableView","type": "QTableView","visible": 1,"window": add_Folder_Sync_Connection_OCC_FolderWizard}
 stack_scrollArea_QScrollArea = {"container": settings_stack_QStackedWidget, "name": "scrollArea", "type": "QScrollArea", "visible": 1}
+create_Remote_Folder_QInputDialog = {"type": "QInputDialog", "unnamed": 1, "visible": 1, "windowTitle": "Create Remote Folder"}
+create_Remote_Folder_Enter_the_name_of_the_new_folder_to_be_created_below_QLabel = {"text": "Enter the name of the new folder to be created below '/':", "type": "QLabel", "unnamed": 1, "visible": 1, "window": create_Remote_Folder_QInputDialog}

test/gui/shared/scripts/pageObjects/SyncConnection.py

@@ -29,6 +29,49 @@ class SyncConnection:
         "type": "QPushButton",
         "visible": 1,
     }
+    ADD_FOLDER_SYNC_BUTTON = {
+        "container": names.settings_stack_QStackedWidget,
+        "name": "addButton",
+        "type": "QPushButton",
+        "visible": 1,
+    }
+    NAVIGATE_BACK_BUTTON = {
+        "name": "__qt__passive_wizardbutton0",
+        "type": "QPushButton",
+        "visible": 1,
+        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+    }
+    ADD_FOLDER_BUTTON = {
+        "container": names.add_Folder_Sync_Connection_groupBox_QGroupBox,
+        "name": "addFolderButton",
+        "type": "QPushButton",
+        "visible": 1,
+    }
+    ADD_FOLDER_INPUT = {
+        "buddy": names.create_Remote_Folder_Enter_the_name_of_the_new_folder_to_be_created_below_QLabel,
+        "type": "QLineEdit",
+        "unnamed": 1,
+        "visible": 1,
+    }
+    ADD_FOLDER_CONFIRM = {
+        "text": "OK",
+        "type": "QPushButton",
+        "unnamed": 1,
+        "visible": 1,
+        "window": names.create_Remote_Folder_QInputDialog,
+    }
+    REFRESH_BUTTON = {
+        "container": names.add_Folder_Sync_Connection_groupBox_QGroupBox,
+        "name": "refreshButton",
+        "type": "QPushButton",
+        "visible": 1,
+    }
+    FOLDER_ENTRY_INPUT = {
+        "name": "folderEntry",
+        "type": "QLineEdit",
+        "visible": 1,
+        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+    }
 
     @staticmethod
     def openMenu():
@@ -111,3 +154,36 @@ def unselect_folder_in_selective_sync(folder_name):
         squish.clickButton(
             squish.waitForObject(SyncConnection.SELECTIVE_SYNC_APPLY_BUTTON)
         )
+
+    @staticmethod
+    def click_on_add_button():
+        squish.clickButton(squish.waitForObject(SyncConnection.ADD_FOLDER_SYNC_BUTTON))
+
+    @staticmethod
+    def navigate_back():
+        squish.clickButton(squish.waitForObject(SyncConnection.NAVIGATE_BACK_BUTTON))
+
+    @staticmethod
+    def create_folder_in_remote_destination(folderName):
+        squish.clickButton(squish.waitForObject(SyncConnection.ADD_FOLDER_BUTTON))
+        squish.type(squish.waitForObject(SyncConnection.ADD_FOLDER_INPUT), folderName)
+        squish.clickButton(squish.waitForObject(SyncConnection.ADD_FOLDER_CONFIRM))
+
+    @staticmethod
+    def refresh_add_folder_sync_connection_window():
+        squish.clickButton(squish.waitForObject(SyncConnection.REFRESH_BUTTON))
+
+    @staticmethod
+    def check_foldername(folderName):
+        return (
+            str(
+                squish.waitForObjectExists(
+                    SyncConnection.FOLDER_ENTRY_INPUT
+                ).displayText
+            ).strip('/')
+            == folderName
+        )
+
+    @staticmethod
+    def check_connection_folder_entry(folderName):
+        return squish.waitFor(lambda: SyncConnection.check_foldername(folderName), 5000)

test/gui/shared/steps/sync_context.py

@@ -237,3 +237,31 @@ def step(context, action):
 def step(context, folder_name):
     SyncConnection.choose_what_to_sync()
     SyncConnection.unselect_folder_in_selective_sync(folder_name)
+
+
+@Given("the user clicks on add folder button")
+def step(context):
+    SyncConnection.click_on_add_button()
+
+
+@When('the user navigates back to sync local folder')
+def step(context):
+    SyncConnection.navigate_back()
+
+
+@When('user creates a folder "|any|"  in a remote destination')
+def step(context, folderName):
+    SyncConnection.create_folder_in_remote_destination(folderName)
+
+
+@When('user refreshes the Add Folder Sync connection window')
+def step(context):
+    SyncConnection.refresh_add_folder_sync_connection_window()
+
+
+@Then(
+    r'^the sync connection folder entry should contain folder "([^"]*)"$', regexp=True
+)
+def step(context, folderName):
+    result = SyncConnection.check_connection_folder_entry(folderName)
+    test.compare(True, result)

test/gui/tst_syncing/test.feature

@@ -480,3 +480,21 @@ Feature: Syncing files
         Then the folder "simple-folder" should not exist on the file system
         And the folder "test-folder/sub-folder2" should exist on the file system
         And the folder "test-folder/sub-folder1" should not exist on the file system
+
+
+    Scenario: Add folder to sync
+        Given user "Alice" has set up a client with default settings
+        And the user clicks on add folder button
+        When the user sets the temp folder "test-folder1" as local sync path in sync connection wizard
+        And the user navigates back to sync local folder
+        And the user sets the temp folder "test-folder2" as local sync path in sync connection wizard
+        And user creates a folder "test-folder"  in a remote destination
+        Then the sync connection folder entry should contain folder "test-folder"
+        When user refreshes the Add Folder Sync connection window
+        Then the sync connection folder entry should contain folder ""
+        When the user selects "ownCloud" as a remote destination folder
+        And the user selects the following folders to sync:
+            | folder            |
+            | test-folder  |
+        Then the folder "test-folder" should exist on the file system
+        And as "Alice" folder "test-folder" should exist in the server