creating pytest to quokkaCMS

.gitignore

@@ -89,3 +89,4 @@ docs/book
 .eggs
 
 README.rst
+/nbproject/private/

.travis.yml

@@ -11,6 +11,7 @@ install:
   - make install
 script: make test
 after_success:
+  - codecov
   - coveralls
 notifications:
   slack: quokkaproject:pjF8y81mqwXxQRtf5sGz5zqr

Makefile

@@ -1,7 +1,7 @@
 .PHONY: docs test pep8 clean install build publish tree create_env devserver pandoc adduser
 
 test: pep8
-	QUOKKA_MODE=test py.test --cov=quokka -l --tb=short --maxfail=1 tests/
+	QUOKKA_MODE=test pytest -vvv --cov=quokka -l --tb=short --maxfail=1 tests/
 
 pep8:
 	@flake8 quokka --ignore=F403 --exclude=migrations

quokka/admin/widgets.py

@@ -1,7 +1,7 @@
 
 from flask import current_app
-from quokka.core.template import render_template
 from wtforms.widgets import TextArea, TextInput
+from quokka.core.content.views import render_template
 
 
 class TextEditor(TextArea):

quokka/core/content/utils.py

@@ -10,9 +10,10 @@ def url_for_content(content, include_ext=True):
     else:
         data = content
 
+    data_category_slug = data.get('category_slug')
+    data_slugify_category = slugify_category(data.get('category') or '')
     category_slug = (
-        data.get('category_slug') or
-        slugify_category(data.get('category') or '')
+        data_category_slug or data_slugify_category
     )
     slug = data.get('slug') or slugify(data.get('title'))
 

quokka/core/content/views.py

@@ -259,6 +259,9 @@ def render_rss(self, content_type, templates, **context):
             if content.date > rss_pubdate:
                 rss_pubdate = content.date
 
+            content_title = content.title.encode('utf-8')
+            content_url = content.url.encode('utf-8')
+
             rss.items.append(
                 pyrss.RSSItem(
                     title=content.title,
@@ -267,8 +270,7 @@ def render_rss(self, content_type, templates, **context):
                     author=str(content.author),
                     categories=[str(content.tags)],
                     guid=hashlib.sha1(
-                        content.title.encode('utf-8') +
-                        content.url.encode('utf-8')
+                        content_title + content_url
                     ).hexdigest(),
                     pubDate=content.date,
                 )

quokka/core/views/sitemap.py

@@ -11,12 +11,13 @@ def get_contents(self):
         TODO: Should include extra paths, fixed paths
         config based paths, static paths
         """
+        index = self.get_index()
+        cat = self.get_categories()
+        tags = self.get_tags()
+        authors = self.get_authors()
+        articles = self.get_articles_and_pages()
         return (
-            self.get_index() +
-            self.get_categories() +
-            self.get_tags() +
-            self.get_authors() +
-            self.get_articles_and_pages()
+            index + cat + tags + authors + articles
         )
 
     def get_index(self):

requirements-dev.txt

@@ -12,3 +12,7 @@ twine>=1.9.1
 wheel>=0.30.0
 flask>=1.0
 logzero
+pytest_mock
+mock
+pytest_django
+pyyaml