Squish updates for new folders gui (#12471)

* break squish

this reveals the new folders gui against which the tests should be updated

* test: update squish selectors

* update object names on message boxes

including the buttons inside.

* test: update squish selectors with human readable text

---------

Co-authored-by: ishabaral <baralisha.16@gmail.com>

Author: modSpike

src/gui/FoldersGui/accountfolderscontroller.cpp

@@ -206,8 +206,11 @@ void AccountFoldersController::onEnableVfs()
                "\n\n"
                "This action will abort any currently running synchronization."),
             QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+        msgBox.setObjectName("confirmDisableVfsDialog");
         msgBox.button(QMessageBox::Yes)->setText(tr("Disable support"));
+        msgBox.button(QMessageBox::Yes)->setObjectName("disableVfsButton");
         msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
+        msgBox.button(QMessageBox::No)->setObjectName("cancelDisableVfsButton");
 
         int result = msgBox.exec();
         if (result == QDialog::Rejected)
@@ -285,6 +288,9 @@ void AccountFoldersController::onForceSync()
             tr("Synchronization is paused because the Internet connection is a metered connection"
                "<p>Do you really want to force a Synchronization now?"),
             QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+        messageBox.setObjectName("confirmForceSyncWhenMeteredDialog");
+        messageBox.button(QMessageBox::No)->setObjectName("cancelForceSyncWhenMeteredButton");
+        messageBox.button(QMessageBox::Yes)->setObjectName("forceSyncWhenMeteredButton");
         int result = messageBox.exec();
         if (result == QMessageBox::No)
             return;
@@ -305,6 +311,9 @@ void AccountFoldersController::onTogglePauseSync()
             QMessageBox msgbox(QMessageBox::Question, tr("Sync Running"), tr("The sync operation is running.<br/>Do you want to stop it?"),
                 QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
             msgbox.setDefaultButton(QMessageBox::No);
+            msgbox.setObjectName("confirmPauseRunningSyncDialog");
+            msgbox.button(QMessageBox::Yes)->setObjectName("pauseRunningSyncButton");
+            msgbox.button(QMessageBox::No)->setObjectName("cancelPausRunningSyncButton");
             int result = msgbox.exec();
             if (result == QMessageBox::No)
                 return;
@@ -333,6 +342,9 @@ void AccountFoldersController::onRemoveSync()
         QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
     msgBox.button(QMessageBox::Yes)->setText(tr("Remove Folder Sync Connection"));
     msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
+    msgBox.setObjectName("confirmRemoveFolderSyncDialog");
+    msgBox.button(QMessageBox::Yes)->setObjectName("removeFolderSyncButton");
+    msgBox.button(QMessageBox::No)->setObjectName("cancelRemoveFolderSyncButton");
 
     int result = msgBox.exec();
     if (result == QMessageBox::No)

src/gui/accountview.cpp

@@ -378,8 +378,12 @@ void AccountView::slotDeleteAccount()
            "<p><b>Note:</b> This will <b>not</b> delete any files.</p>")
             .arg(_accountState->account()->displayNameWithHost()),
         QMessageBox::NoButton, this);
+    messageBox->setObjectName("confirmRemoveAccountDialog");
     auto yesButton = messageBox->addButton(tr("Remove connection"), QMessageBox::YesRole);
