mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 16:48:31 +02:00
3c923ae943
* Remove search mode conditional that added explicit tag search behavior * Fix failing change-time test by using same method signature as base journal class * Fix user input mock - was not appropriately checking return value * Clean up controller - streamline `run` function in `controller.py` - add debug logging - fix unnecessary import of Journal class (only needed for typing) - standardize summary display across different actions * Add currently-failing test conditions for count messages when changing time and deleting * Don't show summary if no entries found and prevent extra line break when no entries found by short-circuiting display method * Track found entry count and remove incorrect modified stat logic * Track journal entry deletion consistently * Remove unneeded exception when editor is empty and fix test that was testing incorrect message * Correct entry edit modified count test * Track modification of entries with --change-time * Preserve existing behavior when editor is empty but make the message more clear * Reconcile tests with new error message when clearing editor in edit mode * Add found/modified counts to edit tests * Add tests for found count with -n equivalent argument * Test combinations of found/deleted messages when using --delete * Add tests for counting combinations of action arguments (change-time, edit, delete) and for change-time counts. Some are failing and should be investigated * Remove extraneous comment in test * Track added/deleted counts in a register in the Journal class instead of attempting to infer it via controller counting * Add encrypted to more tests * Fix merge conflict typo * Change 'write mode' -> 'append mode' in more places --------- Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
55 lines
1.6 KiB
Python
55 lines
1.6 KiB
Python
# Copyright © 2012-2023 jrnl contributors
|
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
import random
|
|
import string
|
|
from unittest import mock
|
|
|
|
import pytest
|
|
|
|
import jrnl
|
|
from jrnl.args import parse_args
|
|
from jrnl.controller import _display_search_results
|
|
|
|
|
|
@pytest.fixture
|
|
def random_string():
|
|
return "".join(random.choices(string.ascii_uppercase + string.digits, k=25))
|
|
|
|
|
|
@pytest.mark.parametrize("export_format", ["pretty", "short"])
|
|
def test_display_search_results_pretty_short(export_format):
|
|
mock_args = parse_args(["--format", export_format])
|
|
|
|
test_journal = jrnl.journals.Journal()
|
|
test_journal.new_entry("asdf")
|
|
|
|
test_journal.pprint = mock.Mock()
|
|
|
|
_display_search_results(mock_args, test_journal)
|
|
|
|
test_journal.pprint.assert_called_once()
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"export_format", ["markdown", "json", "xml", "yaml", "fancy", "dates"]
|
|
)
|
|
@mock.patch("jrnl.plugins.get_exporter")
|
|
@mock.patch("builtins.print")
|
|
def test_display_search_results_builtin_plugins(
|
|
mock_print, mock_exporter, export_format, random_string
|
|
):
|
|
test_filename = random_string
|
|
mock_args = parse_args(["--format", export_format, "--file", test_filename])
|
|
|
|
test_journal = jrnl.journals.Journal()
|
|
test_journal.new_entry("asdf")
|
|
|
|
mock_export = mock.Mock()
|
|
mock_exporter.return_value.export = mock_export
|
|
|
|
_display_search_results(mock_args, test_journal)
|
|
|
|
mock_exporter.assert_called_once_with(export_format)
|
|
mock_export.assert_called_once_with(test_journal, test_filename)
|
|
mock_print.assert_called_once_with(mock_export.return_value)
|