diff options
| -rw-r--r-- | service/pixelated/resources/account_recovery_resource.py | 12 | ||||
| -rw-r--r-- | service/test/unit/resources/test_account_recovery_resource.py | 43 |
2 files changed, 45 insertions, 10 deletions
diff --git a/service/pixelated/resources/account_recovery_resource.py b/service/pixelated/resources/account_recovery_resource.py index 4b88ff44..a69cac9a 100644 --- a/service/pixelated/resources/account_recovery_resource.py +++ b/service/pixelated/resources/account_recovery_resource.py @@ -17,11 +17,10 @@ import os from xml.sax import SAXParseException -from pixelated.resources import BaseResource, UnAuthorizedResource +from pixelated.resources import BaseResource from twisted.python.filepath import FilePath from pixelated.resources import get_static_folder from twisted.web.http import OK -from twisted.web.resource import NoResource from twisted.web.template import Element, XMLFile, renderElement @@ -33,18 +32,11 @@ class AccountRecoveryPage(Element): class AccountRecoveryResource(BaseResource): - BASE_URL = 'recovery' + isLeaf = True def __init__(self, services_factory): BaseResource.__init__(self, services_factory) - def getChild(self, path, request): - if path == BASE_URL: - return self - if not self.is_logged_in(request): - return UnAuthorizedResource() - return NoResource() - def render_GET(self, request): request.setResponseCode(OK) return self._render_template(request) diff --git a/service/test/unit/resources/test_account_recovery_resource.py b/service/test/unit/resources/test_account_recovery_resource.py new file mode 100644 index 00000000..01ffaed2 --- /dev/null +++ b/service/test/unit/resources/test_account_recovery_resource.py @@ -0,0 +1,43 @@ +# +# 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/>. + +import os + +from mock import MagicMock, patch +from twisted.trial import unittest +from twisted.web.test.requesthelper import DummyRequest + +from pixelated.resources.account_recovery_resource import AccountRecoveryResource +from test.unit.resources import DummySite + + +class TestAccountRecoveryResource(unittest.TestCase): + def setUp(self): + self.services_factory = MagicMock() + self.resource = AccountRecoveryResource(self.services_factory) + self.web = DummySite(self.resource) + + def test_get(self): + request = DummyRequest(['/recovery']) + request.method = 'GET' + d = self.web.get(request) + + def assert_200_when_user_logged_in(_): + self.assertEqual(200, request.responseCode) + self.assertIn("DOCTYPE html", request.written[0]) + + d.addCallback(assert_200_when_user_logged_in) + return d |