pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename some handlers with more specificity

Browse Source
This commit is contained in:
dandds 2018-07-12 11:39:22 -04:00
parent c9a45f6364
commit 21c970e4b4
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
atst/app.py
View File

@ -4,9 +4,9 @@ import tornado.web
from tornado.web import url from tornado.web import url
from redis import StrictRedis from redis import StrictRedis
from atst.handlers.main import MainHandler from atst.handlers.main import Main
from atst.handlers.home import Home from atst.handlers.root import Root
from atst.handlers.login import Login from atst.handlers.login_redirect import LoginRedirect
from atst.handlers.workspace import Workspace from atst.handlers.workspace import Workspace
from atst.handlers.request import Request from atst.handlers.request import Request
from atst.handlers.request_new import RequestNew from atst.handlers.request_new import RequestNew
@ -22,23 +22,23 @@ ENV = os.getenv("TORNADO_ENV", "dev")
def make_app(config, deps, **kwargs): def make_app(config, deps, **kwargs):
routes = [ routes = [
url(r"/", Home, {"page": "login"}, name="main"), url(r"/", Root, {"page": "login"}, name="root"),
url( url(
r"/login", r"/login-redirect",
Login, LoginRedirect,
{"sessions": deps["sessions"], "authnid_client": deps["authnid_client"]}, {"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( url(
r"/styleguide", r"/styleguide",
MainHandler, Main,
{"page": "styleguide"}, {"page": "styleguide"},
name="styleguide", name="styleguide",
), ),
url( url(
r"/workspaces/blank", r"/workspaces/blank",
MainHandler, Main,
{"page": "workspaces_blank"}, {"page": "workspaces_blank"},
name="workspaces_blank", name="workspaces_blank",
), ),
@ -78,9 +78,9 @@ def make_app(config, deps, **kwargs):
{"requests_client": deps["requests_client"]}, {"requests_client": deps["requests_client"]},
name="requests_submit", name="requests_submit",
), ),
url(r"/users", MainHandler, {"page": "users"}, name="users"), url(r"/users", Main, {"page": "users"}, name="users"),
url(r"/reports", MainHandler, {"page": "reports"}, name="reports"), url(r"/reports", Main, {"page": "reports"}, name="reports"),
url(r"/calculator", MainHandler, {"page": "calculator"}, name="calculator"), url(r"/calculator", Main, {"page": "calculator"}, name="calculator"),
] ]
if not ENV == "production": if not ENV == "production":

2
atst/handlers/login.py → atst/handlers/login_redirect.py
View File

@ -2,7 +2,7 @@ import tornado
from atst.handler import BaseHandler from atst.handler import BaseHandler
class Login(BaseHandler): class LoginRedirect(BaseHandler):
def initialize(self, authnid_client, sessions): def initialize(self, authnid_client, sessions):
self.authnid_client = authnid_client self.authnid_client = authnid_client
self.sessions = sessions self.sessions = sessions

2
atst/handlers/main.py
View File

@ -2,7 +2,7 @@ import tornado
from atst.handler import BaseHandler from atst.handler import BaseHandler
class MainHandler(BaseHandler): class Main(BaseHandler):
def initialize(self, page): def initialize(self, page):
self.page = page self.page = page

2
atst/handlers/home.py → atst/handlers/root.py
View File

@ -1,7 +1,7 @@
from atst.handler import BaseHandler from atst.handler import BaseHandler
class Home(BaseHandler): class Root(BaseHandler):
def initialize(self, page): def initialize(self, page):
self.page = page self.page = page

10
tests/test_auth.py
View File

@ -21,7 +21,7 @@ def test_redirects_when_not_logged_in(http_client, base_url):
@pytest.mark.gen_test @pytest.mark.gen_test
def test_redirects_when_session_does_not_exist(monkeypatch, http_client, base_url): 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( response = yield http_client.fetch(
base_url + "/home", raise_error=False, follow_redirects=False 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 @pytest.mark.gen_test
def test_login_with_valid_bearer_token(app, monkeypatch, http_client, base_url): 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( response = yield http_client.fetch(
base_url + "/login?bearer-token=abc-123", base_url + "/login-redirect?bearer-token=abc-123",
follow_redirects=False, follow_redirects=False,
raise_error=False, raise_error=False,
) )
@ -65,10 +65,10 @@ def test_login_with_invalid_bearer_token(http_client, base_url):
@pytest.mark.gen_test @pytest.mark.gen_test
def test_valid_login_creates_session(app, monkeypatch, http_client, base_url): 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 assert len(app.sessions.sessions) == 0
yield http_client.fetch( yield http_client.fetch(
base_url + "/login?bearer-token=abc-123", base_url + "/login-redirect?bearer-token=abc-123",
follow_redirects=False, follow_redirects=False,
raise_error=False, raise_error=False,
) )