Merge pull request opencloud-eu#15 from JankariTech/new-test

Fix selectors

Author: prashant-gurung899

test/gui/shared/scripts/names.py

@@ -40,7 +40,7 @@
 add_Folder_Sync_Connection_groupBox_QGroupBox = {"name": "groupBox", "type": "QGroupBox", "visible": 1, "window": add_Folder_Sync_Connection_OCC_FolderWizard}
 add_Folder_Sync_Connection_Deselect_remote_folders_you_do_not_wish_to_synchronize_QLabel = {"text": "Deselect remote folders you do not wish to synchronize.", "type": "QLabel", "unnamed": 1, "visible": 1, "window": add_Folder_Sync_Connection_OCC_FolderWizard}
 folder_Sync_Connection_Deselect_remote_folders_QTreeWidget = {"aboveWidget": add_Folder_Sync_Connection_Deselect_remote_folders_you_do_not_wish_to_synchronize_QLabel, "type": "QTreeWidget", "unnamed": 1, "visible": 1, "window": add_Folder_Sync_Connection_OCC_FolderWizard}
-deselect_remote_folders_you_do_not_wish_to_synchronize_OpenCloud_QModelIndex = {"column": 0, "container": folder_Sync_Connection_Deselect_remote_folders_QTreeWidget, "text": "ownCloud", "type": "QModelIndex"}
+deselect_remote_folders_you_do_not_wish_to_synchronize_OpenCloud_QModelIndex = {"column": 0, "container": folder_Sync_Connection_Deselect_remote_folders_QTreeWidget, "text": "Personal", "type": "QModelIndex"}
 loginRequiredDialog_OCC_LoginRequiredDialog = {"name": "LoginRequiredDialog", "type": "OCC::LoginRequiredDialog", "visible": 1}
 loginRequiredDialog_contentWidget_QStackedWidget = {"name": "contentWidget", "type": "QStackedWidget", "visible": 1, "window": loginRequiredDialog_OCC_LoginRequiredDialog}
 contentWidget_contentWidget_QStackedWidget = {"container": setupWizardWindow_contentWidget_QStackedWidget, "name": "contentWidget", "type": "QStackedWidget", "visible": 1}
@@ -67,4 +67,9 @@
 quickWidget_Overlay = {"container": stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget, "type": "Overlay", "unnamed": 1, "visible": True}
 scrollView_moreButton_Image = {"container": quickWidget_scrollView_ScrollView, "id": "moreButton", "source": "image://opencloud?theme=fontawesome&icon=&enabled=true&size=undefined", "type": "Image", "unnamed": 1, "visible": True}
 pause_sync_MenuItem = {"checkable": False, "container": quickWidget_Overlay, "enabled": True, "text": "Pause sync", "type": "MenuItem", "unnamed": 1, "visible": True}
-quit_OpenCloud_Desktop_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Quit OpenCloud Desktop"}
+quit_OpenCloud_Desktop_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Quit OpenCloud Desktop"}
+stackedWidget_Add_Space_QGroupBox = {"container": stack_stackedWidget_QStackedWidget, "title": "Add Space", "type": "QGroupBox", "unnamed": 1, "visible": 1}
+add_Space_label_QLabel = {"container": stackedWidget_Add_Space_QGroupBox, "name": "label", "type": "QLabel", "visible": 1}
+add_Space_qt_passive_wizardbutton0_QPushButton = {"container": stackedWidget_Add_Space_QGroupBox, "name": "__qt__passive_wizardbutton0", "type": "QPushButton", "visible": 1}
+add_Space_Deselect_remote_folders_you_do_not_wish_to_synchronize_QLabel = {"container": stackedWidget_Add_Space_QGroupBox, "text": "Deselect remote folders you do not wish to synchronize.", "type": "QLabel", "unnamed": 1, "visible": 1}
+add_Space_Deselect_remote_folders_you_do_not_wish_to_synchronize_QTreeWidget = {"aboveWidget": add_Space_Deselect_remote_folders_you_do_not_wish_to_synchronize_QLabel, "container": stackedWidget_Add_Space_QGroupBox, "type": "QTreeWidget", "unnamed": 1, "visible": 1}

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

@@ -17,27 +17,27 @@ class SyncConnectionWizard:
         "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
     }
     CHOOSE_LOCAL_SYNC_FOLDER = {
+        "buddy": names.add_Space_label_QLabel,
         "name": "localFolderLineEdit",
         "type": "QLineEdit",
-        "visible": 1,
-        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+        "visible": 1
     }
     BACK_BUTTON = {
-        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+        "window": names.stackedWidget_Add_Space_QGroupBox,
+        "name": "__qt__passive_wizardbutton0",
         "type": "QPushButton",
-        "text": "< &Back",
         "visible": 1,
     }
     NEXT_BUTTON = {
-        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+        "window": names.stackedWidget_Add_Space_QGroupBox,
+        "name": "__qt__passive_wizardbutton1",
         "type": "QPushButton",
-        "text": "&Next >",
         "visible": 1,
     }
     SELECTIVE_SYNC_ROOT_FOLDER = {
         "column": 0,
-        "container": names.folder_Sync_Connection_Deselect_remote_folders_QTreeWidget,
-        "text": "ownCloud",
+        "container": names.add_Space_Deselect_remote_folders_you_do_not_wish_to_synchronize_QTreeWidget,
+        "text": "Personal",
         "type": "QModelIndex",
     }
     SYNC_DIALOG_FOLDER_TREE = {
@@ -49,7 +49,7 @@ class SyncConnectionWizard:
         "name": "qt_wizard_finish",
         "type": "QPushButton",
         "visible": 1,
-        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+        "window": names.stackedWidget_Add_Space_QGroupBox,
     }
     REMOTE_FOLDER_TREE = {
         "container": names.add_Folder_Sync_Connection_groupBox_QGroupBox,
@@ -146,7 +146,7 @@ def set_sync_path_oc10(sync_path=""):
     def set_sync_path_ocis(sync_path):
         if not sync_path:
             sync_path = path.join(
-                get_current_user_sync_path(), get_config("syncConnectionName")
+                get_current_user_sync_path()
             )
         squish.type(
             squish.waitForObject(SyncConnectionWizard.CHOOSE_LOCAL_SYNC_FOLDER),

test/gui/tst_syncing/test.feature

@@ -68,7 +68,7 @@ Feature: Syncing files
             | user     | Alice          |
             | password | 1234           |
         When the user selects manual sync folder option in advanced section
-        And the user selects "Alice Hansen" space in sync connection wizard
+        And the user selects "Personal" space in sync connection wizard
         And the user sets the sync path in sync connection wizard
         And the user navigates back in the sync connection wizard
         And the user sets the temp folder "localSyncFolder" as local sync path in sync connection wizard