Skip to content

Commit

Permalink
fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
seagullbird committed Dec 28, 2016
1 parent e2c1aa7 commit 1d7e8f6
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 15 deletions.
4 changes: 1 addition & 3 deletions app/editor/views.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from . import editor
from flask import render_template, request, redirect, url_for, flash, session, abort
from flask import render_template, request, redirect, url_for, flash, session
from flask_login import current_user, login_required
from .. import db
from ..models import Blog
Expand All @@ -17,8 +17,6 @@
@editor.route('/', methods=['GET', 'POST'])
@login_required
def index():
if not current_user.is_authenticated:
abort(404)
# 如果是 POST 请求,说明用户提交了一篇新文章
# 接下来是通过 POST 的表单中的数据在数据库中创建新文章
if request.method == 'POST':
Expand Down
1 change: 0 additions & 1 deletion app/user/views.py
Expand Up @@ -38,7 +38,6 @@ def category(username, category_name):
host_user = User.query.filter_by(username=username).first()
category = Category.query.filter_by(
name=category_name, author_id=host_user.id).first()
print(host_user, category)
if not host_user or not category:
abort(404)
# 添加分页
Expand Down
40 changes: 29 additions & 11 deletions tests/test_client.py
Expand Up @@ -266,26 +266,24 @@ def test_editor(self):
self.assertTrue(
b'There is something wrong in your format. Committing abolished' in response.data)

# 测试用户主页
def test_user(self):
# add two users, two draft blogs, two categories and two tags
# 测试用户主页(匿名)
def test_user_annonymous(self):
# add one user with one blog with one cat and tag
u = User(email='mike@example.com', username='mike',
password='cat', confirmed=True)
u2 = User(email='jack@example.com', username='jack',
password='dog', confirmed=True)
db.session.add_all([u, u2])
db.session.add(u)
db.session.commit()
blog = Blog(
body='---\ntitle: <title1>\ncategory: cat1\ntags: [tag1]\n---\n<summary>\n<!-- more -->\n<Content>', author_id=u.id, draft=True)
blog2 = Blog(
body='---\ntitle: <title2>\ncategory: cat2\ntags: [tag2]\n---\n<summary>\n<!-- more -->\n<Content>', author_id=u2.id, draft=True)
db.session.add_all([blog, blog2])
db.session.add(blog)
db.session.commit()

# get index
response = self.client.get(url_for('user.index', username='mike'))
self.assertTrue(response.status_code == 200)
self.assertTrue(b'mike' in response.data)
response = self.client.get(url_for('user.index', username='tom'))
self.assertTrue(response.status_code == 404)

# categories page
response = self.client.get(url_for('user.categories', username='mike'))
Expand All @@ -304,14 +302,34 @@ def test_user(self):
url_for('user.category', username='mike', category_name='cat1'))
self.assertTrue(response.status_code == 200)
self.assertFalse(b'title1' in response.data)
self.assertFalse(b'title2' in response.data)
response = self.client.get(
url_for('user.category', username='mike', category_name='cat2'))
self.assertTrue(response.status_code == 404)

# single tag list (anonymous)
response = self.client.get(
url_for('user.tag', username='mike', tag_name='tag1'))
self.assertTrue(response.status_code == 200)
self.assertFalse(b'title1' in response.data)
self.assertFalse(b'title2' in response.data)
response = self.client.get(
url_for('user.tag', username='mike', tag_name='tag2'))
self.assertTrue(response.status_code == 404)

# 测试用户主页(非匿名)
def test_user(self):
# add two users, two draft blogs, two categories and two tags
u = User(email='mike@example.com', username='mike',
password='cat', confirmed=True)
u2 = User(email='jack@example.com', username='jack',
password='dog', confirmed=True)
db.session.add_all([u, u2])
db.session.commit()
blog = Blog(
body='---\ntitle: <title1>\ncategory: cat1\ntags: [tag1]\n---\n<summary>\n<!-- more -->\n<Content>', author_id=u.id, draft=True)
blog2 = Blog(
body='---\ntitle: <title2>\ncategory: cat2\ntags: [tag2]\n---\n<summary>\n<!-- more -->\n<Content>', author_id=u2.id, draft=True)
db.session.add_all([blog, blog2])
db.session.commit()

# sign in
response = self.client.post(url_for('auth.sign_in'), data={
Expand Down

0 comments on commit 1d7e8f6

Please sign in to comment.