coverage and imports

django_th/forms/base.py

@@ -1,3 +1,4 @@
+# coding: utf-8
 from django import forms
 from django.forms import TextInput, PasswordInput
 from django.utils.translation import ugettext_lazy as _

django_th/forms/services.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8
 from django import forms
 from django.conf import settings
 from django_th.models import ServicesActivated

django_th/forms/wizard.py

@@ -1,6 +1,7 @@
+# coding: utf-8
 from django import forms
-from django_th.models import UserService
 from django.utils.translation import ugettext_lazy as _
+from django_th.models import UserService
 
 
 class ServiceChoiceForm(forms.Form):

django_th/html_entities.py

@@ -1,6 +1,6 @@
 # coding: utf-8
-import re
 import html.entities as htmlentities
+import re
 
 
 class HtmlEntities:

django_th/management/commands/publish.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals
-from multiprocessing import Pool, TimeoutError
 # django
-from django.core.management.base import BaseCommand
 from django.conf import settings
-from logging import getLogger
+from django.core.management.base import BaseCommand
 from django.db.models import Q
 # trigger happy
 from django_th.models import TriggerService
 from django_th.publish import Pub
 
+from logging import getLogger
+from multiprocessing import Pool, TimeoutError
 # create logger
 logger = getLogger('django_th.trigger_happy')
 

django_th/management/commands/read.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals
-from multiprocessing import Pool, TimeoutError
 # django
-from django.core.management.base import BaseCommand
 from django.conf import settings
-from logging import getLogger
+from django.core.management.base import BaseCommand
 from django.db.models import Q
 # trigger happy
 from django_th.models import TriggerService
 from django_th.read import Read
 
+from logging import getLogger
+from multiprocessing import Pool, TimeoutError
 # create logger
 logger = getLogger('django_th.trigger_happy')
 

django_th/management/commands/read_n_pub.py

@@ -1,17 +1,17 @@
 #!/usr/bin/env python
 # coding: utf-8
 from __future__ import unicode_literals
-from multiprocessing import Pool, TimeoutError
 # django
-from django.core.management.base import BaseCommand
 from django.conf import settings
-from logging import getLogger
+from django.core.management.base import BaseCommand
 from django.core.cache import caches
 # trigger happy
 from django_th.models import TriggerService
 from django_th.read import Read
 from django_th.publish import Pub
 
+from logging import getLogger
+from multiprocessing import Pool, TimeoutError
 # create logger
 logger = getLogger('django_th.trigger_happy')
 cache = caches['django_th']
@@ -48,4 +48,4 @@ def handle(self, *args, **options):
 
                 cache.delete('django_th' + '_fire_trigger_' + str(trigger_id))
         except TimeoutError as e:
-            logger.warn(e)
+            logger.warning(e)

django_th/models/__init__.py

@@ -10,11 +10,11 @@
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
-from logging import getLogger
-
 from django_th.signals import digest_event
 from django_th.tools import warn_user_and_admin
 
+from logging import getLogger
+
 logger = getLogger('django_th.trigger_happy')
 
 

django_th/publish.py

@@ -6,12 +6,12 @@
 
 # django
 from django.conf import settings
-from logging import getLogger
 
 # trigger happy
 from django_th.services import default_provider
 from django_th.models import TriggerService, update_result
 
+from logging import getLogger
 
 logger = getLogger('django_th.trigger_happy')
 

django_th/read.py

@@ -4,7 +4,6 @@
 
 import arrow
 # django
-from logging import getLogger
 from django.conf import settings
 from django.utils.timezone import now
 
@@ -13,6 +12,8 @@
 from django_th.models import TriggerService
 from django_th.tools import warn_user_and_admin
 
+from logging import getLogger
+
 logger = getLogger('django_th.trigger_happy')
 
 

django_th/recycle.py

@@ -5,11 +5,12 @@
 # django
 from django.conf import settings
 from django.core.cache import caches
-from logging import getLogger
 
 # trigger happy
 from django_th.my_services import MyService
 
+from logging import getLogger
+
 logger = getLogger('django_th.trigger_happy')
 
 

django_th/service_provider.py

