import pytest from PySide6.QtCore import QSettings, QTimer, Qt from PySide6.QtWidgets import QApplication, QDialog, QListWidget from mdhelper import main_window, save_conflict def test_chunk_choices_preserve_insertions_deletions_and_final_newline(): comparison = save_conflict.ConflictComparison('A\nlocal\nB\nremove\nC', 'A\nremote\nB\nC\nadded\n') assert comparison.merge() == 'A\nlocal\nB\nremove\nC' assert comparison.merge(range(len(comparison.changes))) == 'A\nremote\nB\nC\nadded\n' assert comparison.merge([0]).startswith('A\nremote\nB\nremove') assert save_conflict.ConflictComparison('', 'new').merge([0]) == 'new' def test_comparison_dialog_uses_selected_disk_chunk(qt_application, tmp_path): def choose(): dialog = QApplication.activeModalWidget() dialog.findChild(QListWidget).item(0).setCheckState(Qt.CheckState.Checked) dialog.accept() QTimer.singleShot(30, choose) assert save_conflict.resolve_save_conflict(None, tmp_path / 'note.md', 'a\nlocal\n', 'a\nremote\n', 'a\nbase\n') == 'a\nremote\n' @pytest.mark.parametrize('decision', ['cancel', 'merge', 'race', 'deleted', 'same_metadata']) def test_editor_conflict_protects_both_versions(qt_application, tmp_path, monkeypatch, decision): settings = QSettings(str(tmp_path / 'settings.ini'), QSettings.Format.IniFormat) monkeypatch.setattr(main_window, 'QSettings', lambda *_: settings) monkeypatch.setenv('MDHELPER_HISTORY_DIR', str(tmp_path / 'history')) monkeypatch.setattr(main_window.QMessageBox, 'warning', lambda *_: None) path = tmp_path / 'note.md'; path.write_text('base') window = main_window.MainWindow(tmp_path) try: window.open_document(path); window.edit_current_markdown() editor = window.tabs.currentWidget(); editor.replace_source_undoable('local') if decision == 'deleted': path.unlink() elif decision == 'same_metadata': import os stamp = path.stat() path.write_text('disk') os.utime(path, ns=(stamp.st_atime_ns, stamp.st_mtime_ns)) else: path.write_text('external modification') def choose(*args, **kwargs): if decision == 'cancel': return None if decision == 'race': path.write_text('newer external change') return 'merged result' monkeypatch.setattr(save_conflict, 'resolve_save_conflict', choose) saved = window._save_editor_tab(editor, path, editor.source_text(), editor.session.signature) assert saved == (decision in {'merge', 'deleted', 'same_metadata'}) if saved: assert path.read_text() == editor.source_text() == editor.session.saved_source == 'merged result' assert not editor.has_unsaved_changes() else: assert editor.source_text() == 'local' assert path.read_text() == ('newer external change' if decision == 'race' else 'external modification') editor.mark_saved(path, editor.source_text(), window._file_signature(path)) finally: window.close()