Merge pull request opencloud-eu#17 from JankariTech/fix-tests

Fix tests in `tst_syncing` suite

Author: individual-it

test/gui/shared/scripts/names.py

@@ -73,4 +73,6 @@
 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}
-add_Space_qt_passive_wizardbutton1_QPushButton = {"container": stackedWidget_Add_Space_QGroupBox, "name": "__qt__passive_wizardbutton1", "type": "QPushButton", "visible": 1}
+add_Space_qt_passive_wizardbutton1_QPushButton = {"container": stackedWidget_Add_Space_QGroupBox, "name": "__qt__passive_wizardbutton1", "type": "QPushButton", "visible": 1}
+remove_Space_MenuItem = {"checkable": False, "container": quickWidget_Overlay, "enabled": True, "text": "Remove Space", "type": "MenuItem", "unnamed": 1, "visible": True}
+confirm_removal_of_Space_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Confirm removal of Space"}

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

@@ -52,11 +52,11 @@ class SyncConnection:
         "window": names.confirm_Folder_Sync_Connection_Removal_QMessageBox,
     }
     REMOVE_FOLDER_SYNC_CONNECTION_BUTTON = {
-        "text": "Remove Folder Sync Connection",
+        "text": "Remove Space",
         "type": "QPushButton",
         "unnamed": 1,
         "visible": 1,
-        "window": names.confirm_Folder_Sync_Connection_Removal_QMessageBox,
+        "window": names.confirm_removal_of_Space_QMessageBox,
     }
 
     @staticmethod
@@ -148,7 +148,7 @@ def get_folder_connection_count():
 
     @staticmethod
     def remove_folder_sync_connection():
-        SyncConnection.perform_action("Remove folder sync connection")
+        SyncConnection.perform_action("Remove Space")
 
     @staticmethod
     def cancel_folder_sync_connection_removal():

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

@@ -65,14 +65,14 @@ class SyncConnectionWizard:
         "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
     }
     SELECTIVE_SYNC_TREE_HEADER = {
-        "container": names.folder_Sync_Connection_Deselect_remote_folders_QTreeWidget,
+        "container": names.add_Space_Deselect_remote_folders_you_do_not_wish_to_synchronize_QTreeWidget,
         "orientation": 1,
         "type": "QHeaderView",
         "unnamed": 1,
         "visible": 1,
     }
     CANCEL_FOLDER_SYNC_CONNECTION_WIZARD = {
-        "window": names.add_Folder_Sync_Connection_OCC_FolderWizard,
+        "window": names.stackedWidget_Add_Space_QGroupBox,
         "name": "qt_wizard_cancel",
         "type": "QPushButton",
         "visible": 1,

test/gui/shared/steps/sync_context.py

@@ -287,16 +287,6 @@ def step(context, folder_name):
         test.compare(True, has_folder, 'Folder should be in the remote list')
 
 
-@When('the user selects remove folder sync connection option')
-def step(context):
-    SyncConnection.remove_folder_sync_connection()
-
-
-@When('the user cancels the folder sync connection removal dialog')
-def step(context):
-    SyncConnection.cancel_folder_sync_connection_removal()
-
-
 @When('the user removes the folder sync connection')
 def step(context):
     SyncConnection.remove_folder_sync_connection()

test/gui/tst_syncing/test.feature

@@ -479,9 +479,7 @@ Feature: Syncing files
     Scenario: remove folder sync connection
         Given user "Alice" has created folder "simple-folder" in the server
         And user "Alice" has set up a client with default settings
-        When the user selects remove folder sync connection option
-        And the user cancels the folder sync connection removal dialog
-        And the user removes the folder sync connection
+        When the user removes the folder sync connection
         Then the sync folder list should be empty
         And the folder "simple-folder" should exist on the file system
         And as "Alice" folder "simple-folder" should exist in the server