diff --git a/flaskr/__init__.py b/flaskr/__init__.py index 7d7ec81..ed7d989 100644 --- a/flaskr/__init__.py +++ b/flaskr/__init__.py @@ -8,7 +8,6 @@ def create_app(test_config=None): app.config.from_mapping( SECRET_KEY='dev', DATABASE=os.path.join(app.instance_path, 'flaskr.sqlite'), - ALLOW_REGISTER=False, ) app.wsgi_app = ProxyFix( diff --git a/flaskr/auth.py b/flaskr/auth.py index 6b95143..5874e97 100644 --- a/flaskr/auth.py +++ b/flaskr/auth.py @@ -1,7 +1,7 @@ import functools from flask import ( - Blueprint, flash, g, redirect, render_template, request, session, url_for, current_app + Blueprint, flash, g, redirect, render_template, request, session, url_for ) from werkzeug.security import check_password_hash, generate_password_hash @@ -11,8 +11,7 @@ bp = Blueprint('auth', __name__, url_prefix='/auth') @bp.route('/register', methods=('GET', 'POST')) def register(): - if not current_app.config["ALLOW_REGISTER"]: - return "Admin only", 403 + return "Admin only", 403 if request.method == 'POST': username = request.form['username'] password = request.form['password'] diff --git a/flaskr/templates/base.html b/flaskr/templates/base.html index ae63dea..6c1d788 100644 --- a/flaskr/templates/base.html +++ b/flaskr/templates/base.html @@ -8,6 +8,9 @@ {% if g.user %}
  • {{ g.user['username'] }}
  • Log Out + {% else %} +
  • Register +
  • Log In {% endif %} diff --git a/tests/conftest.py b/tests/conftest.py index 836a5ad..2db6e29 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -15,7 +15,6 @@ def app(): app = create_app({ 'TESTING': True, 'DATABASE': db_path, - 'ALLOW_REGISTER': True, }) with app.app_context(): diff --git a/tests/test_auth.py b/tests/test_auth.py index 1f45590..d9b9b9e 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -14,10 +14,6 @@ def test_register(client, app): "SELECT * FROM user WHERE USERNAME = 'a'", ).fetchone() is not None - app.config["ALLOW_REGISTER"] = False - response = client.get('/auth/register') - assert b"Admin only" in response.data - @pytest.mark.parametrize(('username', 'password', 'message'), ( ('', '', b'Username is required.'), ('a', '', b'Password is required.'), diff --git a/tests/test_blog.py b/tests/test_blog.py index 810ade1..2479428 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -3,8 +3,8 @@ from flaskr.db import get_db def test_index(client, auth): response = client.get('/') - assert b"Log In" not in response.data - assert b"Register" not in response.data + assert b"Log In" in response.data + assert b"Register" in response.data auth.login() response = client.get('/') @@ -58,7 +58,7 @@ def test_create(client, auth, app): def test_update(client, auth, app): auth.login() assert client.get('/1/update').status_code == 200 - client.post('/1/update', data={'title': 'updated', 'body': '', 'created': '1970-01-01 00:00:00'}) + client.post('/1/update', data={'title': 'updated', 'body': ''}) with app.app_context(): db = get_db() @@ -71,7 +71,7 @@ def test_update(client, auth, app): )) def test_create_update_validate(client, auth, path): auth.login() - response = client.post(path, data={'title': '', 'body': '', 'created': '1970-01-01 00:00:00'}) + response = client.post(path, data={'title': '', 'body': ''}) assert b'Title is required.' in response.data def test_delete(client, auth, app):