File 0002-Fix-tests-for-new-width-behaviour.patch of Package gcalcli
From 53b3a6517e94c42df0bd823cc2f26adba6a14e0b Mon Sep 17 00:00:00 2001
From: Mischa Salle <msalle@nikhef.nl>
Date: Tue, 21 Jan 2025 18:16:48 +0100
Subject: [PATCH 2/4] Fix tests for new width behaviour
---
tests/test_argparsers.py | 10 +++++-----
tests/test_gcalcli.py | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/test_argparsers.py b/tests/test_argparsers.py
index 03ab556..aa462ac 100644
--- a/tests/test_argparsers.py
+++ b/tests/test_argparsers.py
@@ -30,23 +30,23 @@ def test_output_parser(monkeypatch):
return fake_get_terminal_size
output_parser = argparsers.get_output_parser()
- argv = shlex.split('-w 9')
+ argv = shlex.split('-w 29')
with pytest.raises(SystemExit):
output_parser.parse_args(argv)
- argv = shlex.split('-w 10')
- assert output_parser.parse_args(argv).cal_width == 10
+ argv = shlex.split('-w 30')
+ assert output_parser.parse_args(argv).width == 30
argv = shlex.split('')
monkeypatch.setattr(argparsers, 'get_terminal_size', sub_terminal_size(70))
output_parser = argparsers.get_output_parser()
- assert output_parser.parse_args(argv).cal_width == 10
+ assert output_parser.parse_args(argv).width == 70
argv = shlex.split('')
monkeypatch.setattr(argparsers, 'get_terminal_size',
sub_terminal_size(100))
output_parser = argparsers.get_output_parser()
- assert output_parser.parse_args(argv).cal_width == 13
+ assert output_parser.parse_args(argv).width == 100
def test_search_parser():
diff --git a/tests/test_gcalcli.py b/tests/test_gcalcli.py
index dddf86e..a0855b5 100644
--- a/tests/test_gcalcli.py
+++ b/tests/test_gcalcli.py
@@ -86,7 +86,7 @@ def test_cal_query(capsys, PatchedGCalI):
art = gcal.printer.art
expect_top = (
gcal.printer.colors[gcal.options['color_border']] + art['ulc'] +
- art['hrz'] * gcal.options['cal_width'])
+ art['hrz'] * gcal.width['day'])
assert captured.out.startswith(expect_top)
gcal.CalQuery('calm')
@@ -296,13 +296,13 @@ def test_iterate_events(capsys, PatchedGCalI):
def test_next_cut(PatchedGCalI):
gcal = PatchedGCalI()
# default width is 10
- test_cal_width = 10
- gcal.options['cal_width'] = test_cal_width
+ test_day_width = 10
+ gcal.width['day'] = test_day_width
event_title = "first looooong"
assert gcal._next_cut(event_title) == (5, 5)
- event_title = "tooooooloooong"
- assert gcal._next_cut(event_title) == (test_cal_width, test_cal_width)
+ event_title = "tooooooooooooooooooooooooloooooooooong"
+ assert gcal._next_cut(event_title) == (test_day_width, test_day_width)
event_title = "one two three four"
assert gcal._next_cut(event_title) == (7, 7)
--
2.43.0