Working code, failing test

flaskr/__init__.py

@@ -8,6 +8,7 @@ def create_app(test_config=None):
     app.config.from_mapping(
         SECRET_KEY='dev',
         DATABASE=os.path.join(app.instance_path, 'flaskr.sqlite'),
+        ALLOW_REGISTER=True,
     )
 
     app.wsgi_app = ProxyFix(

flaskr/auth.py

@@ -1,7 +1,7 @@
 import functools
 
 from flask import (
-    Blueprint, flash, g, redirect, render_template, request, session, url_for
+    Blueprint, flash, g, redirect, render_template, request, session, url_for, current_app
 )
 from werkzeug.security import check_password_hash, generate_password_hash
 
@@ -11,7 +11,8 @@ bp = Blueprint('auth', __name__, url_prefix='/auth')
 
 @bp.route('/register', methods=('GET', 'POST'))
 def register():
-    return "Admin only", 403
+    if not current_app.config["ALLOW_REGISTER"]:
+        return "Admin only", 403
     if request.method == 'POST':
         username = request.form['username']
         password = request.form['password']

flaskr/blog.py

@@ -28,6 +28,23 @@ def index():
         posts.append(post)
     return render_template('blog/index.html', posts=posts)
 
+@bp.route('/firehose')
+def firehose():
+    db = get_db()
+    db_posts = db.execute(
+        'SELECT p.id, title, body, created, author_id, username'
+        ' FROM post p JOIN user u ON p.author_id = u.id'
+        ' ORDER BY created DESC'
+    ).fetchall()
+    posts = []
+    for post in db_posts:
+        if post['created'] > datetime.datetime.utcnow():
+            continue
+        post = dict(post)
+        post['body'] = markdown.markdown(post['body'])
+        posts.append(post)
+    return render_template('blog/firehose.html', posts=posts)
+
 @bp.route('/create',methods=('GET', 'POST'))
 @login_required
 def create():
@@ -69,6 +86,11 @@ def get_post(id, check_author=True):
 
     return post
 
+@bp.route('/<int:id>')
+def individual_post(id):
+    post = get_post(id, False)
+    return render_template('blog/post.html', post=post)
+
 @bp.route('/<int:id>/update', methods=('GET', 'POST'))
 @login_required
 def update(id):

flaskr/templates/base.html

@@ -8,9 +8,6 @@
     {% if g.user %}
       <li><span>{{ g.user['username'] }}</span>
       <li><a href="{{ url_for('auth.logout') }}">Log Out</a>
-    {% else %}
-      <li><a href="{{ url_for('auth.register') }}">Register</a>
-      <li><a href="{{ url_for('auth.login') }}">Log In</a>
     {% endif %}
   </ul>
 </nav>

flaskr/templates/blog/firehose.html

@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <h1>{% block title %}Posts{% endblock %}</h1>
+  {% if g.user %}
+    <a class="action" href="{{ url_for('blog.create') }}">New</a>
+  {% endif %}
+{% endblock %}
+
+{% block content %}
+  {% for post in posts %}
+    <article class="post">
+      <header>
+	<div>
+	  <h1>{{ post['title'] }}</h1>
+	  <div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
+	</div>
+	{% if g.user['id'] == post['author_id'] %}
+	  <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
+	  {% endif %}
+      </header>
+      <p class="body">{{ post['body']|safe }}</p>
+    </article>
+    {% if not loop.last %}
+      <hr>
+    {% endif %}
+  {% endfor %}
+{% endblock %}

flaskr/templates/blog/index.html

@@ -19,7 +19,6 @@
 	  <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
 	  {% endif %}
       </header>
-      <p class="body">{{ post['body']|safe }}</p>
     </article>
     {% if not loop.last %}
       <hr>

flaskr/templates/blog/post.html

@@ -0,0 +1,19 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <h1>{% block title %}{{ post['title'] }}{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+  <article class="post">
+    <header>
+  <div>
+    <div class="about">by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}</div>
+  </div>
+  {% if g.user['id'] == post['author_id'] %}
+  <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
+    {% endif %}
+    </header>
+    <p class="body">{{ post['body']|safe }}</p>
+  </article>
+{% endblock %}

tests/conftest.py

@@ -15,6 +15,7 @@ def app():
     app = create_app({
         'TESTING': True,
         'DATABASE': db_path,
+        'ALLOW_REGISTER': True,
     })
 
     with app.app_context():

tests/test_auth.py

@@ -14,6 +14,10 @@ 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.'),

tests/test_blog.py

@@ -3,8 +3,21 @@ from flaskr.db import get_db
 
 def test_index(client, auth):
     response = client.get('/')
-    assert b"Log In" in response.data
+    assert b"Log In" not in response.data
-    assert b"Register" in response.data
+    assert b"Register" not in response.data
+
+    auth.login()
+    response = client.get('/')
+    assert b'Log Out' in response.data
+    assert b'test title' in response.data
+    assert b'by test on 2018-01-01' in response.data
+    assert b'test\nbody' not in response.data
+    assert b'href="/1/update"' in response.data
+
+def test_firehose(client, auth):
+    response = client.get('/')
+    assert b"Log In" not in response.data
+    assert b"Register" not in response.data
 
     auth.login()
     response = client.get('/')
@@ -14,6 +27,12 @@ def test_index(client, auth):
     assert b'test\nbody' in response.data
     assert b'href="/1/update"' in response.data
 
+def test_individual_page(client, auth):
+    response = client.get('/1')
+    assert b'test title' in response.data
+    assert b'by test on 2018-01-01' in response.data
+    assert b'test\nbody' in response.data
+
 @pytest.mark.parametrize('path', (
     '/create',
     '/1/update',
@@ -58,7 +77,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': ''})
+    client.post('/1/update', data={'title': 'updated', 'body': '', 'created': '1970-01-01 00:00:00'})
 
     with app.app_context():
         db = get_db()
@@ -71,7 +90,7 @@ def test_update(client, auth, app):
 ))
 def test_create_update_validate(client, auth, path):
     auth.login()
-    response = client.post(path, data={'title': '', 'body': ''})
+    response = client.post(path, data={'title': '', 'body': '', 'created': '1970-01-01 00:00:00'})
     assert b'Title is required.' in response.data
 
 def test_delete(client, auth, app):