レビューで指摘されたところを修正

kawazrepos · Oct 26, 2014 · 38d8407 · 38d8407
1 parent 814fea8
commit 38d8407
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/kawaz/core/activities/tests/test_views.py b/src/kawaz/core/activities/tests/test_views.py
@@ -38,13 +38,19 @@ def test_get_latest_activities(self):
         """
          type=wallのとき、latestsの物だけを10件取得できる
         """
-        for i in range(5):
+        for i in range(15):
             persona = PersonaFactory()
             persona.nickname = 'hoge'
             persona.save()
 
         r = self.client.get('/activities/?type=wall')
+        self.assertEqual(len(r.context['object_list']), 10)
+        r = self.client.get('/activities/?type=wall&page=2')
         self.assertEqual(len(r.context['object_list']), 5)
 
         r = self.client.get('/activities/')
         self.assertEqual(len(r.context['object_list']), 10)
+        r = self.client.get('/activities/?page=2')
+        self.assertEqual(len(r.context['object_list']), 10)
+        r = self.client.get('/activities/?page=3')
+        self.assertEqual(len(r.context['object_list']), 10)
diff --git a/src/templates/activities/activity_list.html b/src/templates/activities/activity_list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
-{% block title %}{% trans "Past Activities" %}{% endblock %}
+{% block title %}{% trans "Activity list" %}{% endblock %}
 {% block pre_css %}
     {{ block.super }}
     <link type="text/less" rel="stylesheet" href="{% static "less/wall.less" %}" media="screen">

diff --git a/src/templates/roughpages/index.authenticated.html b/src/templates/roughpages/index.authenticated.html
@@ -25,7 +25,7 @@ <h2>Activities</h2>
     {% get_latest_activities as activities %}
     {% include "activities/components/activity_container.html" with activities=activities %}
     <div class="text-center">
-        <a class="btn btn-default" href="{% url "activities_activity_list" %}?page=2&type=wall">{% trans "Read More" %} <span class="glyphicon glyphicon-chevron-right"></span></a>
+        <a class="btn btn-default" href="{% url "activities_activity_list" %}?page=2&type=wall">{% trans "Read more" %} <span class="glyphicon glyphicon-chevron-right"></span></a>
     </div>
 
 {% endblock %}