From 5424b7fe1fa8a86c03e478788151f4d66edbecf2 Mon Sep 17 00:00:00 2001 From: Moul <moul@moul.re> Date: Fri, 23 Jun 2023 19:10:50 +0200 Subject: [PATCH] Adapt tests to rich_click usage (#466) Adapt click UI changes error report tests Adapt tests with patched click --- tests/unit/money/test_transfer_cli.py | 13 +++++++------ tests/unit/test_g1_monetary_license.py | 2 +- tests/unit/wot/test_revocation.py | 2 +- tests/unit/wot/test_tools.py | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/unit/money/test_transfer_cli.py b/tests/unit/money/test_transfer_cli.py index 021a14c6..01ef73d3 100644 --- a/tests/unit/money/test_transfer_cli.py +++ b/tests/unit/money/test_transfer_cli.py @@ -126,6 +126,7 @@ def test_transaction_amount_errors( TRANSFER = ["money", "transfer"] +MUTUALLY_EXCLUSIVE = "is mutually exclusive with arguments" def test_tx_passed_amount_cli(): @@ -144,22 +145,22 @@ def test_tx_passed_amount_cli(): # Multiple options result = CliRunner().invoke(cli, [*TRANSFER, "--amount", 1, "--amountUD", 1]) - assert "Error: Usage" in result.output + assert MUTUALLY_EXCLUSIVE in result.output assert result.exit_code == 2 result = CliRunner().invoke(cli, [*TRANSFER, "--amount", 1, "--allSources"]) - assert "Error: Usage" in result.output + assert MUTUALLY_EXCLUSIVE in result.output assert result.exit_code == 2 result = CliRunner().invoke(cli, [*TRANSFER, "--amountUD", 1, "--allSources"]) - assert "Error: Usage" in result.output + assert MUTUALLY_EXCLUSIVE in result.output assert result.exit_code == 2 result = CliRunner().invoke( cli, [*TRANSFER, "--amount", 1, "--amountUD", 1, "--allSources"], ) - assert "Error: Usage" in result.output + assert MUTUALLY_EXCLUSIVE in result.output assert result.exit_code == 2 result = CliRunner().invoke(cli, [*TRANSFER, "-r", "A"]) @@ -177,14 +178,14 @@ def test_tx_passed_amount_cli(): cli, [*TRANSFER, "-r", "A", "-a", MINIMAL_ABSOLUTE_TX_AMOUNT - 0.001], ) - assert "Error: Invalid value for '--amount'" in result.output + assert "Invalid value for '--amount'" in result.output assert result.exit_code == 2 result = CliRunner().invoke( cli, [*TRANSFER, "-r", "A", "-d", MINIMAL_RELATIVE_TX_AMOUNT - 1e-07], ) - assert "Error: Invalid value for '--amountUD'" in result.output + assert "Invalid value for '--amountUD'" in result.output assert result.exit_code == 2 result = CliRunner().invoke(cli, [*TRANSFER, "-r", "A", "-a", 1, "-a", 2]) diff --git a/tests/unit/test_g1_monetary_license.py b/tests/unit/test_g1_monetary_license.py index 76d8fa15..2bdbc751 100644 --- a/tests/unit/test_g1_monetary_license.py +++ b/tests/unit/test_g1_monetary_license.py @@ -38,7 +38,7 @@ def test_license_approval_g1_test(capsys): (False, False), ], ) -@patch("click.confirm") +@patch("rich_click.confirm") @patch.object(gml.G1MonetaryLicense, "display_license") def test_license_approval_g1(mock_display_license, mock_confirm, display, approve): # https://stackoverflow.com/a/62939130 diff --git a/tests/unit/wot/test_revocation.py b/tests/unit/wot/test_revocation.py index 42713a05..27710a53 100644 --- a/tests/unit/wot/test_revocation.py +++ b/tests/unit/wot/test_revocation.py @@ -17,8 +17,8 @@ import urllib from pathlib import Path from unittest.mock import Mock -import click import pytest +import rich_click as click from click.testing import CliRunner from duniterpy.api import bma from duniterpy.documents.revocation import Revocation diff --git a/tests/unit/wot/test_tools.py b/tests/unit/wot/test_tools.py index e50f4090..8331a2e9 100644 --- a/tests/unit/wot/test_tools.py +++ b/tests/unit/wot/test_tools.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU Affero General Public License # along with Silkaj. If not, see <https://www.gnu.org/licenses/>. -import click import pytest +import rich_click as click from silkaj.wot import tools as w_tools -- GitLab