added test to check for incremented number in bracket while adding new account and folder

Author: PrajwolAmatya

test/gui/envs.txt

@@ -1 +1,2 @@
-XDG_CONFIG_HOME=/tmp/owncloudtest/
+XDG_CONFIG_HOME=/tmp/owncloudtest/.config
+HOME=/tmp/owncloudtest

test/gui/shared/scripts/names.py

@@ -55,3 +55,4 @@
 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}
 groupBox_folderTreeWidget_QTreeWidget = {"container": add_Folder_Sync_Connection_groupBox_QGroupBox, "name": "folderTreeWidget", "type": "QTreeWidget", "visible": 1}
 confirm_Folder_Sync_Connection_Removal_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Confirm Folder Sync Connection Removal"}
+stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget = {"container": stack_stackedWidget_QStackedWidget, "name": "quickWidget", "type": "OCC::QmlUtils::OCQuickWidget", "visible": 1}

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

@@ -350,3 +350,11 @@ def isVFSOptionChecked():
             ).checked
             == True
         )
+
+    @staticmethod
+    def get_local_sync_path():
+        return str(
+            squish.waitForObjectExists(
+                AccountConnectionWizard.SELECT_LOCAL_FOLDER
+            ).displayText
+        )

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

@@ -144,6 +144,15 @@ class SyncConnectionWizard:
         "visible": 1,
         "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
     }
+    ADD_FOLDER_SYNC_BUTTON = {
+        "checkable": False,
+        "container": names.stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget,
+        "id": "addSyncButton",
+        "text": "Add Folder",
+        "type": "Button",
+        "unnamed": 1,
+        "visible": True,
+    }
 
     @staticmethod
     def setSyncPathInSyncConnectionWizardOc10(sync_path=''):
@@ -369,3 +378,22 @@ def has_remote_folder(folder_name):
     @staticmethod
     def is_remote_folder_selected(folder_selector):
         return squish.waitForObjectExists(folder_selector).selected
+
+    @staticmethod
+    def select_space_to_sync(space_name):
+        SyncConnectionWizard.selectSpaceToSync(space_name)
+        SyncConnectionWizard.nextStep()
+
+    @staticmethod
+    def open_sync_connection_wizard():
+        squish.mouseClick(
+            squish.waitForObject(SyncConnectionWizard.ADD_FOLDER_SYNC_BUTTON)
+        )
+
+    @staticmethod
+    def get_local_sync_path():
+        return str(
+            squish.waitForObjectExists(
+                SyncConnectionWizard.CHOOSE_LOCAL_SYNC_FOLDER
+            ).displayText
+        )

test/gui/shared/steps/account_context.py

@@ -25,7 +25,7 @@ def step(context, accountType):
     waitForInitialSyncToComplete(getResourcePath('/', account_details["user"], space))
 
 
-@When('the user adds the following wrong user credentials:')
+@When(r'the user adds the following(?: wrong)? user credentials:', regexp=True)
 def step(context):
     account_details = getClientDetails(context)
     AccountConnectionWizard.addUserCreds(
@@ -296,3 +296,19 @@ def step(context, displayname):
     has_focus = Toolbar.account_has_focus(account)
     if not has_focus:
         raise LookupError(f"Account '{displayname}' should be opened, but it is not")
+
+
+@Then(
+    r'the default local sync path should be "([^"]*)" in the (configuration|sync connection) wizard',
+    regexp=True,
+)
+def step(context, sync_path, wizard):
+    test.compare(
+        sync_path,
+        (
+            AccountConnectionWizard.get_local_sync_path()
+            if wizard == 'configuration'
+            else SyncConnectionWizard.get_local_sync_path()
+        ),
+        "Default local download directory should have bracket with incremented number",
+    )

test/gui/shared/steps/file_context.py

@@ -370,3 +370,9 @@ def step(context, username, source):
     source_dir = getResourcePath(source, username)
     destination_dir = getTempResourcePath(source)
     shutil.copy2(source_dir, destination_dir)
+
+
+@Given('folder "|any|" has been created in the local sync path')
+def step(context, folder_name):
+    folder_path = join(get_config('clientRootSyncPath'), folder_name)
+    os.makedirs(prefix_path_namespace(folder_path))

test/gui/shared/steps/sync_context.py

@@ -296,3 +296,13 @@ def step(context):
 def step(context):
     SyncConnection.remove_folder_sync_connection()
     SyncConnection.confirm_folder_sync_connection_removal()
+
+
+@When('the user selects the "|any|" space to sync')
+def step(context, space_name):
+    SyncConnectionWizard.select_space_to_sync(space_name)
+
+
+@When("the user opens the sync connection wizard")
+def step(context):
+    SyncConnectionWizard.open_sync_connection_wizard()

test/gui/tst_addAccount/test.feature

@@ -81,3 +81,33 @@ Feature: adding accounts
         And the user syncs the "Personal" space
         Then the folder "simple-folder" should exist on the file system
 
+    @skipOnOCIS
+    Scenario: Check for incremented number in bracket while adding new account and folder (OC10)
+        Given folder "ownCloud" has been created in the local sync path
+        And the user has started the client
+        And the user has entered the following account information:
+            | server | %local_server% |
+        When the user adds the following user credentials:
+            | user     | Alice |
+            | password | 1234  |
+        And the user opens the advanced configuration
+        Then the default local sync path should be "/tmp/owncloudtest/ownCloud (2)" in the configuration wizard
+        When the user selects download everything option in advanced section
+        And the user opens the sync connection wizard
+        Then the default local sync path should be "/tmp/owncloudtest/ownCloud (2) (2)" in the sync connection wizard
+
+    @skipOnOC10
+    Scenario: Check for incremented number in bracket while adding new account and folder (oCIS)
+        Given folder "ownCloud" has been created in the local sync path
+        And the user has started the client
+        And the user has entered the following account information:
+            | server | %local_server% |
+        When the user adds the following user credentials:
+            | user     | Alice |
+            | password | 1234  |
+        And the user opens the advanced configuration
+        Then the default local sync path should be "/tmp/owncloudtest/ownCloud (2)" in the configuration wizard
+        When the user selects download everything option in advanced section
+        And the user opens the sync connection wizard
+        And the user selects the "Personal" space to sync
+        Then the default local sync path should be "/tmp/owncloudtest/ownCloud (2)/Personal (2)" in the sync connection wizard