@@ -1,6 +1,6 @@
 # coding: utf-8
-from django.conf import settings
 from collections import OrderedDict
+from django.conf import settings
 
 
 class ServiceProvider(OrderedDict):

django_th/services/services.py

@@ -1,11 +1,8 @@
 # coding: utf-8
-# Using OAuth1Session
-from requests_oauthlib import OAuth1Session, OAuth2Session
-
 # django stuff
+from django.conf import settings
 from django.core.cache import caches
 from django.core.urlresolvers import reverse
-from django.conf import settings
 
 try:
     from django.apps import apps
@@ -18,6 +15,8 @@
 from django_th.models import UserService, ServicesActivated, TriggerService
 from django_th.publishing_limit import PublishingLimit
 from django_th.html_entities import HtmlEntities
+# Using OAuth(12)Session
+from requests_oauthlib import OAuth1Session, OAuth2Session
 
 
 class ServicesMgr(object):

django_th/tests/test_views.py

@@ -4,11 +4,11 @@
 
 from django_th.models import TriggerService
 from django_th.views import TriggerEditedTemplateView
-from django_th.views import TriggerDeletedTemplateView, TriggerListView
+from django_th.views import TriggerDeletedTemplateView, TriggerListView, TriggerUpdateView
 from django_th.views_fbv import can_modify_trigger, trigger_on_off, \
     trigger_edit, trigger_switch_all_to, list_services, \
     service_related_triggers_switch_to, fire_trigger
-from django_th.tests.test_main import MainTest, setup_view
+from django_th.tests.test_main import MainTest
 
 from th_rss.models import Rss
 
@@ -55,38 +55,33 @@ def setUp(self):
         # Every test needs access to the request factory.
         self.factory = RequestFactory()
 
-    def test_context_data(self):
-        """
-        TriggerListView.get_context_data() sets
-        'triggers_enabled', 'triggers_disabled', 'services_activated'
-        in context.
-        """
-        # Setup name.
-        triggers_enabled = triggers_disabled = services_activated = 0
-        queryset = TriggerService.objects.all()
-
+    def test_get(self):
+        template = "home.html"
         # Setup request and view.
-        request = self.factory.get('/')
+        request = RequestFactory().get('th/')
         request.user = self.user
-
-        view = TriggerListView(
-            template_name='home.html', object_list=queryset)
-        view = setup_view(view, request)
+        view = TriggerListView.as_view(template_name=template)
         # Run.
-        if request.user.is_authenticated():
-            triggers_enabled = 3
-            triggers_disabled = 1
-            services_activated = 5
+        response = view(request, user=request.user)
+        # Check.
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.template_name[0], "home.html")
+
 
-        context = view.get_context_data()
-        context['nb_triggers'] = {
-            'enabled': triggers_enabled, 'disabled': triggers_disabled}
-        context['nb_services'] = services_activated
+class TriggerUpdateViewTestCase(MainTest):
 
+    def test_get(self):
+        template_name = "triggers/edit_description_trigger.html"
+        t = self.create_triggerservice()
+        # Setup request and view.
+        request = RequestFactory().get('th/trigger/edit/')
+        request.user = self.user
+        view = TriggerUpdateView.as_view(template_name=template_name)
+        # Run.
+        response = view(request, user=request.user, pk=t.id)
         # Check.
-        self.assertEqual(context['nb_triggers']['enabled'], triggers_enabled)
-        self.assertEqual(context['nb_triggers']['disabled'], triggers_disabled)
-        self.assertEqual(context['nb_services'], services_activated)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.template_name[0], template_name)
 
 
 class ViewFunction(MainTest):

django_th/tests/test_views_userservices.py

@@ -3,9 +3,8 @@
 from django.test import RequestFactory
 
 from django_th.models import UserService
-from django_th.tests.test_views import setup_view
-from django_th.tests.test_main import MainTest
-from django_th.views_userservices import UserServiceListView
+from django_th.tests.test_main import MainTest, setup_view
+from django_th.views_userservices import UserServiceListView, UserServiceCreateView, UserServiceUpdateView
 
 
 class UserServiceListViewTestCase(MainTest):
