diff --git a/tests/functional/test_certification_dialog.py b/tests/functional/test_certification_dialog.py index 3dde68236ade9aae233b68b71497f3c6f248f42e..b4cd745b251ac604cb13b70c9e1543c7e02f5d49 100644 --- a/tests/functional/test_certification_dialog.py +++ b/tests/functional/test_certification_dialog.py @@ -3,8 +3,8 @@ import pytest from duniterpy.documents import Certification from PyQt5.QtCore import QLocale, Qt, QEvent from PyQt5.QtTest import QTest -from PyQt5.QtWidgets import QDialogButtonBox, QApplication, QMessageBox -from sakia.gui.dialogs.certification.controller import CertificationController +from PyQt5.QtWidgets import QDialogButtonBox +from sakia.gui.sub.certification.controller import CertificationController from ..helpers import click_on_top_message_box @@ -14,7 +14,7 @@ async def test_certification_init_community(application_with_one_connection, fak def close_dialog(): if certification_dialog.view.isVisible(): - certification_dialog.view.close() + certification_dialog.view.hide() async def exec_test(): certification_dialog.model.connection.password = bob.password @@ -23,7 +23,7 @@ async def test_certification_init_community(application_with_one_connection, fak certification_dialog.search_user.view.search("") await asyncio.sleep(1) assert certification_dialog.user_information.model.identity is None - assert not certification_dialog.view.button_box.button(QDialogButtonBox.Ok).isEnabled() + assert not certification_dialog.view.button_process.isEnabled() certification_dialog.search_user.view.combobox_search.lineEdit().clear() QTest.keyClicks(certification_dialog.search_user.view.combobox_search.lineEdit(), alice.key.pubkey) await asyncio.sleep(0.1) @@ -33,7 +33,10 @@ async def test_certification_init_community(application_with_one_connection, fak await asyncio.sleep(0.1) assert certification_dialog.user_information.model.identity.uid == "alice" await asyncio.sleep(0.1) - assert not certification_dialog.view.button_box.button(QDialogButtonBox.Ok).isEnabled() + assert certification_dialog.view.button_process.isEnabled() + QTest.mouseClick(certification_dialog.view.button_process, Qt.LeftButton) + await asyncio.sleep(0.1) + QTest.mouseClick(certification_dialog.view.button_accept, Qt.LeftButton) await asyncio.sleep(0.1) QTest.keyClicks(certification_dialog.password_input.view.edit_secret_key, bob.salt) QTest.keyClicks(certification_dialog.password_input.view.edit_password, bob.password) @@ -45,6 +48,6 @@ async def test_certification_init_community(application_with_one_connection, fak assert isinstance(fake_server_with_blockchain.forge.pool[0], Certification) application_with_one_connection.loop.call_later(10, close_dialog) - asyncio.ensure_future(exec_test()) - await certification_dialog.async_exec() + certification_dialog.view.show() + await exec_test() await fake_server_with_blockchain.close() diff --git a/tests/functional/test_transfer_dialog.py b/tests/functional/test_transfer_dialog.py index d6f5a6de5d50ae24178bad74e9001e630100aed8..1950d32f2b413b90a6f824ef66b1360a44dbdd23 100644 --- a/tests/functional/test_transfer_dialog.py +++ b/tests/functional/test_transfer_dialog.py @@ -3,7 +3,7 @@ import pytest from PyQt5.QtCore import QLocale, Qt from PyQt5.QtTest import QTest from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMessageBox, QApplication -from sakia.gui.dialogs.transfer.controller import TransferController +from sakia.gui.sub.transfer.controller import TransferController from duniterpy.documents import Transaction @@ -13,7 +13,7 @@ async def test_transfer(application_with_one_connection, fake_server_with_blockc def close_dialog(): if transfer_dialog.view.isVisible(): - transfer_dialog.view.close() + transfer_dialog.view.hide() async def exec_test(): QTest.mouseClick(transfer_dialog.view.radio_pubkey, Qt.LeftButton) @@ -30,6 +30,6 @@ async def test_transfer(application_with_one_connection, fake_server_with_blockc assert isinstance(fake_server_with_blockchain.forge.pool[0], Transaction) application_with_one_connection.loop.call_later(10, close_dialog) - asyncio.ensure_future(exec_test()) - await transfer_dialog.async_exec() + transfer_dialog.view.show() + await exec_test() await fake_server_with_blockchain.close()