Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaw-jan <saw.jan.grg3e@gmail.com>2022-10-31 09:00:27 +0300
committerSaw-jan <saw.jan.grg3e@gmail.com>2022-11-09 08:42:06 +0300
commit9df63ad4b5bb245bacac01e460e47c92953152a0 (patch)
treea54e6ff2a9c6e7ac7980e5516765aeb0320f41bf
parentccc397a0aca5ada749bef3d18b00d90574147f2b (diff)
unskip selective sync sorting test
-rw-r--r--test/gui/shared/scripts/names.py4
-rw-r--r--test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py2
-rw-r--r--test/gui/tst_syncing/test.feature6
3 files changed, 7 insertions, 5 deletions
diff --git a/test/gui/shared/scripts/names.py b/test/gui/shared/scripts/names.py
index 332756bfd..8fce3420d 100644
--- a/test/gui/shared/scripts/names.py
+++ b/test/gui/shared/scripts/names.py
@@ -101,7 +101,6 @@ owncloudWizard_urlLabel_QLabel = {"name": "urlLabel", "type": "QLabel", "visible
choose_What_to_Sync_OCC_SelectiveSyncDialog = {"type": "OCC::SelectiveSyncDialog", "unnamed": 1, "visible": 1, "windowTitle": "Choose What to Sync"}
choose_What_to_Sync_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": choose_What_to_Sync_OCC_SelectiveSyncDialog}
choose_What_To_Synchronize_QTreeWidget = {"aboveWidget": choose_What_to_Sync_Deselect_remote_folders_you_do_not_wish_to_synchronize_QLabel, "type": "QTreeWidget", "unnamed": 1, "visible": 1, "window": choose_What_to_Sync_OCC_SelectiveSyncDialog}
-deselect_remote_folders_you_do_not_wish_to_synchronize_QHeaderView = {"container": choose_What_To_Synchronize_QTreeWidget, "orientation": 1, "type": "QHeaderView", "unnamed": 1, "visible": 1}
linkShares_QToolButton_2 = {"container": oCC_ShareLinkWidget_linkShares_QTableWidget, "occurrence": 2, "type": "QToolButton", "unnamed": 1, "visible": 1}
oCC_ShareLinkWidget_Delete_QPushButton = {"container": qt_tabwidget_stackedwidget_OCC_ShareLinkWidget_OCC_ShareLinkWidget, "text": "Delete", "type": "QPushButton", "unnamed": 1, "visible": 1}
oCC_ShareLinkWidget_pushButton_setPassword_QPushButton = {"container": qt_tabwidget_stackedwidget_OCC_ShareLinkWidget_OCC_ShareLinkWidget, "name": "pushButton_setPassword", "type": "QPushButton", "visible": 1}
@@ -138,4 +137,5 @@ loginRequiredDialog_contentWidget_QStackedWidget = {"name": "contentWidget", "ty
enable_experimental_feature_QMessageBox = {"type": "QMessageBox", "unnamed": 1, "visible": 1, "windowTitle": "Enable experimental feature?"}
enable_experimental_feature_Enable_experimental_placeholder_mode_QPushButton = {"text": "Enable experimental placeholder mode", "type": "QPushButton", "unnamed": 1, "visible": 1, "window": enable_experimental_feature_QMessageBox}
stack_connectLabel_QLabel = {"container": settings_stack_QStackedWidget, "name": "connectLabel", "type": "QLabel", "visible": 1}
-o_folderList_ownCloud_QModelIndex = {"column": 0, "container": stack_folderList_QTreeView, "text": "ownCloud", "type": "QModelIndex"} \ No newline at end of file
+o_folderList_ownCloud_QModelIndex = {"column": 0, "container": stack_folderList_QTreeView, "text": "ownCloud", "type": "QModelIndex"}
+deselect_remote_folders_you_do_not_wish_to_synchronize_QHeaderView_2 = {"container": add_Folder_Sync_Connection_Deselect_remote_folders_you_do_not_wish_to_synchronize_QTreeWidget, "orientation": 1, "type": "QHeaderView", "unnamed": 1, "visible": 1} \ No newline at end of file
diff --git a/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py b/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py
index 8050ce81d..5ff8d07ce 100644
--- a/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py
+++ b/test/gui/shared/scripts/pageObjects/AccountConnectionWizard.py
@@ -202,7 +202,7 @@ class AccountConnectionWizard:
squish.mouseClick(
squish.waitForObject(
{
- "container": names.deselect_remote_folders_you_do_not_wish_to_synchronize_QHeaderView,
+ "container": names.deselect_remote_folders_you_do_not_wish_to_synchronize_QHeaderView_2,
"text": headerText,
"type": "HeaderViewItem",
"visible": True,
diff --git a/test/gui/tst_syncing/test.feature b/test/gui/tst_syncing/test.feature
index 16fb37982..487517c5d 100644
--- a/test/gui/tst_syncing/test.feature
+++ b/test/gui/tst_syncing/test.feature
@@ -86,7 +86,7 @@ Feature: Syncing files
Then the folder "simple-folder" should exist on the file system
But the folder "large-folder" should not exist on the file system
- @skip @issue-9733
+ @issue-9733
Scenario: sort folders list by name and size
Given user "Alice" has created folder "123Folder" on the server
And user "Alice" has uploaded file on the server with content "small" to "123Folder/lorem.txt"
@@ -98,7 +98,9 @@ Feature: Syncing files
| server | %local_server% |
| user | Alice |
| password | 1234 |
- When the user opens chose_what_to_sync dialog
+ When the user selects manual sync folder option in advanced section
+ And the user "Alice" clicks on the next button in sync connection wizard
+ And the user selects "ownCloud" as a remote destination folder
# folders are sorted by name in ascending order by default
Then the folders should be in the following order:
| folder |