From 3bc6901663c60e6b477477bd6e47e9f60fbb895b Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 16 Mar 2017 14:54:50 -0300 Subject: [#1012] Extracts generation of recovery code to AccountRecovery with @tayanefernandes --- service/test/unit/test_account_recovery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'service/test') diff --git a/service/test/unit/test_account_recovery.py b/service/test/unit/test_account_recovery.py index 51ba3fd0..026d161f 100644 --- a/service/test/unit/test_account_recovery.py +++ b/service/test/unit/test_account_recovery.py @@ -29,5 +29,5 @@ class AccountRecoveryTest(unittest.TestCase): mock_session = Mock() account_recovery = AccountRecovery(mock_session) - yield account_recovery.update_recovery_code('ABC') - mock_session.update_recovery_code.assert_called_once_with('ABC') + yield account_recovery.update_recovery_code() + mock_session.update_recovery_code.assert_called_once_with('123') -- cgit v1.2.3 From 067db035910c8284d508401c34ca4cb5928c2b52 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Fri, 17 Mar 2017 11:18:39 -0300 Subject: [#1012] Generates recovery code in soledad client with @tayanefernandes --- service/test/unit/resources/test_backup_account_resource.py | 7 +++++-- service/test/unit/test_account_recovery.py | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'service/test') diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py index 2e676d9b..09520969 100644 --- a/service/test/unit/resources/test_backup_account_resource.py +++ b/service/test/unit/resources/test_backup_account_resource.py @@ -16,7 +16,8 @@ import os -from mock import MagicMock, patch +from mock import MagicMock, patch, ANY + from twisted.trial import unittest from twisted.web.test.requesthelper import DummyRequest from twisted.internet import defer @@ -48,12 +49,14 @@ class TestBackupAccountResource(unittest.TestCase): mock_account_recovery = MagicMock() mock_account_recovery_init.return_value = mock_account_recovery mock_account_recovery.update_recovery_code.return_value = defer.succeed("Success") + request = DummyRequest(['/backup-account']) request.method = 'POST' d = self.web.get(request) def assert_update_recovery_code_called(_): - mock_account_recovery_init.assert_called_with(self.resource._authenticator.bonafide_session) + mock_account_recovery_init.assert_called_with( + self.resource._authenticator.bonafide_session, ANY) mock_account_recovery.update_recovery_code.assert_called() d.addCallback(assert_update_recovery_code_called) diff --git a/service/test/unit/test_account_recovery.py b/service/test/unit/test_account_recovery.py index 026d161f..af14814a 100644 --- a/service/test/unit/test_account_recovery.py +++ b/service/test/unit/test_account_recovery.py @@ -26,8 +26,11 @@ class AccountRecoveryTest(unittest.TestCase): @inlineCallbacks def test_update_recovery_code(self): - mock_session = Mock() - account_recovery = AccountRecovery(mock_session) + generated_code = '4645a2f8997e5d0d' + mock_bonafide_session = Mock() + mock_soledad = Mock() + mock_soledad.create_recovery_code.return_value = generated_code + account_recovery = AccountRecovery(mock_bonafide_session, mock_soledad) yield account_recovery.update_recovery_code() - mock_session.update_recovery_code.assert_called_once_with('123') + mock_bonafide_session.update_recovery_code.assert_called_once_with(generated_code) -- cgit v1.2.3 From e3b3005b8b98dbb689546495c71999a929aed016 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Fri, 17 Mar 2017 14:48:40 -0300 Subject: [#1012] Refactors getting soledad service in BaseResource with @tayanefernandes --- .../unit/resources/test_backup_account_resource.py | 7 +++--- service/test/unit/resources/test_base_resource.py | 27 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 service/test/unit/resources/test_base_resource.py (limited to 'service/test') diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py index 09520969..3d23256e 100644 --- a/service/test/unit/resources/test_backup_account_resource.py +++ b/service/test/unit/resources/test_backup_account_resource.py @@ -16,8 +16,7 @@ import os -from mock import MagicMock, patch, ANY - +from mock import MagicMock, patch from twisted.trial import unittest from twisted.web.test.requesthelper import DummyRequest from twisted.internet import defer @@ -49,14 +48,14 @@ class TestBackupAccountResource(unittest.TestCase): mock_account_recovery = MagicMock() mock_account_recovery_init.return_value = mock_account_recovery mock_account_recovery.update_recovery_code.return_value = defer.succeed("Success") - request = DummyRequest(['/backup-account']) request.method = 'POST' d = self.web.get(request) def assert_update_recovery_code_called(_): mock_account_recovery_init.assert_called_with( - self.resource._authenticator.bonafide_session, ANY) + self.resource._authenticator.bonafide_session, + self.services_factory.services()._leap_session.soledad) mock_account_recovery.update_recovery_code.assert_called() d.addCallback(assert_update_recovery_code_called) diff --git a/service/test/unit/resources/test_base_resource.py b/service/test/unit/resources/test_base_resource.py new file mode 100644 index 00000000..35ae67c7 --- /dev/null +++ b/service/test/unit/resources/test_base_resource.py @@ -0,0 +1,27 @@ +# +# Copyright (c) 2017 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see . + +from mock import MagicMock +from twisted.trial import unittest +from pixelated.resources import BaseResource + + +class TestBaseResource(unittest.TestCase): + def test_get_soledad_service(self): + mock_services_factory = MagicMock() + base_resource = BaseResource(mock_services_factory) + + self.assertEqual(base_resource.soledad('request'), mock_services_factory.services()._leap_session.soledad) -- cgit v1.2.3 From fcedbb416c7ab60899740945af48893df88d85b8 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Mon, 20 Mar 2017 16:03:25 -0300 Subject: [#1012] Refactors how we retrieve soledad service with @tayanefernandes --- service/test/unit/resources/test_backup_account_resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/test') diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py index 3d23256e..2b68dd1b 100644 --- a/service/test/unit/resources/test_backup_account_resource.py +++ b/service/test/unit/resources/test_backup_account_resource.py @@ -55,7 +55,7 @@ class TestBackupAccountResource(unittest.TestCase): def assert_update_recovery_code_called(_): mock_account_recovery_init.assert_called_with( self.resource._authenticator.bonafide_session, - self.services_factory.services()._leap_session.soledad) + self.resource.soledad(request)) mock_account_recovery.update_recovery_code.assert_called() d.addCallback(assert_update_recovery_code_called) -- cgit v1.2.3