From 907caf83889e9ed70d3714da78dc7c9b27e16be4 Mon Sep 17 00:00:00 2001
From: liangliang <liangliangyy@gmail.com>
Date: Mon, 7 Jun 2021 18:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DjangoBlog/settings.py |  5 +++++
 blog/tests.py          | 35 ++++++++++++++++++-----------------
 comments/tests.py      |  3 +++
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/DjangoBlog/settings.py b/DjangoBlog/settings.py
index 8623787..078425e 100644
--- a/DjangoBlog/settings.py
+++ b/DjangoBlog/settings.py
@@ -302,3 +302,8 @@ if os.environ.get('DJANGO_ELASTICSEARCH_HOST'):
             'hosts': os.environ.get('DJANGO_ELASTICSEARCH_HOST')
         },
     }
+    HAYSTACK_CONNECTIONS = {
+        'default': {
+            'ENGINE': 'DjangoBlog.elasticsearch_backend.ElasticSearchEngine',
+        },
+    }
diff --git a/blog/tests.py b/blog/tests.py
index 74cc9e3..a34fa78 100644
--- a/blog/tests.py
+++ b/blog/tests.py
@@ -76,6 +76,12 @@ class ArticleTest(TestCase):
             article.save()
             article.tags.add(tag)
             article.save()
+        from blog.documents import ELASTICSEARCH_ENABLED
+        if ELASTICSEARCH_ENABLED:
+            call_command("build_index")
+            response = self.client.get('/search', {'q': 'nicetitle'})
+            self.assertEqual(response.status_code, 200)
+
         response = self.client.get(article.get_absolute_url())
         self.assertEqual(response.status_code, 200)
         from DjangoBlog.spider_notify import SpiderNotify
@@ -133,6 +139,18 @@ class ArticleTest(TestCase):
         response = self.client.get('/links.html')
         self.assertEqual(response.status_code, 200)
 
+        rsp = self.client.get('/refresh')
+        self.assertEqual(rsp.status_code, 200)
+
+        response = self.client.get('/feed/')
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.get('/sitemap.xml')
+        self.assertEqual(response.status_code, 200)
+        from DjangoBlog.utils import block_code
+        block = block_code("`python`", 'python')
+
+
     def __check_pagination__(self, p, type, value):
         s = load_pagination_info(p.page(1), type, value)
         self.assertIsNotNone(s)
@@ -148,23 +166,6 @@ class ArticleTest(TestCase):
         response = self.client.get(s['next_url'])
         self.assertEqual(response.status_code, 200)
 
-    def test_validate_feed(self):
-        user = BlogUser.objects.get_or_create(
-            email="liangliangyy12@gmail.com",
-            username="liangliangyy")[0]
-        user.set_password("liangliangyy")
-        user.save()
-        self.client.login(username='liangliangyy', password='liangliangyy')
-
-        rsp = self.client.get('/refresh')
-        self.assertEqual(rsp.status_code, 403)
-
-        response = self.client.get('/feed/')
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.get('/sitemap.xml')
-        self.assertEqual(response.status_code, 200)
-
     def test_image(self):
         import requests
         rsp = requests.get(
diff --git a/comments/tests.py b/comments/tests.py
index a6d0ca7..49d4424 100644
--- a/comments/tests.py
+++ b/comments/tests.py
@@ -98,3 +98,6 @@ class CommentsTest(TestCase):
         self.assertIsNotNone(data)
         s = get_max_articleid_commentid()
         self.assertIsNotNone(s)
+
+        from comments.utils import send_comment_email
+        send_comment_email(comment)