Merge branch 'dev'

.travis.yml

@@ -0,0 +1,27 @@
+language: python
+python:
+  - "3.5"
+  - "3.6"
+env:
+  matrix:
+   - DJANGO="Django<1.9"
+   - DJANGO="Django<1.10"
+   - DJANGO="Django<1.11"
+branches:
+    only:
+        - master
+# command to install dependencies
+install:
+  - pip install -r requirements.txt
+  - pip install "$DJANGO"
+  - pip install python-coveralls
+  - pip install coverage
+before_script:
+  - python manage.py migrate
+  - python manage.py collectstatic --noinput
+  - python manage.py compress --force
+# command to run tests
+script:
+    - coverage run manage.py test
+after_success:
+    - coveralls

blog/models.py

@@ -22,7 +22,7 @@ class BaseModel(models.Model):
             return
         try:
             notify_url = self.get_full_url()
-            spider_notify.baidu_notify(notify_url)
+            spider_notify.baidu_notify([notify_url])
         except Exception as ex:
             logger.error("notify sipder", ex)
             print(ex)

comments/tests.py

@@ -1,3 +1,44 @@
-from django.test import TestCase
+from django.test import Client, RequestFactory, TestCase
+from blog.models import Article, Category, Tag
+from django.contrib.auth import get_user_model
+from django.contrib.sites.models import Site
+import datetime
+
 
 # Create your tests here.
+
+class ArticleTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.factory = RequestFactory()
+
+    def test_validate_article(self):
+        from accounts.models import BlogUser
+        site = Site.objects.get_current().domain
+        user = BlogUser()
+        user.email = "liangliangyy@gmail.com"
+        user.username = "liangliangyy"
+        user.password = "liangliangyy"
+        user.save()
+        response = self.client.get(user.get_absolute_url())
+        self.assertEqual(response.status_code, 200)
+
+        category = Category()
+        category.name = "category"
+        category.created_time = datetime.datetime.now()
+        category.last_mod_time = datetime.datetime.now()
+        category.save()
+
+        response = self.client.get(category.get_absolute_url())
+        self.assertEqual(response.status_code, 200)
+
+        article = Article()
+        article.title = "nicetitle"
+        article.body = "nicecontent"
+        article.author = user
+        article.category = category
+        article.type = 'a'
+        article.status = 'p'
+        article.save()
+        response = self.client.get(article.get_absolute_url())
+        self.assertEqual(response.status_code, 200)