fix test

Author: shellfly

.travis.yml

@@ -1,27 +1,14 @@
 language: python
 python:
-  - "2.7"
-  - "3.8"
+  - "3.7"
 env:
-  - DJANGO_VERSION=1.7
-  - DJANGO_VERSION=1.8
-  - DJANGO_VERSION=1.9
-  - DJANGO_VERSION=1.10
   - DJANGO_VERSION=2.0
   - DJANGO_VERSION=3.0
 install:
-  - pip install -q Django==$DJANGO_VERSION flake8 coverage
+  - pip install -q Django==$DJANGO_VERSION flake8 coverage djangorestframework
 script:
   - flake8 --exclude vote/migrations/* vote
   - coverage run runtests.py
-matrix:
-  exclude:
-    - python: "3.8"
-      env: DJANGO_VERSION=1.7
-    - python: "2.7"
-      env: DJANGO_VERSION=2.0
-    - python: "2.7"
-      env: DJANGO_VERSION=3.0
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

README.md

@@ -71,4 +71,16 @@ Review.votes.all(user_id)
 
 ```
 
-``django-vote`` now requires Django 1.7 or greater. (for Django < 1.7, please install previous release `django-vote==1.1.3`)
+#### Use `VoteMixin` for REST API
+
+``` python
+class CommentViewSet(ModelViewSet, VoteMixin):
+    queryset = Comment.objects.all()
+    serializer_class = CommentSerializer
+```
+
+```sh
+POST /api/comments/{id}/vote/
+POST /api/comments/{id}/vote/ {"action":"down"}
+DELETE /api/comments/{id}/vote/
+```

docs/changelog.rst

@@ -5,7 +5,8 @@ Changelog
 ------------------
 * Add post_vote signal
 * Add VoteMixin for easily write vote api
-* Support Django 3.0
+* Drop support for Django < 2.0
+* Add Django 3.0 test
 
 2.1.7(2018.05.08)
 -----------------

test/templates/test/comments.html

@@ -1,4 +1,4 @@
 {% load vote %}
 {% for comment in comments %}
 {{comment.content}} {% vote_exists comment user %}
-{% endfor %}
+{% endfor %}

test/tests.py

@@ -17,6 +17,9 @@ def setUp(self):
                                               '111111')
         self.user3 = User.objects.create_user("test3", "[email protected]",
                                               '111111')
+        print('\n%s.%s.%s' % (self.__class__.__module__,
+                              self.__class__.__name__,
+                              self._testMethodName))
 
     def tearDown(self):
         self.model.objects.all().delete()
@@ -210,7 +213,9 @@ def test_vote_templatetag(self):
 
         comment1 = comments[0]
         self.call_api('up', comment1, self.user1.pk)
-        res = self.client.get('/comments/')
+        # test with anonymous user
+        self.client.get('/comments/')
+        # test with authenticated user
         self.client.login(username=self.user1.username, password='111111')
         self.client.get('/comments/')
 
@@ -220,8 +225,6 @@ def test_votemixin_api(self):
             content="I'm a comment")
         comment.save()
         self.assertEqual(comment.num_vote_up, 0)
-        import pdb
-        pdb.set_trace()
         self.client.login(
             username=self.user1.username, password='111111')
 

test/urls.py

@@ -6,6 +6,6 @@
 router.register(r'comments', views.CommentViewSet)
 
 urlpatterns = [
-    path('comments', views.comments),
+    path('comments/', views.comments),
     path('api/', include(router.urls)),
 ]

vote/templatetags/vote.py

@@ -2,7 +2,6 @@
 
 from django import template
 from django.contrib.auth.models import AnonymousUser
-from django import get_version
 
 from vote.models import UP
 
@@ -11,9 +10,6 @@
 
 @register.simple_tag
 def vote_exists(model, user=AnonymousUser(), action=UP):
-    if get_version() >= '2.0':
-        if user.is_anonymous:
-            return False
-    elif user.is_anonymous():
+    if user.is_anonymous:
         return False
     return model.votes.exists(user.pk, action=action)

vote/views.py

@@ -1,7 +1,5 @@
-from django.db import IntegrityError
 from rest_framework.decorators import action
-from rest_framework.views import APIView, Response
-from rest_framework.viewsets import ModelViewSet
+from rest_framework.views import Response
 
 from vote.signals import post_voted