diff options
| author | Saw-jan <saw.jan.grg3e@gmail.com> | 2022-10-31 07:07:32 +0300 |
|---|---|---|
| committer | Saw-jan <saw.jan.grg3e@gmail.com> | 2022-11-09 08:41:33 +0300 |
| commit | 8317b63e830bd8d7a680af3b1138c164b4044f2f (patch) | |
| tree | 9787e9af48efab3ec7ebd25487664d7ab9a4db60 | |
| parent | 6f2dd0d9ada521f6a1dd17d2c91bcc141f9dcb89 (diff) | |
unskip sync conflict test
| -rw-r--r-- | test/gui/shared/steps/steps.py | 2 | ||||
| -rw-r--r-- | test/gui/tst_syncing/test.feature | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/gui/shared/steps/steps.py b/test/gui/shared/steps/steps.py index c6339c29f..b895e55a5 100644 --- a/test/gui/shared/steps/steps.py +++ b/test/gui/shared/steps/steps.py @@ -670,7 +670,7 @@ def step(context): def step(context, filename): fileContent = "\n".join(context.multiLineText) waitAndWriteFile( - join(context.userData['currentUserSyncPath'], filename), fileContent + context, join(context.userData['currentUserSyncPath'], filename), fileContent ) diff --git a/test/gui/tst_syncing/test.feature b/test/gui/tst_syncing/test.feature index bd054ede2..3c17e1797 100644 --- a/test/gui/tst_syncing/test.feature +++ b/test/gui/tst_syncing/test.feature @@ -31,7 +31,7 @@ Feature: Syncing files And the folder "simple-folder" should exist on the file system And the folder "large-folder" should exist on the file system - @skip @issue-9733 + @issue-9733 Scenario: Syncing a file from the server and creating a conflict Given user "Alice" has uploaded file on the server with content "server content" to "/conflict.txt" And user "Alice" has set up a client with default settings @@ -44,7 +44,6 @@ Feature: Syncing files When the user resumes the file sync on the client And the user clicks on the activity tab And the user selects "Not Synced" tab in the activity - # Then a conflict warning should be shown for 1 files Then the table of conflict warnings should include file "conflict.txt" And the file "conflict.txt" should exist on the file system with the following content """ |