From 93e523b26502a127acb7347c09b0394cfbd37643 Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmail.com>
Date: Thu, 19 Jan 2017 05:30:17 +0100
Subject: [PATCH] Fix password typing
---
src/sakia/gui/dialogs/transfer/view.py | 2 +-
tests/conftest.py | 8 ++++++--
tests/functional/test_transfer_dialog.py | 4 +++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/sakia/gui/dialogs/transfer/view.py b/src/sakia/gui/dialogs/transfer/view.py
index 4f9bdffe..fb8d8757 100644
--- a/src/sakia/gui/dialogs/transfer/view.py
+++ b/src/sakia/gui/dialogs/transfer/view.py
@@ -53,7 +53,7 @@ class TransferView(QDialog, Ui_TransferMoneyDialog):
self.search_user.button_reset.hide()
self.user_information_view = user_information_view
self.group_box_recipient.layout().addWidget(user_information_view)
- self.password_input_view = password_input_view
+ self.password_input = password_input_view
self.layout_password_input.addWidget(password_input_view)
self.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
self._amount_base = 0
diff --git a/tests/conftest.py b/tests/conftest.py
index a6716643..c81f1727 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -154,10 +154,14 @@ def application_with_one_connection(application, simple_fake_server, bob):
connection = Connection(currency="test_currency",
pubkey=bob.key.pubkey,
salt=bob.salt, uid=bob.uid,
- scrypt_N=4096, scrypt_r=4, scrypt_p=2,
+ scrypt_N=mirage.User.SCRYPT_PARAMS.N,
+ scrypt_r=mirage.User.SCRYPT_PARAMS.r,
+ scrypt_p=mirage.User.SCRYPT_PARAMS.p,
blockstamp=bob.blockstamp)
application.db.connections_repo.insert(connection)
- blockchain_parameters = BlockchainParameters(*origin_block.parameters)
+
+ parameters = origin_block.parameters
+ blockchain_parameters = BlockchainParameters(*parameters)
blockchain = Blockchain(parameters=blockchain_parameters,
current_buid=current_block.blockUID,
current_members_count=current_block.members_count,
diff --git a/tests/functional/test_transfer_dialog.py b/tests/functional/test_transfer_dialog.py
index 76aee738..d8a01b13 100644
--- a/tests/functional/test_transfer_dialog.py
+++ b/tests/functional/test_transfer_dialog.py
@@ -16,11 +16,13 @@ async def test_transfer(application_with_one_connection, simple_fake_server, bob
transfer_dialog.view.close()
async def exec_test():
- transfer_dialog.model.connection.password = bob.password
QTest.mouseClick(transfer_dialog.view.radio_pubkey, Qt.LeftButton)
QTest.keyClicks(transfer_dialog.view.edit_pubkey, alice.key.pubkey)
transfer_dialog.view.spinbox_amount.setValue(10)
await asyncio.sleep(0.1)
+ assert not transfer_dialog.view.button_box.button(QDialogButtonBox.Ok).isEnabled()
+ await asyncio.sleep(0.1)
+ QTest.keyClicks(transfer_dialog.view.password_input.edit_password, bob.password)
assert transfer_dialog.view.button_box.button(QDialogButtonBox.Ok).isEnabled()
QTest.mouseClick(transfer_dialog.view.button_box.button(QDialogButtonBox.Ok), Qt.LeftButton)
await asyncio.sleep(0.2)
--
GitLab