-    messageBox->addButton(tr("Cancel"), QMessageBox::NoRole);
+    yesButton->setObjectName("removeAccountButton");
+    auto noButton = messageBox->addButton(tr("Cancel"), QMessageBox::NoRole);
+    noButton->setObjectName("cancelRemoveAccountButton");
+
     messageBox->setAttribute(Qt::WA_DeleteOnClose);
     connect(messageBox, &QMessageBox::finished, this, [this, messageBox, yesButton]{
         if (messageBox->clickedButton() == yesButton) {

src/gui/settingsdialog.h

@@ -22,7 +22,7 @@
 #include <QMainWindow>
 #include <QStyledItemDelegate>
 
-// #define USE_NEW_FOLDER_LIST
+#define USE_NEW_FOLDER_LIST
 
 namespace OCC {
 

test/gui/shared/scripts/names.py

@@ -52,7 +52,7 @@
 dialogStack_quickWidget_QQuickWidget = {"container": settings_dialogStack_QStackedWidget, "name": "quickWidget", "type": "QQuickWidget", "visible": 1}
 groupBox_folderTreeWidget_QTreeWidget = {"container": add_Folder_Sync_Connection_groupBox_QGroupBox, "name": "folderTreeWidget", "type": "QTreeWidget", "visible": 1}
 confirm_Folder_Sync_Connection_Removal_QMessageBox = {"name":"ConfirmFolderSyncRemovalMessageBox", "type": "QMessageBox", "visible": 1}
-stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget = {"container": stack_stackedWidget_QStackedWidget, "name": "quickWidget", "type": "OCC::QmlUtils::OCQuickWidget", "visible": 1}
+stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget = {"container": stack_stackedWidget_QStackedWidget, "name": "accountFoldersView", "type": "OCC::AccountFoldersView", "visible": 1}
 qt_tabwidget_stackedwidget_OCC_LocalActivityWidget_OCC_LocalActivityWidget = {"container": stack_qt_tabwidget_stackedwidget_QStackedWidget, "name": "OCC__LocalActivityWidget", "type": "OCC::LocalActivityWidget", "visible": 1}
 oCC_LocalActivityWidget_tableView_QTableView = {"container": qt_tabwidget_stackedwidget_OCC_LocalActivityWidget_OCC_LocalActivityWidget, "name": "_tableView", "type": "QTableView", "visible": 1}
 oCC_SyncErrorWidget_tableView_QTableView = {"container": qt_tabwidget_stackedwidget_OCC_SyncErrorWidget_OCC_SyncErrorWidget, "name": "_tableView", "type": "QTableView", "visible": 1}
@@ -63,3 +63,7 @@
 groupBox_OCC_QmlUtils_OCQuickWidget = {"container": stackedWidget_groupBox_QGroupBox, "type": "OCC::QmlUtils::OCQuickWidget", "unnamed": 1, "visible": 1}
 welcome_to_ownCloud_OCC_NewAccountWizard = {"name": "NewAccountWizard", "type": "OCC::NewAccountWizard", "visible": 1}
 server_address_QLabel = {"type": "QLabel", "unnamed": 1, "visible": 1, "window": welcome_to_ownCloud_OCC_NewAccountWizard}
+stackedWidget_accountFoldersTreeView_QTreeView = {"container": stack_stackedWidget_QStackedWidget, "name": "accountFoldersTreeView", "type": "QTreeView", "visible": 1}
+confirm_Folder_Sync_Connection_Removal_QMessageBox_2 = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Confirm Folder Sync Connection Removal"}
+confirmRemoveFolderSyncDialog_QMessageBox = {"name": "confirmRemoveFolderSyncDialog", "type": "QMessageBox", "visible": 1}
+confirmRemoveFolderSyncDialog_removeFolderSyncButton_QPushButton = {"name": "removeFolderSyncButton", "type": "QPushButton", "visible": 1, "window": confirmRemoveFolderSyncDialog_QMessageBox}

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

@@ -16,9 +16,9 @@ class AccountSetting:
         "window": names.settings_OCC_SettingsDialog,
     }
     CONFIRM_REMOVE_CONNECTION_BUTTON = {
-        "container": names.settings_dialogStack_QStackedWidget,
-        "name": "RemoveConnectionButton",
+        "container": names.settings_stack_QStackedWidget,
         "type": "QPushButton",
+        "text": "Remove connection",
         "visible": 1,
     }
     ACCOUNT_CONNECTION_LABEL = {

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

@@ -6,9 +6,10 @@
 
 
 class SyncConnection:
-    FOLDER_SYNC_CONNECTION_LIST = {
-        "container": names.quickWidget_scrollView_ScrollView,
-        "type": "ListView",
+    FOLDER_SYNC_CONNECTION_TREE = {
+        "container": names.stack_stackedWidget_QStackedWidget,
+        "name": "accountFoldersTreeView",
+        "type": "QTreeView",
         "visible": True,
     }
     FOLDER_SYNC_CONNECTION = {
@@ -18,21 +19,21 @@ class SyncConnection:
         "visible": 1,
     }
     FOLDER_SYNC_CONNECTION_LABEL = {
-        "container": names.quickWidget_scrollView_ScrollView,
-        "type": "Label",
-        "unnamed": 1,
-        "visible": True,
+        "container": names.stackedWidget_accountFoldersTreeView_QTreeView,
+        "type": "QModelIndex",
+        "column": 0,
     }
     FOLDER_SYNC_CONNECTION_MENU_BUTTON = {
-        "checkable": False,
-        "container": names.quickWidget_scrollView_ScrollView,
-        "type": "Button",
-        "unnamed": 1,
-        "visible": True,
+        "columnIndex": 1,
+        "container": names.stackedWidget_accountFoldersTreeView_QTreeView,
+        "name": "buttonDelegateButton",
+        "type": "QPushButton",
+        "visible": 1,
     }
     MENU = {
         "type": "QMenu",
         "window": names.settings_OCC_SettingsDialog,
+        "name": "folderOptionsMenu",
         "visible": 1,
     }
     DISABLE_VFS_CONFIRMATION_BUTTON = {
@@ -47,16 +48,16 @@ class SyncConnection:
         "visible": 1,
     }
     CANCEL_FOLDER_SYNC_CONNECTION_DIALOG = {
-        "name": "CancelFolderSyncDialog",
+        "name": "cancelRemoveFolderSyncButton",
         "type": "QPushButton",
         "visible": 1,
-        "window": names.confirm_Folder_Sync_Connection_Removal_QMessageBox,
+        "window": names.confirmRemoveFolderSyncDialog_QMessageBox,
     }
     REMOVE_FOLDER_SYNC_CONNECTION_BUTTON = {
-        "name": "RemoveFolderSyncButton",
+        "name": "removeFolderSyncButton",
         "type": "QPushButton",
         "visible": 1,
-        "window": names.confirm_Folder_Sync_Connection_Removal_QMessageBox,
+        "window": names.confirmRemoveFolderSyncDialog_QMessageBox,
     }
 
     @staticmethod
@@ -68,17 +69,12 @@ def open_menu(sync_folder=""):
         selector = SyncConnection.FOLDER_SYNC_CONNECTION_LABEL.copy()
         selector.update({"text": sync_folder})
 
-        menu_button = None
-
-        # get the parent of the sync folder label
-        parent = object.parent(
-            squish.waitForObject(selector)
-        ).parent.parent.parent.parent.parent
-        children = object.children(squish.waitForObject(parent))
-        for obj in children:
-            # get sync folder menu button
-            if obj.id == "moreButton":
-                menu_button = squish.waitForObject(obj)
+        folder_sync_connection = squish.waitForObject(selector)
+        squish.mouseClick(folder_sync_connection)
+
+        menu_button_selector = SyncConnection.FOLDER_SYNC_CONNECTION_MENU_BUTTON.copy()
+        menu_button_selector.update({"rowIndex": folder_sync_connection.row})
+        menu_button = squish.waitForObject(menu_button_selector)
         squish.mouseClick(menu_button)
 
     @staticmethod
@@ -155,11 +151,12 @@ def unselect_folder_in_selective_sync(folder_name):
 
     @staticmethod
     def get_folder_connection_count():
-        return squish.waitForObject(SyncConnection.FOLDER_SYNC_CONNECTION_LIST).count
+        tree = squish.waitForObject(SyncConnection.FOLDER_SYNC_CONNECTION_TREE)
+        return tree.model().rowCount()
 
     @staticmethod
     def remove_folder_sync_connection(sync_folder=""):
-        SyncConnection.perform_action("Remove folder sync connection", sync_folder)
+        SyncConnection.perform_action("Remove space sync connection", sync_folder)
 
     @staticmethod
     def cancel_folder_sync_connection_removal():

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

@@ -99,9 +99,8 @@ class SyncConnectionWizard:
     ADD_FOLDER_SYNC_BUTTON = {
         "checkable": False,
         "container": names.stackedWidget_quickWidget_OCC_QmlUtils_OCQuickWidget,
-        "id": "addSyncButton",
-        "type": "Button",
-        "unnamed": 1,
+        "name": "addFolderSyncButton",
+        "type": "QPushButton",
         "visible": True,
     }
     WARN_LABEL = {
@@ -303,12 +302,6 @@ def has_remote_folder(folder_name):
     def is_remote_folder_selected(folder_selector):
         return squish.waitForObjectExists(folder_selector).selected
 
-    @staticmethod
-    def open_sync_connection_wizard():
-        squish.mouseClick(
-            squish.waitForObject(SyncConnectionWizard.ADD_FOLDER_SYNC_BUTTON)
-        )
-
     @staticmethod
     def get_local_sync_path():
         return str(