@@ -35,61 +34,32 @@ def test_context_data(self):
         self.assertIn('service_list_remaining', context)
 
 
-"""
 class UserServiceCreateViewTestCase(MainTest):
 
-    def setUp(self):
-        super(UserServiceCreateViewTestCase, self).setUp()
-        # Every test needs access to the request factory.
-        self.factory = RequestFactory()
-
-    def test_context_data(self):
-        # Setup request and view
-        request = self.factory.get(reverse('add_service', args=['ServiceRss']))
+    def test_get(self):
+        template_name = 'services/service_form.html'
+        # Setup request and view.
+        request = RequestFactory().get('th/service/add/')
         request.user = self.user
-
-        view = UserServiceCreateView(
-            template_name='services/service_form.html',
-            form_class=UserServiceForm)
-
-        kwargs = dict()
-        kwargs['service_name'] = 'ServiceRss'
-
-        view = setup_view(view, request, **kwargs)
-        context = view.get_context_data()
-
-        self.assertIn('service_name_alone', context)
-        self.assertIn('service_name', context)
-        self.assertIn('SERVICES_AUTH', context)
-        self.assertIn('SERVICES_HOSTED_WITH_AUTH', context)
-        self.assertIn('SERVICES_NEUTRAL', context)
+        view = UserServiceCreateView.as_view(template_name=template_name)
+        # Run.
+        response = view(request, user=request.user, service_name="ServiceRss")
+        # Check.
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.template_name[0], template_name)
 
 
 class UserServiceUpdateViewTestCase(MainTest):
 
-    def setUp(self):
-        super(UserServiceUpdateViewTestCase, self).setUp()
-        # Every test needs access to the request factory.
-        self.factory = RequestFactory()
-
-    def test_context_data(self):
-        # Setup request and view
-        request = self.factory.get(reverse('edit_service', args=[1]))
+    def test_get(self):
+        template_name = 'services/service_form.html'
+        t = self.create_triggerservice()
+        # Setup request and view.
+        request = RequestFactory().get('th/service/edit/')
         request.user = self.user
-
-        view = UserServiceUpdateView(
-            template_name='services/service_form.html',
-            form_class=UserServiceForm)
-
-        kwargs = dict()
-        kwargs['pk'] = 1
-
-        view = setup_view(view, request, **kwargs)
-        context = view.get_context_data()
-
-        self.assertIn('service_name_alone', context)
-        self.assertIn('service_name', context)
-        self.assertIn('SERVICES_AUTH', context)
-        self.assertIn('SERVICES_HOSTED_WITH_AUTH', context)
-        self.assertIn('SERVICES_NEUTRAL', context)
-"""
+        view = UserServiceUpdateView.as_view(template_name=template_name)
+        # Run.
+        response = view(request, user=request.user, pk=t.id)
+        # Check.
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.template_name[0], template_name)

django_th/tests/test_xcmd.py

@@ -11,3 +11,5 @@ def test_run(self):
         management.call_command('recycle', verbosity=0, interactive=False)
         management.call_command('read', verbosity=0, interactive=False)
         management.call_command('publish', verbosity=0, interactive=False)
+        management.call_command('read_n_pub', trigger_id=1, verbosity=0, interactive=False)
+        # management.call_command('send_digest', verbosity=0, interactive=False)

django_th/tools.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 import arrow
-import importlib
 import datetime
+import importlib
 import time
 
 from django.conf import settings

django_th/views.py

@@ -3,19 +3,16 @@
 
 from django.core.cache import caches
 from django.conf import settings
-
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect
-from django.views.generic import TemplateView, UpdateView, ListView, DeleteView
 from django.db.models import Q
+from django.http import HttpResponseRedirect
 from django.utils.decorators import method_decorator
-
 from django.urls import reverse, reverse_lazy
+from django.views.generic import TemplateView, UpdateView, ListView, DeleteView
 
 # trigger_happy
-from django_th.models import TriggerService, UserService
-
 from django_th.forms.base import TriggerServiceForm
+from django_th.models import TriggerService, UserService
 from django_th.views_fbv import can_modify_trigger
 
 import logging