diff options
Diffstat (limited to 'tests/test_main.py')
| -rw-r--r-- | tests/test_main.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/test_main.py b/tests/test_main.py index 6d05867..a877160 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -130,18 +130,21 @@ class TestLsLl: [ ( PATH_FNAME, - "repo1 cmaster [dsu] \x1b[0m msg \nrepo2 cmaster [dsu] \x1b[0m msg \nxxx cmaster [dsu] \x1b[0m msg \n", + "repo1 \x1b[31mmaster [*+?⇕] \x1b[0m msg \nrepo2 \x1b[31mmaster [*+?⇕] \x1b[0m msg \nxxx \x1b[31mmaster [*+?⇕] \x1b[0m msg \n", ), (PATH_FNAME_EMPTY, ""), ( PATH_FNAME_CLASH, - "repo1 cmaster [dsu] \x1b[0m msg \nrepo2 cmaster [dsu] \x1b[0m msg \n", + "repo1 \x1b[31mmaster [*+?⇕] \x1b[0m msg \nrepo2 \x1b[31mmaster [*+?⇕] \x1b[0m msg \n", ), ], ) @patch("gita.utils.is_git", return_value=True) @patch("gita.info.get_head", return_value="master") - @patch("gita.info._get_repo_status", return_value=("d", "s", "u", "c")) + @patch( + "gita.info._get_repo_status", + return_value=("dirty", "staged", "untracked", "diverged"), + ) @patch("gita.info.get_commit_msg", return_value="msg") @patch("gita.info.get_commit_time", return_value="") @patch("gita.common.get_config_fname") @@ -566,7 +569,7 @@ def test_set_color(mock_get_fname, tmpdir): args = argparse.Namespace() args.color_cmd = "set" args.color = "b_white" - args.situation = "no-remote" + args.situation = "no_remote" with tmpdir.as_cwd(): csv_config = Path.cwd() / "colors.csv" mock_get_fname.return_value = csv_config @@ -576,11 +579,11 @@ def test_set_color(mock_get_fname, tmpdir): items = info.get_color_encoding() info.get_color_encoding.cache_clear() # avoid side effect assert items == { - "no-remote": "b_white", - "in-sync": "green", + "no_remote": "b_white", + "in_sync": "green", "diverged": "red", - "local-ahead": "purple", - "remote-ahead": "yellow", + "local_ahead": "purple", + "remote_ahead": "yellow", } |