From 2bd5aa838f8397d94364073adfab24731a25ed3f Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Tue, 25 Oct 2016 11:56:19 +0200 Subject: [PATCH 1/2] fix pep8 errors in testsy --- tests/conftest.py | 1 + tests/test_api.py | 9 ++++----- tests/test_emailing.py | 36 +++++++++++++++++------------------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 674a805..e609d02 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,7 @@ import pytest import django_webtest + @pytest.fixture def app(request): wtm = django_webtest.WebTestMixin() diff --git a/tests/test_api.py b/tests/test_api.py index bebfd9d..261e904 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -1,5 +1,4 @@ import pytest -import json from uuid import uuid4 @@ -22,6 +21,7 @@ def categories(): categories.append(c) return categories + @pytest.fixture def announces(): announces = [] @@ -55,8 +55,8 @@ def test_get_subscriptions_by_email(app, categories, announces): for identifier, name in channel_choices[:1]: for category in categories: uri = '%s:%s' % (identifier, foo) - subscription = Subscription.objects.create(identifier=uri, - category=category) + Subscription.objects.create(identifier=uri, + category=category) resp = app.get(reverse('subscriptions'), {'email': foo}, status=200) assert 'data' in resp.json data = resp.json['data'] @@ -79,10 +79,9 @@ def test_update_subscriptions(app, categories, announces): subscriptions = [{'id': category_id, 'text': category.name, 'transports': transports}] - resp = app.post_json(subscriptions_url , subscriptions) + resp = app.post_json(subscriptions_url, subscriptions) if resp.json['data']: resp = app.get(subscriptions_url, status=200) - print resp.json['data'] for cat in resp.json['data']: if cat['id'] == category_id: sub_transports = [c['id'] for c in cat['transports']] diff --git a/tests/test_emailing.py b/tests/test_emailing.py index 9f367ea..197321a 100644 --- a/tests/test_emailing.py +++ b/tests/test_emailing.py @@ -1,21 +1,15 @@ -import urlparse import pytest -import json from uuid import uuid4 import os import re import urllib from django.core.urlresolvers import reverse -from django.utils.http import urlencode from django.core import mail, signing from django.utils import timezone from django.core.files.storage import DefaultStorage -from django.core.urlresolvers import reverse -from django.conf import settings -from corbo.models import Category, Announce, Subscription, Broadcast -from corbo.models import channel_choices, transform_image_src +from corbo.models import Category, Announce, Subscription, Broadcast, transform_image_src pytestmark = pytest.mark.django_db @@ -30,6 +24,7 @@ def categories(): categories.append(c) return categories + @pytest.fixture def announces(): announces = [] @@ -46,6 +41,7 @@ def announces(): announces.append(a) return announces + def test_emailing_with_no_subscriptions(app, categories, announces): for announce in announces: broadcast = Broadcast.objects.get(announce=announce) @@ -53,24 +49,26 @@ def test_emailing_with_no_subscriptions(app, categories, announces): assert not broadcast.result assert not mail.outbox + def test_send_email(app, categories, announces): for category in categories: uuid = uuid4() - s = Subscription.objects.create(category=category, - identifier='%s@example.net' % uuid, uuid=uuid) + Subscription.objects.create(category=category, + identifier='%s@example.net' % uuid, uuid=uuid) for announce in announces: - broadcast= Broadcast.objects.get(announce=announce) + broadcast = Broadcast.objects.get(announce=announce) broadcast.send() assert broadcast.result assert mail.outbox + def test_check_inline_css(app, categories, announces): for announce in announces: announce.text = '' + announce.text announce.save() uuid = uuid4() - s = Subscription.objects.create(category=announce.category, - identifier='%s@example.net' % uuid, uuid=uuid) + Subscription.objects.create(category=announce.category, + identifier='%s@example.net' % uuid, uuid=uuid) broadcast = Broadcast.objects.get(announce=announce) broadcast.send() assert broadcast.result @@ -78,6 +76,7 @@ def test_check_inline_css(app, categories, announces): assert 'h2 style="color:#F00"' in mail.outbox[0].html mail.outbox = [] + def test_check_inline_images(app, categories, announces): storage = DefaultStorage() media_path = os.path.join(os.path.dirname(__file__), 'media') @@ -88,8 +87,8 @@ def test_check_inline_images(app, categories, announces): announce.text = announce.text + '' % img_src announce.save() uuid = uuid4() - s = Subscription.objects.create(category=announce.category, - identifier='%s@example.net' % uuid, uuid=uuid) + Subscription.objects.create(category=announce.category, + identifier='%s@example.net' % uuid, uuid=uuid) broadcast = Broadcast.objects.get(announce=announce) broadcast.send() assert broadcast.result @@ -101,19 +100,18 @@ def test_check_inline_images(app, categories, announces): mail.outbox = [] storage.delete(image_name) + def test_unsubscription_link(app, categories, announces): unsubscription_link_sentinel = '' for category in categories: uuid = uuid4() scheme = 'mailto:' uri = scheme + '%s@example.net' % uuid - s = Subscription.objects.create(category=category, - identifier=uri, - uuid=str(uuid)) + Subscription.objects.create(category=category, identifier=uri, uuid=str(uuid)) for announce in announces: if announce.category != category: continue - broadcast= Broadcast.objects.get(announce=announce) + broadcast = Broadcast.objects.get(announce=announce) broadcast.send() assert broadcast.result assert mail.outbox @@ -121,7 +119,7 @@ def test_unsubscription_link(app, categories, announces): signature = urllib.unquote(re.findall('/unsubscribe/(.*)"', mail.outbox[0].html)[0]) unsubscription_link = reverse('unsubscribe', kwargs={'unsubscription_token': signature}) assert signing.loads(signature) == { - 'category': announce.category.pk, 'identifier': uri} + 'category': announce.category.pk, 'identifier': uri} assert mail.outbox[0].subject == announce.title assert unsubscription_link in mail.outbox[0].html assert unsubscription_link in mail.outbox[0].text -- 2.9.3