Intent of settingsMerge.ts ×2
All 23 exact tests in this concept. Every test is marked by where it enters the hierarchy.
-
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/23 tests-
platform/23 tests-
userDataSync/23 tests-
test/23 tests-
common/23 tests-
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge ignored setting is not merged when added in remote from base|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge ignored setting is not merged with other changes conflicts|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge ignored setting is not merged with other changes without conflicts|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when a new entries are added to local|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when a new entry is added to remote|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote are same with different base content|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote are same with multiple entries in different order|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote are same with multiple entries|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote are same with one entry|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote has moved forwareded with change in order|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote has moved forwareded with comment changes|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote has moved forwareded with conflicts|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when local and remote with one entry but different value|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when multiple new entries are added to remote|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when the entry is removed in remote but updated in local and a new entry is added in remote|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge with single entry and local is empty|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge resolve when local and remote has moved forwareded with resolved conflicts|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsSync.test|title=SettingsSync - Auto sync when there are conflicts|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test first time sync from the client with changes - merge with profile|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test first time sync from the client with changes - merge|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test stop sync reset status|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test sync conflicts status|occurrence=1 -
mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test sync will sync other non conflicted areas|occurrence=1
-
-
-
-
-