Working code, failing test
This commit is contained in:
parent
39243beff4
commit
f2fb55ea33
6 changed files with 89 additions and 2 deletions
|
|
@ -8,7 +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=False,
|
||||
ALLOW_REGISTER=True,
|
||||
)
|
||||
|
||||
app.wsgi_app = ProxyFix(
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
28
flaskr/templates/blog/firehose.html
Normal file
28
flaskr/templates/blog/firehose.html
Normal file
|
|
@ -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 %}
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
19
flaskr/templates/blog/post.html
Normal file
19
flaskr/templates/blog/post.html
Normal file
|
|
@ -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 %}
|
||||
|
|
@ -6,6 +6,19 @@ def test_index(client, auth):
|
|||
assert b"Log In" not 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('/')
|
||||
assert b'Log Out' in response.data
|
||||
|
|
@ -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',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue