Merge pull request #1015 from pixelated/generate-recovery-code

Generate recovery code

3 files changed, 37 insertions, 5 deletions

diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py
index 2e676d9b..2b68dd1b 100644
--- a/service/test/unit/resources/test_backup_account_resource.py
+++ b/service/test/unit/resources/test_backup_account_resource.py
@@ -53,7 +53,9 @@ class TestBackupAccountResource(unittest.TestCase):
         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,
+                self.resource.soledad(request))
             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 <http://www.gnu.org/licenses/>.
+
+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)
diff --git a/service/test/unit/test_account_recovery.py b/service/test/unit/test_account_recovery.py
index 51ba3fd0..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('ABC')
-        mock_session.update_recovery_code.assert_called_once_with('ABC')
+        yield account_recovery.update_recovery_code()
+        mock_bonafide_session.update_recovery_code.assert_called_once_with(generated_code)