From 74bc0565101f065ebdcd33082cf356fee2c8e309 Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Thu, 8 Dec 2016 16:58:37 +0100 Subject: Revert "[#801] serve signup page from signup resource" This reverts commit b6c655b8a15d610166313949b96fadb181627f90. --- service/pixelated/resources/signup_resource.py | 6 ++--- service/templates/signup.html | 19 ------------- .../test/unit/resources/test_signup_resource.py | 31 ++++------------------ web-ui/public/signup.html | 19 +++++++++++++ 4 files changed, 26 insertions(+), 49 deletions(-) delete mode 100644 service/templates/signup.html create mode 100644 web-ui/public/signup.html diff --git a/service/pixelated/resources/signup_resource.py b/service/pixelated/resources/signup_resource.py index cf27be02..e8f53f2d 100644 --- a/service/pixelated/resources/signup_resource.py +++ b/service/pixelated/resources/signup_resource.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import pkg_resources + from twisted.logger import Logger from pixelated.resources import BaseResource @@ -22,6 +22,4 @@ log = Logger() class SignupResource(BaseResource): - - def render_GET(self, request): - return pkg_resources.resource_stream('templates', 'signup.html') + pass diff --git a/service/templates/signup.html b/service/templates/signup.html deleted file mode 100644 index 9814f585..00000000 --- a/service/templates/signup.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - Pixelated Mail - - - - - - -
-
-
- -
- - diff --git a/service/test/unit/resources/test_signup_resource.py b/service/test/unit/resources/test_signup_resource.py index 49a7ee41..3f472357 100644 --- a/service/test/unit/resources/test_signup_resource.py +++ b/service/test/unit/resources/test_signup_resource.py @@ -1,19 +1,3 @@ -# -# Copyright (c) 2016 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 mockito import mock from twisted.trial import unittest @@ -27,18 +11,13 @@ from pixelated.resources.signup_resource import SignupResource class TestSignupResource(unittest.TestCase): + def setUp(self): + self.public_root_resource = RootResource(mock(), get_static_folder(), public=True) + def test_get_resource_for_request(self): - public_root_resource = RootResource(mock(), get_static_folder(), public=True) request = DummyRequest(['signup']) request.addCookie = MagicMock(return_value='stubbed') - public_root_resource.initialize(provider=mock(), authenticator=mock()) - resource = getChildForRequest(public_root_resource, request) + self.public_root_resource.initialize(provider=mock(), authenticator=mock()) + resource = getChildForRequest(self.public_root_resource, request) self.assertIsInstance(resource, SignupResource) - - def test_get_signup_page(self): - signup_resource = SignupResource(mock()) - request = DummyRequest(['signup']) - response = signup_resource.render_GET(request) - - self.assertTrue(any(('signup.js' in line) for line in response)) diff --git a/web-ui/public/signup.html b/web-ui/public/signup.html new file mode 100644 index 00000000..9814f585 --- /dev/null +++ b/web-ui/public/signup.html @@ -0,0 +1,19 @@ + + + + + + Pixelated Mail + + + + + + +
+
+
+ +
+ + -- cgit v1.2.3