make the test case pass (#60)

Author: JacksonTian

app/controller/topic.js

@@ -23,7 +23,7 @@ class TopicController extends Controller {
     }
     const { ctx, service } = this;
     const topic_id = ctx.params.tid;
-    const currentUser = ctx.session.user;
+    const currentUser = ctx.user;
 
     if (topic_id.length !== 24) {
       ctx.status = 404;
@@ -139,23 +139,23 @@ class TopicController extends Controller {
       title,
       content,
       tab,
-      ctx.session.user._id
+      ctx.user._id
     );
 
     // 发帖用户增加积分,增加发表主题数量
     const author = await service.user.getUserById(topic.author_id);
     author.score += 5;
     author.topic_count += 1;
     await author.save();
-    ctx.session.user = author;
+    ctx.user = author;
 
     ctx.redirect('/topic/' + topic._id);
 
     // 通知被@的用户
     await service.at.sendMessageToMentionUsers(
       content,
       topic._id,
-      ctx.session.user._id
+      ctx.user._id
     );
   }
 
@@ -174,8 +174,8 @@ class TopicController extends Controller {
     }
 
     if (
-      String(topic.author_id) === String(ctx.session.user._id) ||
-      ctx.session.user.is_admin
+      String(topic.author_id) === String(ctx.user._id) ||
+      ctx.user.is_admin
     ) {
       await ctx.render('topic/edit', {
         action: 'edit',
@@ -210,7 +210,7 @@ class TopicController extends Controller {
     }
 
     if (
-      topic.author_id === ctx.session.user._id || ctx.session.user.is_admin
+      topic.author_id === ctx.user._id || ctx.user.is_admin
     ) {
       title = validator.trim(title);
       tab = validator.trim(tab);
@@ -249,7 +249,7 @@ class TopicController extends Controller {
       await service.at.sendMessageToMentionUsers(
         content,
         topic._id,
-        ctx.session.user._id
+        ctx.user._id
       );
 
       ctx.redirect('/topic/' + topic._id);
@@ -272,8 +272,8 @@ class TopicController extends Controller {
     const [ topic, author ] = await service.topic.getFullTopic(topic_id);
 
     if (
-      !ctx.session.user.is_admin &&
-      !topic.author_id.equals(ctx.session.user._id)
+      !ctx.user.is_admin &&
+      !topic.author_id.equals(ctx.user._id)
     ) {
       ctx.status = 403;
       ctx.body = { success: false, message: '无权限' };
@@ -376,8 +376,8 @@ class TopicController extends Controller {
       ctx.body = { status: 'failed' };
     }
 
-    const doc = await service.topic_collect.getTopicCollect(
-      ctx.session.user._id,
+    const doc = await service.topicCollect.getTopicCollect(
+      ctx.user._id,
       topic._id
     );
 
@@ -386,14 +386,14 @@ class TopicController extends Controller {
       return;
     }
 
-    service.topic_collect.newAndSave(ctx.session.user._id, topic._id);
+    await service.topicCollect.newAndSave(ctx.user._id, topic._id);
     ctx.body = { status: 'success' };
 
-    const user = await service.user.getUserById(ctx.session.user._id);
+    const user = await service.user.getUserById(ctx.user._id);
     user.collect_topic_count += 1;
     await user.save();
 
-    ctx.session.user.collect_topic_count += 1;
+    ctx.user.collect_topic_count += 1;
     topic.collect_count += 1;
     await topic.save();
   }
@@ -411,17 +411,17 @@ class TopicController extends Controller {
     }
 
     const removeResult = service.topic_collect.remove(
-      ctx.session.user._id,
+      ctx.user._id,
       topic._id
     );
     if (removeResult.result.n === 0) {
       ctx.body = { status: 'failed' };
     }
 
-    const user = await service.user.getUserById(ctx.session.user._id);
+    const user = await service.user.getUserById(ctx.user._id);
 
     user.collect_topic_count -= 1;
-    ctx.session.user = user;
+    ctx.user = user;
     await user.save();
 
     topic.collect_count -= 1;

app/view/index.html

@@ -13,10 +13,10 @@
     <% if (typeof topics !== 'undefined' && topics.length > 0) { %>
     <div class="inner no-padding">
       <%- include('./topic/list.html', {
-      topics: topics,
-      pages: pages,
-      current_page: current_page,
-      base: '/'
+        topics: topics,
+        pages: pages,
+        current_page: current_page,
+        base: '/'
       }) %>
     </div>
     <% } else { %>

app/view/topic/abstract.html

@@ -1,7 +1,7 @@
 <div class='cell'>
 
   <a class="user_avatar pull-left" href="/user/<%= topic.author.loginname %>">
-    <img src="<%= proxy(topic.author.avatar_url) %>"
+    <img src="<%= helper.proxy(topic.author.avatar_url) %>"
          title="<%= topic.author.loginname %>"
             />
   </a>
@@ -18,7 +18,7 @@
 
   <% if (topic.reply && topic.reply.author) {%>
   <a class='last_time pull-right' href="/topic/<%= topic._id %><%- '#' + topic.reply._id %>">
-    <img class="user_small_avatar" src="<%= proxy(topic.reply.author.avatar_url) %>">
+    <img class="user_small_avatar" src="<%= helper.proxy(topic.reply.author.avatar_url) %>">
     <span class="last_active_time"><%= topic.reply.create_at_ago() %></span>
   </a>
   <% } %>

app/view/topic/list.html

@@ -1,5 +1,7 @@
 <div id="topic_list">
-  <%- include('./abstract.html', {collection:topics, as:'topic'}) %>
+  <% for (var i = 0; i < topics.length; i++) { %>
+  <%- include('./abstract.html', { topic: topics[i] }) %>
+  <% } %>
 </div>
 <div class='pagination' current_page='<%= current_page %>'>
   <ul>

test/app/controller/topic.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { app } = require('egg-mock/bootstrap');
+const { app, assert } = require('egg-mock/bootstrap');
 
 function randomInt() {
   return (Math.random() * 10000).toFixed(0);
@@ -13,7 +13,7 @@ describe('test/app/controller/topic.test.js', () => {
     key,
     username,
     user,
-    // topic_collect,
+    admin,
     topic;
 
   before(async () => {
@@ -38,13 +38,15 @@ describe('test/app/controller/topic.test.js', () => {
       user_id
     );
 
-    // topic_collect = ctx.service.topic_collect.newAndSave(
-    //   user_id,
-    //   topic_id
-    // );
+    await ctx.service.topicCollect.newAndSave(
+      user_id,
+      topic_id
+    );
     topic_id = topic._id;
 
+    admin = Object.assign(user, { is_admin: true });
   });
+
   it('should GET /topic/:tid ok', async () => {
     await app.httpRequest().get('/topic/:tid').expect(404);
   });
@@ -58,50 +60,44 @@ describe('test/app/controller/topic.test.js', () => {
   });
 
   it('should GET /topic/create ok', async () => {
-    app.mockSession({
-      user: {
-        name: username,
-        _id: user_id,
-        is_admin: true,
-      },
+    app.mockUser({
+      name: username,
+      _id: user_id,
+      is_admin: true,
     });
-    await app.httpRequest().get('/topic/create').expect(200);
+    const res = await app.httpRequest().get('/topic/create');
+    assert(res.status === 200);
   });
 
   it('should POST /topic/:tid/top ok', async () => {
-    app.mockSession({
-      user: {
-        name: username,
-        _id: user_id,
-        is_admin: true,
-      },
+    app.mockUser({
+      name: username,
+      _id: user_id,
+      is_admin: true,
     });
     app.mockCsrf();
     await app.httpRequest().post(`/topic/${topic_id}/top`).expect(200);
   });
 
   it('should POST /topic/:tid/good ok', async () => {
-    app.mockSession({
-      user: {
-        name: username,
-        _id: user_id,
-        is_admin: true,
-      },
+    app.mockUser({
+      name: username,
+      _id: user_id,
+      is_admin: true,
     });
     app.mockCsrf();
     await app.httpRequest().post(`/topic/${topic_id}/good`).expect(200);
   });
 
   it('should GET /topic/:tid/edit ok', async () => {
-    app.mockSession({
-      user: {
-        name: username,
-        _id: user_id,
-        is_admin: true,
-      },
+    app.mockUser({
+      name: username,
+      _id: user_id,
+      is_admin: true,
     });
 
-    await app.httpRequest().get(`/topic/${topic_id}/edit`).expect(200);
+    const res = await app.httpRequest().get(`/topic/${topic_id}/edit`);
+    assert(res.status === 200);
   });
 
   it('should GET /topic/:tid/edit ok', async () => {
@@ -129,24 +125,20 @@ describe('test/app/controller/topic.test.js', () => {
 
 
   it('should POST /topic/:tid/delete ok', async () => {
-    app.mockSession({
-      user: {
-        name: username,
-        _id: user_id,
-        is_admin: true,
-      },
+    app.mockUser({
+      name: username,
+      _id: user_id,
+      is_admin: true,
     });
     app.mockCsrf();
     await app.httpRequest().post(`/topic/${topic_id}/delete`).expect(200);
   });
 
   it('should POST /topic/:tid/edit ok', async () => {
-    app.mockSession({
-      user: {
-        name: username,
-        _id: user_id,
-        is_admin: true,
-      },
+    app.mockUser({
+      name: username,
+      _id: user_id,
+      is_admin: true,
     });
     app.mockCsrf();
     await app

test/app/service/topic.test.js

@@ -21,7 +21,6 @@ describe('test/app/service/topic.test.js', () => {
     assert(result.loginname === loginname);
   });
 
-
   it('newAndSave should ok', async () => {
     const title = 'first post';
     const content = 'hello world';
@@ -73,10 +72,10 @@ describe('test/app/service/topic.test.js', () => {
     assert(result1.length >= 1);
 
     const query2 = {
-      good: 'test',
+      good: true,
     };
     const result2 = await topic.getTopicsByQuery(query2, {});
-    assert(result2.length === 0);
+    assert(result2.length < result1.length);
   });
 
   it('getLimit5w should ok', async () => {