From 21c970e4b4ff6276fb8130d8ac531b85a9112447 Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 12 Jul 2018 11:39:22 -0400 Subject: [PATCH] rename some handlers with more specificity --- atst/app.py | 26 +++++++++---------- atst/handlers/{login.py => login_redirect.py} | 2 +- atst/handlers/main.py | 2 +- atst/handlers/{home.py => root.py} | 2 +- tests/test_auth.py | 10 +++---- 5 files changed, 21 insertions(+), 21 deletions(-) rename atst/handlers/{login.py => login_redirect.py} (96%) rename atst/handlers/{home.py => root.py} (87%) diff --git a/atst/app.py b/atst/app.py index a0b3e491..0cce9376 100644 --- a/atst/app.py +++ b/atst/app.py @@ -4,9 +4,9 @@ import tornado.web from tornado.web import url from redis import StrictRedis -from atst.handlers.main import MainHandler -from atst.handlers.home import Home -from atst.handlers.login import Login +from atst.handlers.main import Main +from atst.handlers.root import Root +from atst.handlers.login_redirect import LoginRedirect from atst.handlers.workspace import Workspace from atst.handlers.request import Request from atst.handlers.request_new import RequestNew @@ -22,23 +22,23 @@ ENV = os.getenv("TORNADO_ENV", "dev") def make_app(config, deps, **kwargs): routes = [ - url(r"/", Home, {"page": "login"}, name="main"), + url(r"/", Root, {"page": "login"}, name="root"), url( - r"/login", - Login, + r"/login-redirect", + LoginRedirect, {"sessions": deps["sessions"], "authnid_client": deps["authnid_client"]}, - name="login", + name="login_redirect", ), - url(r"/home", MainHandler, {"page": "home"}, name="home"), + url(r"/home", Main, {"page": "home"}, name="home"), url( r"/styleguide", - MainHandler, + Main, {"page": "styleguide"}, name="styleguide", ), url( r"/workspaces/blank", - MainHandler, + Main, {"page": "workspaces_blank"}, name="workspaces_blank", ), @@ -78,9 +78,9 @@ def make_app(config, deps, **kwargs): {"requests_client": deps["requests_client"]}, name="requests_submit", ), - url(r"/users", MainHandler, {"page": "users"}, name="users"), - url(r"/reports", MainHandler, {"page": "reports"}, name="reports"), - url(r"/calculator", MainHandler, {"page": "calculator"}, name="calculator"), + url(r"/users", Main, {"page": "users"}, name="users"), + url(r"/reports", Main, {"page": "reports"}, name="reports"), + url(r"/calculator", Main, {"page": "calculator"}, name="calculator"), ] if not ENV == "production": diff --git a/atst/handlers/login.py b/atst/handlers/login_redirect.py similarity index 96% rename from atst/handlers/login.py rename to atst/handlers/login_redirect.py index 4e8b6f2d..9fa9998f 100644 --- a/atst/handlers/login.py +++ b/atst/handlers/login_redirect.py @@ -2,7 +2,7 @@ import tornado from atst.handler import BaseHandler -class Login(BaseHandler): +class LoginRedirect(BaseHandler): def initialize(self, authnid_client, sessions): self.authnid_client = authnid_client self.sessions = sessions diff --git a/atst/handlers/main.py b/atst/handlers/main.py index 025c3c53..737d3bd7 100644 --- a/atst/handlers/main.py +++ b/atst/handlers/main.py @@ -2,7 +2,7 @@ import tornado from atst.handler import BaseHandler -class MainHandler(BaseHandler): +class Main(BaseHandler): def initialize(self, page): self.page = page diff --git a/atst/handlers/home.py b/atst/handlers/root.py similarity index 87% rename from atst/handlers/home.py rename to atst/handlers/root.py index 483bd161..ec68bfcc 100644 --- a/atst/handlers/home.py +++ b/atst/handlers/root.py @@ -1,7 +1,7 @@ from atst.handler import BaseHandler -class Home(BaseHandler): +class Root(BaseHandler): def initialize(self, page): self.page = page diff --git a/tests/test_auth.py b/tests/test_auth.py index 0f5cd6f3..b5c420e2 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -21,7 +21,7 @@ def test_redirects_when_not_logged_in(http_client, base_url): @pytest.mark.gen_test def test_redirects_when_session_does_not_exist(monkeypatch, http_client, base_url): - monkeypatch.setattr("atst.handlers.main.MainHandler.get_secure_cookie", lambda s,c: 'stale cookie!') + monkeypatch.setattr("atst.handlers.main.Main.get_secure_cookie", lambda s,c: 'stale cookie!') response = yield http_client.fetch( base_url + "/home", raise_error=False, follow_redirects=False ) @@ -33,9 +33,9 @@ def test_redirects_when_session_does_not_exist(monkeypatch, http_client, base_ur @pytest.mark.gen_test def test_login_with_valid_bearer_token(app, monkeypatch, http_client, base_url): - monkeypatch.setattr("atst.handlers.login.Login._fetch_user_info", _fetch_user_info) + monkeypatch.setattr("atst.handlers.login_redirect.LoginRedirect._fetch_user_info", _fetch_user_info) response = yield http_client.fetch( - base_url + "/login?bearer-token=abc-123", + base_url + "/login-redirect?bearer-token=abc-123", follow_redirects=False, raise_error=False, ) @@ -65,10 +65,10 @@ def test_login_with_invalid_bearer_token(http_client, base_url): @pytest.mark.gen_test def test_valid_login_creates_session(app, monkeypatch, http_client, base_url): - monkeypatch.setattr("atst.handlers.login.Login._fetch_user_info", _fetch_user_info) + monkeypatch.setattr("atst.handlers.login_redirect.LoginRedirect._fetch_user_info", _fetch_user_info) assert len(app.sessions.sessions) == 0 yield http_client.fetch( - base_url + "/login?bearer-token=abc-123", + base_url + "/login-redirect?bearer-token=abc-123", follow_redirects=False, raise_error=False, )