rename timeline to feed

api/posts.py

@@ -87,23 +87,23 @@ def delete(id):
     return '', 204
 
 
-@posts.route('/users/<int:id>/timeline', methods=['GET'])
+@posts.route('/users/<int:id>/feed', methods=['GET'])
 @authenticate(token_auth)
 @paginated_response(posts_schema, order_by=Post.timestamp,
                     order_direction='desc', model_from_statement=Post,
                     pagination_schema=DateTimePaginationSchema)
-def timeline(id):
-    """Retrieve the user's post timeline"""
+def feed(id):
+    """Retrieve the user's post feed"""
     user = db.session.get(User, id) or abort(404)
     return user.followed_posts_select().order_by(Post.timestamp.desc())
 
 
-@posts.route('/users/me/timeline', methods=['GET'])
+@posts.route('/users/me/feed', methods=['GET'])
 @authenticate(token_auth)
 @paginated_response(posts_schema, order_by=Post.timestamp,
                     order_direction='desc', model_from_statement=Post,
                     pagination_schema=DateTimePaginationSchema)
-def my_timeline():
-    """Retrieve the logged in user's post timeline"""
+def my_feed():
+    """Retrieve the logged in user's post feed"""
     user = token_auth.current_user()['user']
     return user.followed_posts_select().order_by(Post.timestamp.desc())

tests/test_posts.py

@@ -62,7 +62,7 @@ def test_delete_post(self):
         rv = self.client.get(f'/api/posts/{id}')
         assert rv.status_code == 404
 
-    def test_post_timeline(self):
+    def test_post_feed(self):
         user1 = db.session.get(User, 1)
         user2 = User(username='susan', email='[email protected]',
                      password='dog')
@@ -75,8 +75,8 @@ def test_post_timeline(self):
         db.session.add_all([post1, post2, post3])
         db.session.commit()
 
-        rv1 = self.client.get('/api/users/me/timeline')
-        rv2 = self.client.get('/api/users/1/timeline')
+        rv1 = self.client.get('/api/users/me/feed')
+        rv2 = self.client.get('/api/users/1/feed')
         for rv in [rv1, rv2]:
             assert rv.status_code == 200
             assert rv.json['pagination']['total'] == 3