diff --git a/.travis.yml b/.travis.yml index a1d0aacc..c306c1f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,14 @@ language: python python: - - "3.5" - - "3.6" + - "3.4.2" +# - "3.6" env: - # Set a dummy secret key - - DJANGO_SECRET_KEY=0 + - DJANGO_SECRET_KEY=0 OPENNEBULA_USERNAME='test' OPENNEBULA_PASSWORD='test' OPENNEBULA_PROTOCOL='http' OPENNEBULA_DOMAIN='test_domain' OPENNEBULA_PORT='2633' OPENNEBULA_ENDPOINT='/RPC2' DCL_TEXT='Data Center Light' CELERY_MAX_RETRIES=0 # install dependencies install: "pip install -r requirements.txt" script: - flake8 -- python manage.py test +- python manage.py test -v 3 +# - coverage run --source='.' manage.py test dynamicweb -v 3 +# - coverage report diff --git a/Changelog b/Changelog index 77c53a4b..7aecbec7 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +1.2.10: 2017-11-26 + * #3843: [ungleich] Add generic ungleich CMS template + * #3672: [all] Clean existing automated tests 1.2.9: 2017-11-13 * #3848: [ungleich] Optimize ungleich.ch landing page * #3360: [ungleich] Ungleich.ch landing page animation fix diff --git a/README.rst b/README.rst index 8c8c8ddb..f297018c 100644 --- a/README.rst +++ b/README.rst @@ -3,6 +3,10 @@ ungleich dynamicweb ---------- + +.. image:: https://travis-ci.org/ungleich/dynamicweb.svg?branch=master + :target: https://travis-ci.org/ungleich/dynamicweb + Website for ungleich GmbH ======= diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index ce6e6724..908b1f89 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -31,3 +31,14 @@ def get_value_from_dict(dict_data, key): return dict_data.get(key) else: return "" + + +@register.filter('multiply') +def multiply(value, arg): + """ + usage: {{ quantity|multiply:price }} + :param value: + :param arg: + :return: + """ + return value*arg diff --git a/datacenterlight/tests.py b/datacenterlight/tests.py index 3405cfb6..d1ce9785 100644 --- a/datacenterlight/tests.py +++ b/datacenterlight/tests.py @@ -8,6 +8,8 @@ from django.conf import settings from django.core.management import call_command from django.test import TestCase, override_settings from model_mommy import mommy +from unittest import skipIf + from datacenterlight.models import VMTemplate from datacenterlight.tasks import create_vm_task from membership.models import StripeCustomer @@ -16,6 +18,11 @@ from utils.hosting_utils import get_vm_price from utils.stripe_utils import StripeUtils +@skipIf( + settings.STRIPE_API_PRIVATE_KEY_TEST is None or + settings.STRIPE_API_PRIVATE_KEY_TEST is "", + """Stripe details unavailable, so skipping CeleryTaskTestCase""" + ) class CeleryTaskTestCase(TestCase): @override_settings( task_eager_propagates=True, @@ -47,6 +54,11 @@ class CeleryTaskTestCase(TestCase): # OpenNebula call_command('fetchvmtemplates') + @skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping test_create_vm_task""" + ) def test_create_vm_task(self): """Tests the create vm task for monthly subscription @@ -110,13 +122,11 @@ class CeleryTaskTestCase(TestCase): msg = subscription_result.get('error') raise Exception("Creating subscription failed: {}".format(msg)) - async_task = create_vm_task.delay(vm_template_id, self.user, - specs, - template_data, - stripe_customer.id, - billing_address_data, - stripe_subscription_obj.id, - card_details_dict) + async_task = create_vm_task.delay( + vm_template_id, self.user, specs, template_data, + stripe_customer.id, billing_address_data, + stripe_subscription_obj.id, card_details_dict + ) new_vm_id = 0 res = None for i in range(0, 10): diff --git a/digitalglarus/test_views.py b/digitalglarus/test_views.py index f3e427ba..cdd23bad 100644 --- a/digitalglarus/test_views.py +++ b/digitalglarus/test_views.py @@ -15,9 +15,11 @@ from membership.models import CustomUser, StripeCustomer from utils.tests import BaseTestCase -from .views import LoginView, SignupView, PasswordResetView, PasswordResetConfirmView,\ +from .views import ( + LoginView, SignupView, PasswordResetView, PasswordResetConfirmView, MembershipPricingView, MembershipPaymentView -from .models import MembershipType, MembershipOrder +) +from .models import MembershipType class ContactViewTest(TestCase): @@ -41,13 +43,19 @@ class ContactViewTest(TestCase): class ViewsTest(CMSTestCase): def setUp(self): - self.page1 = create_page('home', 'home_digitalglarus.html', published=True, language='en-us') - self.page2 = create_page('about', 'about.html', published=True, language='en-us', slug='about') + self.page1 = create_page( + 'home', 'home_digitalglarus.html', published=True, + language='en-us' + ) + self.page2 = create_page( + 'about', 'about.html', published=True, language='en-us', + slug='about' + ) def test_digitalglarus_templates(self): res1 = self.client.get('/en-us/') self.assertContains(res1, 'Digital Glarus', status_code=200) - res2 = self.client.get('/en-us/about/') + res2 = self.client.get('/en-us/cms/about/') self.assertEqual(res2.status_code, 200) @@ -69,7 +77,9 @@ class MembershipPricingViewTest(BaseTestCase): # Anonymous user should get data response = self.client.get(self.url) self.assertEqual(response.status_code, 200) - self.assertEqual(response.context['membership_type'], self.membership_type) + self.assertEqual( + response.context['membership_type'], self.membership_type + ) self.assertTemplateUsed(response, self.expected_template) @@ -101,8 +111,10 @@ class MembershipPaymentViewTest(BaseTestCase): # Anonymous user should get redirect to login response = self.client.get(self.url) - expected_url = "%s?next=%s" % (reverse('digitalglarus:signup'), - reverse('digitalglarus:membership_payment')) + expected_url = "%s?next=%s" % ( + reverse('digitalglarus:signup'), + reverse('digitalglarus:membership_payment') + ) self.assertRedirects(response, expected_url=expected_url, status_code=302, target_status_code=200) @@ -132,19 +144,29 @@ class MembershipPaymentViewTest(BaseTestCase): } response = self.customer_client.post(self.url, self.billing_address) self.assertEqual(response.status_code, 200) - self.assertTrue(StripeCustomer.objects.filter(user__email=self.customer.email).exists()) - stripe_customer = StripeCustomer.objects.get(user__email=self.customer.email) + self.assertTrue( + StripeCustomer.objects.filter( + user__email=self.customer.email + ).exists() + ) + stripe_customer = StripeCustomer.objects.get( + user__email=self.customer.email + ) self.assertEqual(stripe_customer.user, self.customer) - self.assertTrue(MembershipOrder.objects.filter(customer=stripe_customer).exists()) - membership_order = MembershipOrder.objects.filter(customer=stripe_customer).first() - session_data = { - 'membership_price': membership_order.membership.type.first_month_price, - 'membership_dates': membership_order.membership.type.first_month_formated_range - } - self.assertEqual(session_data.get('membership_price'), - self.session_data.get('membership_price')) - self.assertEqual(session_data.get('membership_dates'), - self.session_data.get('membership_dates')) + # self.assertTrue(MembershipOrder.objects.filter(customer=stripe_customer).exists()) + # membership_order = MembershipOrder.objects.filter( + # customer=stripe_customer + # ).first() + # session_data = { + # 'membership_price': + # membership_order.membership.type.first_month_price, + # 'membership_dates': + # membership_order.membership.type.first_month_formated_range + # } + # self.assertEqual(session_data.get('membership_price'), + # self.session_data.get('membership_price')) + # self.assertEqual(session_data.get('membership_dates'), + # self.session_data.get('membership_dates')) # self.assertTrue(HostingOrder.objects.filter(customer=stripe_customer).exists()) # hosting_order = HostingOrder.objects.filter(customer=stripe_customer)[0] @@ -212,7 +234,9 @@ class SignupViewTest(TestCase): self.assertTemplateUsed(response, self.expected_template) def test_anonymous_user_can_signup(self): - response = self.client.post(self.url, data=self.signup_data, follow=True) + response = self.client.post( + self.url, data=self.signup_data, follow=True + ) self.user = CustomUser.objects.get(email=self.signup_data.get('email')) self.assertEqual(response.context['user'], self.user) self.assertEqual(response.status_code, 200) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 48a2399f..19c263d5 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -219,6 +219,7 @@ CMS_TEMPLATES = ( # dcl ('datacenterlight/cms_page.html', gettext('Data Center Light')), ('ungleich_page/glasfaser_cms_page.html', gettext('Glasfaser')), + ('ungleich_page/ungleich_cms_page.html', gettext('ungleich')), ) DATABASES = { diff --git a/hosting/test_forms.py b/hosting/test_forms.py index e0f5df30..89ddb268 100644 --- a/hosting/test_forms.py +++ b/hosting/test_forms.py @@ -1,25 +1,18 @@ from django.test import TestCase - -from unittest import mock from model_mommy import mommy - -from .forms import HostingOrderAdminForm, HostingUserLoginForm, HostingUserSignupForm -from .models import VirtualMachinePlan +from .forms import HostingUserLoginForm, HostingUserSignupForm class HostingUserLoginFormTest(TestCase): - def setUp(self): password = 'user_password' - self.user = mommy.make('CustomUser') - + self.user = mommy.make('CustomUser', validated=1) self.user.set_password(password) self.user.save() self.completed_data = { 'email': self.user.email, 'password': password } - self.incorrect_data = { 'email': 'test', } @@ -34,9 +27,7 @@ class HostingUserLoginFormTest(TestCase): class HostingUserSignupFormTest(TestCase): - def setUp(self): - self.completed_data = { 'name': 'test name', 'email': 'test@ungleich.com', @@ -58,13 +49,11 @@ class HostingUserSignupFormTest(TestCase): class HostingOrderAdminFormTest(TestCase): - def setUp(self): - self.customer = mommy.make('StripeCustomer') self.vm_plan = mommy.make('VirtualMachinePlan') - self.vm_canceled_plan = mommy.make('VirtualMachinePlan', - status=VirtualMachinePlan.CANCELED_STATUS) + # self.vm_canceled_plan = mommy.make('VirtualMachinePlan', + # status=VirtualMachinePlan.CANCELED_STATUS) self.mocked_charge = { 'amount': 5100, @@ -87,30 +76,30 @@ class HostingOrderAdminFormTest(TestCase): 'customer': None } - @mock.patch('utils.stripe_utils.StripeUtils.make_charge') - def test_valid_form(self, stripe_mocked_call): - stripe_mocked_call.return_value = { - 'paid': True, - 'response_object': self.mocked_charge, - 'error': None - } - form = HostingOrderAdminForm(data=self.completed_data) - self.assertTrue(form.is_valid()) + # @mock.patch('utils.stripe_utils.StripeUtils.make_charge') + # def test_valid_form(self, stripe_mocked_call): + # stripe_mocked_call.return_value = { + # 'paid': True, + # 'response_object': self.mocked_charge, + # 'error': None + # } + # form = HostingOrderAdminForm(data=self.completed_data) + # self.assertTrue(form.is_valid()) - @mock.patch('utils.stripe_utils.StripeUtils.make_charge') - def test_invalid_form_canceled_vm(self, stripe_mocked_call): - - self.completed_data.update({ - 'vm_plan': self.vm_canceled_plan.id - }) - stripe_mocked_call.return_value = { - 'paid': True, - 'response_object': self.mocked_charge, - 'error': None - } - form = HostingOrderAdminForm(data=self.completed_data) - self.assertFalse(form.is_valid()) - - def test_invalid_form(self): - form = HostingOrderAdminForm(data=self.incompleted_data) - self.assertFalse(form.is_valid()) + # @mock.patch('utils.stripe_utils.StripeUtils.make_charge') + # def test_invalid_form_canceled_vm(self, stripe_mocked_call): + # + # self.completed_data.update({ + # 'vm_plan': self.vm_canceled_plan.id + # }) + # stripe_mocked_call.return_value = { + # 'paid': True, + # 'response_object': self.mocked_charge, + # 'error': None + # } + # form = HostingOrderAdminForm(data=self.completed_data) + # self.assertFalse(form.is_valid()) + # + # def test_invalid_form(self): + # form = HostingOrderAdminForm(data=self.incompleted_data) + # self.assertFalse(form.is_valid()) diff --git a/hosting/test_models.py b/hosting/test_models.py index 2b41045b..944044ea 100644 --- a/hosting/test_models.py +++ b/hosting/test_models.py @@ -1,75 +1,75 @@ -from django.test import TestCase - -from django.core.management import call_command - - -from .models import VirtualMachineType - - -class VirtualMachineTypeModelTest(TestCase): - - def setUp(self): - self.HETZNER_NUG_NAME = 'hetzner_nug' - self.HETZNER_NAME = 'hetzner' - self.HETZNER_RAID6_NAME = 'hetzner_raid6' - self.HETZNER_GLUSTERFS_NAME = 'hetzner_glusterfs' - self.BERN_NAME = 'bern' - self.HETZNER_NUG_EXPECTED_PRICE = 79 - self.HETZNER_EXPECTED_PRICE = 180 - self.HETZNER_RAID6_EXPECTED_PRICE = 216 - self.HETZNER_GLUSTERFS_EXPECTED_PRICE = 252 - self.BERN_EXPECTED_PRICE = 202 - - call_command('create_vm_types') - - def test_calculate_price(self): - - # hetzner_nug - # specifications = { - # 'cores': 2, - # 'memory': 10, - # 'disk_size': 100 - # } - # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NUG_NAME) - # calculated_price = vm_type.calculate_price(specifications) - # self.assertEqual(calculated_price, self.HETZNER_NUG_EXPECTED_PRICE) - - # hetzner - specifications = { - 'cores': 2, - 'memory': 10, - 'disk_size': 100 - } - vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NAME) - calculated_price = vm_type.calculate_price(specifications) - self.assertEqual(calculated_price, self.HETZNER_EXPECTED_PRICE) - - # hetzner_raid6 - # specifications = { - # 'cores': 2, - # 'memory': 10, - # 'disk_size': 100 - # } - # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_RAID6_NAME) - # calculated_price = vm_type.calculate_price(specifications) - # self.assertEqual(calculated_price, self.HETZNER_RAID6_EXPECTED_PRICE) - - # hetzner_glusterfs - # specifications = { - # 'cores': 2, - # 'memory': 10, - # 'disk_size': 100 - # } - # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_GLUSTERFS_NAME) - # calculated_price = vm_type.calculate_price(specifications) - # self.assertEqual(calculated_price, self.HETZNER_GLUSTERFS_EXPECTED_PRICE) - - # bern - specifications = { - 'cores': 2, - 'memory': 10, - 'disk_size': 100 - } - vm_type = VirtualMachineType.objects.get(hosting_company=self.BERN_NAME) - calculated_price = vm_type.calculate_price(specifications) - self.assertEqual(calculated_price, self.BERN_EXPECTED_PRICE) +# from django.test import TestCase +# +# from django.core.management import call_command +# +# +# #from .models import VirtualMachineType +# +# +# class VirtualMachineTypeModelTest(TestCase): +# +# def setUp(self): +# self.HETZNER_NUG_NAME = 'hetzner_nug' +# self.HETZNER_NAME = 'hetzner' +# self.HETZNER_RAID6_NAME = 'hetzner_raid6' +# self.HETZNER_GLUSTERFS_NAME = 'hetzner_glusterfs' +# self.BERN_NAME = 'bern' +# self.HETZNER_NUG_EXPECTED_PRICE = 79 +# self.HETZNER_EXPECTED_PRICE = 180 +# self.HETZNER_RAID6_EXPECTED_PRICE = 216 +# self.HETZNER_GLUSTERFS_EXPECTED_PRICE = 252 +# self.BERN_EXPECTED_PRICE = 202 +# +# call_command('create_vm_types') +# +# def test_calculate_price(self): +# +# # hetzner_nug +# # specifications = { +# # 'cores': 2, +# # 'memory': 10, +# # 'disk_size': 100 +# # } +# # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NUG_NAME) +# # calculated_price = vm_type.calculate_price(specifications) +# # self.assertEqual(calculated_price, self.HETZNER_NUG_EXPECTED_PRICE) +# +# # hetzner +# specifications = { +# 'cores': 2, +# 'memory': 10, +# 'disk_size': 100 +# } +# vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NAME) +# calculated_price = vm_type.calculate_price(specifications) +# self.assertEqual(calculated_price, self.HETZNER_EXPECTED_PRICE) +# +# # hetzner_raid6 +# # specifications = { +# # 'cores': 2, +# # 'memory': 10, +# # 'disk_size': 100 +# # } +# # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_RAID6_NAME) +# # calculated_price = vm_type.calculate_price(specifications) +# # self.assertEqual(calculated_price, self.HETZNER_RAID6_EXPECTED_PRICE) +# +# # hetzner_glusterfs +# # specifications = { +# # 'cores': 2, +# # 'memory': 10, +# # 'disk_size': 100 +# # } +# # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_GLUSTERFS_NAME) +# # calculated_price = vm_type.calculate_price(specifications) +# # self.assertEqual(calculated_price, self.HETZNER_GLUSTERFS_EXPECTED_PRICE) +# +# # bern +# specifications = { +# 'cores': 2, +# 'memory': 10, +# 'disk_size': 100 +# } +# vm_type = VirtualMachineType.objects.get(hosting_company=self.BERN_NAME) +# calculated_price = vm_type.calculate_price(specifications) +# self.assertEqual(calculated_price, self.BERN_EXPECTED_PRICE) diff --git a/hosting/test_views.py b/hosting/test_views.py index aa9a9ace..2c71959a 100644 --- a/hosting/test_views.py +++ b/hosting/test_views.py @@ -1,4 +1,3 @@ -from unittest import mock from django.conf import settings from django.test import TestCase from django.core.urlresolvers import reverse @@ -6,21 +5,29 @@ from django.core.urlresolvers import resolve from django.contrib.auth.tokens import default_token_generator from django.utils.http import urlsafe_base64_encode from django.utils.encoding import force_bytes - +from unittest import skipIf from model_mommy import mommy from stored_messages.models import Inbox from membership.models import CustomUser, StripeCustomer -from .models import VirtualMachineType, HostingOrder, VirtualMachinePlan -from .views import DjangoHostingView, RailsHostingView, NodeJSHostingView, LoginView, SignupView, \ - PaymentVMView, OrdersHostingDetailView, OrdersHostingListView, VirtualMachineView, \ - VirtualMachinesPlanListView, PasswordResetView, PasswordResetConfirmView, HostingPricingView, \ - NotificationsView, MarkAsReadNotificationView, GenerateVMSSHKeysView +from .models import HostingOrder +from .views import ( + DjangoHostingView, RailsHostingView, NodeJSHostingView, LoginView, + SignupView, PaymentVMView, OrdersHostingDetailView, OrdersHostingListView, + VirtualMachinesPlanListView, PasswordResetView, PasswordResetConfirmView, + HostingPricingView, NotificationsView, MarkAsReadNotificationView +) from utils.tests import BaseTestCase +@skipIf( + (settings.OPENNEBULA_DOMAIN is None or + settings.OPENNEBULA_DOMAIN == "test_domain"), + """OpenNebula details unavailable, so skipping + ProcessVMSelectionTestMixin""" +) class ProcessVMSelectionTestMixin(object): def url_resolve_to_view_correctly(self): @@ -30,14 +37,15 @@ class ProcessVMSelectionTestMixin(object): def test_get(self): response = self.client.get(self.url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.view.get_context_data(), self.expected_context) + # self.assertEqual(self.view.get_context_data(), self.expected_context) self.assertEqual(response.context['hosting'], self.expected_context['hosting']) self.assertTemplateUsed(response, self.expected_template) - def test_anonymous_post(self): - response = self.client.post(self.url) - self.assertRedirects(response, expected_url=reverse('hosting:login'), - status_code=302, target_status_code=200) + # def test_anonymous_post(self): + # params = {'vm_template_id': 1, 'configuration': 1} + # response = self.client.post(self.url, params) + # self.assertRedirects(response, expected_url=reverse('hosting:login'), + # status_code=302, target_status_code=200) class DjangoHostingViewTest(TestCase, ProcessVMSelectionTestMixin): @@ -47,15 +55,16 @@ class DjangoHostingViewTest(TestCase, ProcessVMSelectionTestMixin): self.view = DjangoHostingView() self.expected_template = 'hosting/django.html' HOSTING = 'django' - configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) + # configuration_detail = dict( + # VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) self.expected_context = { 'hosting': HOSTING, 'hosting_long': "Django", - 'configuration_detail': configuration_detail, + # 'configuration_detail': configuration_detail, 'domain': "django-hosting.ch", 'google_analytics': "UA-62285904-6", 'email': "info@django-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + # 'vm_types': VirtualMachineType.get_serialized_vm_types(), } @@ -66,15 +75,16 @@ class RailsHostingViewTest(TestCase, ProcessVMSelectionTestMixin): self.view = RailsHostingView() self.expected_template = 'hosting/rails.html' HOSTING = 'rails' - configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) + # configuration_detail = dict( + # VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) self.expected_context = { 'hosting': HOSTING, 'hosting_long': "Ruby On Rails", - 'configuration_detail': configuration_detail, + # 'configuration_detail': configuration_detail, 'domain': "rails-hosting.ch", 'google_analytics': "UA-62285904-5", 'email': "info@rails-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + # 'vm_types': VirtualMachineType.get_serialized_vm_types(), } @@ -85,18 +95,25 @@ class NodeJSHostingViewTest(TestCase, ProcessVMSelectionTestMixin): self.view = NodeJSHostingView() self.expected_template = 'hosting/nodejs.html' HOSTING = 'nodejs' - configuration_detail = dict(VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) + # configuration_detail = dict( + # VirtualMachinePlan.VM_CONFIGURATION).get(HOSTING) self.expected_context = { 'hosting': HOSTING, 'hosting_long': "NodeJS", - 'configuration_detail': configuration_detail, + # 'configuration_detail': configuration_detail, 'domain': "node-hosting.ch", 'google_analytics': "UA-62285904-7", 'email': "info@node-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + # 'vm_types': VirtualMachineType.get_serialized_vm_types(), } +@skipIf( + (settings.OPENNEBULA_DOMAIN is None or + settings.OPENNEBULA_DOMAIN == "test_domain"), + """OpenNebula details unavailable, so skipping + HostingPricingViewTest.test_get""" +) class HostingPricingViewTest(TestCase): def setUp(self): @@ -104,11 +121,11 @@ class HostingPricingViewTest(TestCase): self.view = HostingPricingView() self.expected_template = 'hosting/hosting_pricing.html' - configuration_options = dict(VirtualMachinePlan.VM_CONFIGURATION) + # configuration_options = dict(VirtualMachinePlan.VM_CONFIGURATION) self.expected_context = { - 'configuration_options': configuration_options, + # 'configuration_options': configuration_options, 'email': "info@django-hosting.ch", - 'vm_types': VirtualMachineType.get_serialized_vm_types(), + # 'vm_types': VirtualMachineType.get_serialized_vm_types(), } def url_resolve_to_view_correctly(self): @@ -118,13 +135,13 @@ class HostingPricingViewTest(TestCase): def test_get(self): response = self.client.get(self.url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.view.get_context_data(), self.expected_context) + # self.assertEqual(self.view.get_context_data(), self.expected_context) self.assertTemplateUsed(response, self.expected_template) - def test_anonymous_post(self): - response = self.client.post(self.url) - self.assertRedirects(response, expected_url=reverse('hosting:login'), - status_code=302, target_status_code=200) + # def test_anonymous_post(self): + # response = self.client.post(self.url) + # self.assertRedirects(response, expected_url=reverse('hosting:login'), + # status_code=302, target_status_code=200) class PaymentVMViewTest(BaseTestCase): @@ -135,10 +152,10 @@ class PaymentVMViewTest(BaseTestCase): self.view = PaymentVMView # VM - self.vm = mommy.make(VirtualMachineType, base_price=10000, - memory_price=100, - core_price=1000, - disk_size_price=1) + # self.vm = mommy.make(VirtualMachineType, base_price=10000, + # memory_price=100, + # core_price=1000, + # disk_size_price=1) # post data self.billing_address = { @@ -153,56 +170,56 @@ class PaymentVMViewTest(BaseTestCase): self.url = reverse('hosting:payment') # Session data - self.session_data = { - 'vm_specs': { - 'hosting_company': self.vm.hosting_company, - 'cores': 1, - 'memory': 10, - 'disk_size': 10000, - 'price': 22000, - 'configuration': dict(VirtualMachinePlan.VM_CONFIGURATION).get('django') - } - } + # self.session_data = { + # 'vm_specs': { + # 'hosting_company': self.vm.hosting_company, + # 'cores': 1, + # 'memory': 10, + # 'disk_size': 10000, + # 'price': 22000, + # 'configuration': dict(VirtualMachinePlan.VM_CONFIGURATION).get('django') + # } + # } - session = self.customer_client.session - session.update(self.session_data) - session.save() + # session = self.customer_client.session + # session.update(self.session_data) + # session.save() def test_url_resolve_to_view_correctly(self): found = resolve(self.url) self.assertEqual(found.func.__name__, self.view.__name__) - @mock.patch('utils.stripe_utils.StripeUtils.create_customer') - def test_post(self, stripe_mocked_call): - - # Anonymous user should get redirect to login - response = self.client.post(self.url) - expected_url = "%s?next=%s" % (reverse('hosting:login'), reverse('hosting:payment')) - self.assertRedirects(response, expected_url=expected_url, - status_code=302, target_status_code=200) - - # Customer user should be able to pay - stripe_mocked_call.return_value = { - 'paid': True, - 'response_object': self.stripe_mocked_customer, - 'error': None - } - response = self.customer_client.post(self.url, self.billing_address) - self.assertEqual(response.status_code, 200) - self.assertTrue(StripeCustomer.objects.filter(user__email=self.customer.email).exists()) - stripe_customer = StripeCustomer.objects.get(user__email=self.customer.email) - self.assertEqual(stripe_customer.user, self.customer) - self.assertTrue(HostingOrder.objects.filter(customer=stripe_customer).exists()) - hosting_order = HostingOrder.objects.filter(customer=stripe_customer)[0] - vm_plan = { - 'cores': hosting_order.vm_plan.cores, - 'memory': hosting_order.vm_plan.memory, - 'disk_size': hosting_order.vm_plan.disk_size, - 'price': hosting_order.vm_plan.price, - 'hosting_company': hosting_order.vm_plan.vm_type.hosting_company, - 'configuration': hosting_order.vm_plan.configuration - } - self.assertEqual(vm_plan, self.session_data.get('vm_specs')) + # @mock.patch('utils.stripe_utils.StripeUtils.create_customer') + # def test_post(self, stripe_mocked_call): + # + # # Anonymous user should get redirect to login + # response = self.client.post(self.url) + # expected_url = "%s?next=%s" % (reverse('hosting:login'), reverse('hosting:payment')) + # self.assertRedirects(response, expected_url=expected_url, + # status_code=302, target_status_code=200) + # + # # Customer user should be able to pay + # stripe_mocked_call.return_value = { + # 'paid': True, + # 'response_object': self.stripe_mocked_customer, + # 'error': None + # } + # response = self.customer_client.post(self.url, self.billing_address) + # self.assertEqual(response.status_code, 200) + # self.assertTrue(StripeCustomer.objects.filter(user__email=self.customer.email).exists()) + # stripe_customer = StripeCustomer.objects.get(user__email=self.customer.email) + # self.assertEqual(stripe_customer.user, self.customer) + # self.assertTrue(HostingOrder.objects.filter(customer=stripe_customer).exists()) + # hosting_order = HostingOrder.objects.filter(customer=stripe_customer)[0] + # vm_plan = { + # 'cores': hosting_order.vm_plan.cores, + # 'memory': hosting_order.vm_plan.memory, + # 'disk_size': hosting_order.vm_plan.disk_size, + # 'price': hosting_order.vm_plan.price, + # 'hosting_company': hosting_order.vm_plan.vm_type.hosting_company, + # 'configuration': hosting_order.vm_plan.configuration + # } + # self.assertEqual(vm_plan, self.session_data.get('vm_specs')) def test_get(self): @@ -285,73 +302,73 @@ class MarkAsReadNotificationViewTest(BaseTestCase): self.assertTemplateUsed(response, self.expected_template) -class GenerateVMSSHKeysViewTest(BaseTestCase): - - def setUp(self): - super(GenerateVMSSHKeysViewTest, self).setUp() - - self.view = GenerateVMSSHKeysView - self.vm = mommy.make(VirtualMachinePlan) - self.expected_template = 'hosting/virtual_machine_key.html' - self.url = reverse('hosting:virtual_machine_key', kwargs={'pk': self.vm.id}) - - def test_url_resolve_to_view_correctly(self): - found = resolve(self.url) - self.assertEqual(found.func.__name__, self.view.__name__) - - def test_get(self): - - # Anonymous user should get redirect to login - response = self.client.get(self.url) - expected_url = "%s?next=%s" % (reverse('hosting:login'), - reverse('hosting:virtual_machine_key', - kwargs={'pk': self.vm.id})) - self.assertRedirects(response, expected_url=expected_url, - status_code=302, target_status_code=200) - - # Logged user should get the page - response = self.customer_client.get(self.url, follow=True) - self.assertEqual(response.status_code, 200) - updated_vm = VirtualMachinePlan.objects.get(id=self.vm.id) - self.assertEqual(response.context['public_key'].decode("utf-8"), updated_vm.public_key) - self.assertTrue(response.context['private_key'] is not None) - self.assertEqual(len(response.context['public_key']), 380) - self.assertTrue(len(response.context['private_key']) is 1678 or 1674) - self.assertTemplateUsed(response, self.expected_template) +# class GenerateVMSSHKeysViewTest(BaseTestCase): +# +# def setUp(self): +# super(GenerateVMSSHKeysViewTest, self).setUp() +# +# # self.view = GenerateVMSSHKeysView +# # self.vm = mommy.make(VirtualMachinePlan) +# self.expected_template = 'hosting/virtual_machine_key.html' +# self.url = reverse('hosting:virtual_machine_key', kwargs={'pk': self.vm.id}) +# +# def test_url_resolve_to_view_correctly(self): +# found = resolve(self.url) +# self.assertEqual(found.func.__name__, self.view.__name__) +# +# def test_get(self): +# +# # Anonymous user should get redirect to login +# response = self.client.get(self.url) +# expected_url = "%s?next=%s" % (reverse('hosting:login'), +# reverse('hosting:virtual_machine_key', +# kwargs={'pk': self.vm.id})) +# self.assertRedirects(response, expected_url=expected_url, +# status_code=302, target_status_code=200) +# +# # Logged user should get the page +# response = self.customer_client.get(self.url, follow=True) +# self.assertEqual(response.status_code, 200) +# #updated_vm = VirtualMachinePlan.objects.get(id=self.vm.id) +# #self.assertEqual(response.context['public_key'].decode("utf-8"), updated_vm.public_key) +# self.assertTrue(response.context['private_key'] is not None) +# self.assertEqual(len(response.context['public_key']), 380) +# self.assertTrue(len(response.context['private_key']) is 1678 or 1674) +# self.assertTemplateUsed(response, self.expected_template) -class VirtualMachineViewTest(BaseTestCase): - - def setUp(self): - super(VirtualMachineViewTest, self).setUp() - - self.stripe_customer = mommy.make(StripeCustomer, user=self.customer) - self.vm = mommy.make(VirtualMachinePlan) - self.vm.assign_permissions(self.customer) - self.order = mommy.make(HostingOrder, customer=self.stripe_customer, vm_plan=self.vm) - self.url = reverse('hosting:virtual_machines', kwargs={'pk': self.vm.id}) - self.view = VirtualMachineView() - self.expected_template = 'hosting/virtual_machine_detail.html' - - def url_resolve_to_view_correctly(self): - found = resolve(self.url) - self.assertEqual(found.func.__name__, self.view.__name__) - - def test_get(self): - - # Anonymous user should get redirect to login - response = self.client.get(self.url) - expected_url = "%s?next=%s" % (reverse('hosting:login'), - reverse('hosting:virtual_machines', - kwargs={'pk': self.vm.id})) - self.assertRedirects(response, expected_url=expected_url, - status_code=302, target_status_code=200) - - # Customer should be able to get data - response = self.customer_client.get(self.url, follow=True) - self.assertEqual(response.status_code, 200) - self.assertEqual(response.context['virtual_machine'], self.vm) - self.assertTemplateUsed(response, self.expected_template) +# class VirtualMachineViewTest(BaseTestCase): +# +# def setUp(self): +# super(VirtualMachineViewTest, self).setUp() +# +# self.stripe_customer = mommy.make(StripeCustomer, user=self.customer) +# #self.vm = mommy.make(VirtualMachinePlan) +# self.vm.assign_permissions(self.customer) +# self.order = mommy.make(HostingOrder, customer=self.stripe_customer, vm_plan=self.vm) +# self.url = reverse('hosting:virtual_machines', kwargs={'pk': self.vm.id}) +# self.view = VirtualMachineView() +# self.expected_template = 'hosting/virtual_machine_detail.html' +# +# def url_resolve_to_view_correctly(self): +# found = resolve(self.url) +# self.assertEqual(found.func.__name__, self.view.__name__) +# +# def test_get(self): +# +# # Anonymous user should get redirect to login +# response = self.client.get(self.url) +# expected_url = "%s?next=%s" % (reverse('hosting:login'), +# reverse('hosting:virtual_machines', +# kwargs={'pk': self.vm.id})) +# self.assertRedirects(response, expected_url=expected_url, +# status_code=302, target_status_code=200) +# +# # Customer should be able to get data +# response = self.customer_client.get(self.url, follow=True) +# self.assertEqual(response.status_code, 200) +# self.assertEqual(response.context['virtual_machine'], self.vm) +# self.assertTemplateUsed(response, self.expected_template) class VirtualMachinesPlanListViewTest(BaseTestCase): @@ -361,8 +378,8 @@ class VirtualMachinesPlanListViewTest(BaseTestCase): self.stripe_customer = mommy.make(StripeCustomer, user=self.customer) mommy.make(HostingOrder, customer=self.stripe_customer, approved=True, _quantity=20) - _vms = VirtualMachinePlan.objects.all() - self.vms = sorted(_vms, key=lambda vm: vm.id, reverse=True) + # _vms = VirtualMachinePlan.objects.all() + # self.vms = sorted(_vms, key=lambda vm: vm.id, reverse=True) self.url = reverse('hosting:virtual_machines') self.view = VirtualMachinesPlanListView() self.expected_template = 'hosting/virtual_machines.html' @@ -383,7 +400,7 @@ class VirtualMachinesPlanListViewTest(BaseTestCase): # Customer should be able to get his orders response = self.customer_client.get(self.url, follow=True) self.assertEqual(response.status_code, 200) - self.assertEqual(list(response.context['vms']), self.vms[:10]) + # self.assertEqual(list(response.context['vms']), self.vms[:10]) self.assertTemplateUsed(response, self.expected_template) @@ -456,7 +473,7 @@ class LoginViewTest(TestCase): self.url = reverse('hosting:login') self.view = LoginView self.expected_template = 'hosting/login.html' - self.user = mommy.make('membership.CustomUser') + self.user = mommy.make('membership.CustomUser', validated=1) self.password = 'fake_password' self.user.set_password(self.password) self.user.save() @@ -505,7 +522,7 @@ class SignupViewTest(TestCase): def test_anonymous_user_can_signup(self): response = self.client.post(self.url, data=self.signup_data, follow=True) self.user = CustomUser.objects.get(email=self.signup_data.get('email')) - self.assertEqual(response.context['user'], self.user) + # self.assertEqual(response.context['user'], self.user) self.assertEqual(response.status_code, 200) @@ -540,10 +557,11 @@ class PasswordResetViewTest(BaseTestCase): self.assertEqual(response.status_code, 200) def test_test_generate_email_context(self): - context = self.setup_view(self.view()).\ - test_generate_email_context(self.user) + context = self.setup_view(self.view()).test_generate_email_context( + self.user + ) self.assertEqual(context.get('user'), self.user) - self.assertEqual(context.get('site_name'), 'ungleich') + self.assertEqual(context.get('site_name'), settings.DCL_TEXT) self.assertEqual(len(context.get('token')), 24) @@ -578,7 +596,9 @@ class PasswordResetConfirmViewTest(BaseTestCase): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, self.expected_template) - def test_post(self): - response = self.client.post(self.url, data=self.post_data, follow=True) - self.assertEqual(response.status_code, 200) - self.assertTrue(not response.context['form'].errors) + # def test_post(self): + # response = self.client.post( + # self.url, data=self.post_data, follow=True + # ) + # self.assertEqual(response.status_code, 200) + # self.assertTrue(not response.context['form'].errors) diff --git a/membership/tests.py b/membership/tests.py index 2f2b8c04..4b36fe4c 100644 --- a/membership/tests.py +++ b/membership/tests.py @@ -1,29 +1,41 @@ -import re +# import re -from django.test import TestCase -from django.core.urlresolvers import reverse -from django.core import mail +# from django.test import TestCase +# from django.core.urlresolvers import reverse +# from django.core import mail -class LoginTestCase(TestCase): - def test_login(self): - url = reverse('login_glarus') - res = self.client.post(url, data={'email': 'test@gmail.com', 'password': 'test', 'name': 'test'}) - self.assertContains(res, "You\'re successfully registered!", 1, 200) - self.assertEqual(len(mail.outbox), 1) - - validation_url = re.findall(r"http://.*?(/.*)", mail.outbox[0].body) - res1 = self.client.get(validation_url[0] + '/') - self.assertContains(res1, "Email verified!", 1, 200) - - res2 = self.client.post(url, data={'email': 'test@gmail.com', 'password': 'test'}) - self.assertEqual(res2.status_code, 302) - redirect_location = res2.get('Location') - - res3 = self.client.get(redirect_location) - self.assertContains(res3, 'Pick coworking date.', 1, 200) - - # check fail login - - res4 = self.client.post(url, data={'email': 'test@gmail.com', 'password': 'falsepassword'}) - self.assertContains(res4, 'Sorry, that login was invalid.', 1, 200) +# class LoginTestCase(TestCase): +# def test_login(self): +# url = reverse('login_glarus') +# res = self.client.post( +# url, +# data={ +# 'email': 'test@gmail.com', +# 'password': 'test', 'name': +# 'test'} +# ) +# self.assertContains(res, "You\'re successfully registered!", 1, 200) +# self.assertEqual(len(mail.outbox), 1) +# +# validation_url = re.findall(r"http://.*?(/.*)", mail.outbox[0].body) +# res1 = self.client.get(validation_url[0] + '/') +# self.assertContains(res1, "Email verified!", 1, 200) +# +# res2 = self.client.post( +# url, data={'email': 'test@gmail.com', 'password': 'test'} +# ) +# self.assertEqual(res2.status_code, 302) +# redirect_location = res2.get('Location') +# +# res3 = self.client.get(redirect_location) +# self.assertContains(res3, 'Pick coworking date.', 1, 200) +# +# # check fail login +# +# res4 = self.client.post( +# url, data={ +# 'email': 'test@gmail.com', 'password': 'falsepassword' +# } +# ) +# self.assertContains(res4, 'Sorry, that login was invalid.', 1, 200) diff --git a/opennebula_api/tests.py b/opennebula_api/tests.py index b2bf62e0..234e0c16 100644 --- a/opennebula_api/tests.py +++ b/opennebula_api/tests.py @@ -1,13 +1,21 @@ import random import string +from django.conf import settings from django.test import TestCase +from unittest import skipIf from .models import OpenNebulaManager from .serializers import VirtualMachineSerializer from utils.models import CustomUser +@skipIf( + settings.OPENNEBULA_DOMAIN is None or + settings.OPENNEBULA_DOMAIN == "test_domain", + """OpenNebula details unavailable, so skipping + OpenNebulaManagerTestCases""" +) class OpenNebulaManagerTestCases(TestCase): """This class defines the test suite for the opennebula manager model.""" @@ -120,13 +128,20 @@ class OpenNebulaManagerTestCases(TestCase): creating a new vm""" +@skipIf( + settings.OPENNEBULA_DOMAIN is None or + settings.OPENNEBULA_DOMAIN == "test_domain", + """OpenNebula details unavailable, so skipping + VirtualMachineSerializerTestCase""" +) class VirtualMachineSerializerTestCase(TestCase): def setUp(self): """Define the test client and other test variables.""" self.manager = OpenNebulaManager(email=None, password=None) def test_serializer_strips_of_public(self): - """ Test the serialized virtual machine object contains no 'public-'.""" + """ Test the serialized virtual machine object contains no + 'public-'.""" for vm in self.manager.get_vms(): serialized = VirtualMachineSerializer(vm) diff --git a/ungleich_page/cms_menus.py b/ungleich_page/cms_menus.py index b347243e..4e17c352 100644 --- a/ungleich_page/cms_menus.py +++ b/ungleich_page/cms_menus.py @@ -13,7 +13,8 @@ class GlasfaserMenu(CMSAttachMenu): def get_nodes(self, request): nodes = [] glasfaser_cms = 'ungleich_page/glasfaser_cms_page.html' - if request and request.current_page.get_template() == glasfaser_cms: + if (request and request.current_page and + request.current_page.get_template() == glasfaser_cms): template_context = { "request": request, } diff --git a/ungleich_page/cms_plugins.py b/ungleich_page/cms_plugins.py index a5b10d5f..c8dbe735 100644 --- a/ungleich_page/cms_plugins.py +++ b/ungleich_page/cms_plugins.py @@ -3,7 +3,9 @@ from cms.plugin_pool import plugin_pool from .models import ( UngelichContactUsSection, UngelichTextSection, Service, ServiceItem, - About, AboutItem, SectionWithImage + About, AboutItem, SectionWithImage, UngleichServiceItem, UngleichHeader, + UngleichHeaderItem, UngleichProductItem, UngleichProduct, UngleichCustomer, + UngleichCustomerItem, UngleichHTMLOnly, UngleichSimpleHeader ) @@ -145,3 +147,157 @@ class GlasfaserAboutItemPlugin(CMSPluginBase): ) context['instance'] = instance return context + + +@plugin_pool.register_plugin +class UngleichServicesPlugin(CMSPluginBase): + name = "ungleich Services Plugin" + model = Service + render_template = "ungleich_page/ungleich/section_services.html" + cache = False + allow_children = True + child_classes = ['UngleichServicesItemPlugin'] + + def render(self, context, instance, placeholder): + context['service_instance'] = instance + context['section_id'] = get_section_id(instance, 'services') + return context + + +@plugin_pool.register_plugin +class UngleichServicesItemPlugin(CMSPluginBase): + name = "ungleich Service Item Plugin" + model = UngleichServiceItem + render_template = "ungleich_page/ungleich/_services_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichServicesPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichServicesItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichHeaderWithTextAndImagePlugin(CMSPluginBase): + name = "ungleich Header with Text and Image Plugin" + model = UngleichSimpleHeader + render_template = "ungleich_page/ungleich/header.html" + cache = False + + def render(self, context, instance, placeholder): + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichHeaderWithTextAndImageSliderPlugin(CMSPluginBase): + name = "ungleich Header with Text and Image Slider Plugin" + model = UngleichHeader + render_template = "ungleich_page/ungleich/header_with_slider.html" + cache = False + allow_children = True + child_classes = ['UngleichHeaderItemPlugin'] + + def render(self, context, instance, placeholder): + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichHeaderItemPlugin(CMSPluginBase): + name = "ungleich Header Item Plugin" + model = UngleichHeaderItem + render_template = "ungleich_page/ungleich/_header_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichHeaderWithTextAndImageSliderPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichHeaderItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichProductsPlugin(CMSPluginBase): + name = "ungleich Products Plugin" + model = UngleichProduct + render_template = "ungleich_page/ungleich/section_products.html" + cache = False + allow_children = True + child_classes = ['UngleichProductsItemPlugin'] + + def render(self, context, instance, placeholder): + context['product_instance'] = instance + context['section_id'] = get_section_id(instance, 'products') + return context + + +@plugin_pool.register_plugin +class UngleichProductsItemPlugin(CMSPluginBase): + name = "ungleich Product Item Plugin" + model = UngleichProductItem + render_template = "ungleich_page/ungleich/_products_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichProductsPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichProductsItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichCustomerSectionPlugin(CMSPluginBase): + name = "ungleich Customer Section Plugin" + model = UngleichCustomer + render_template = "ungleich_page/ungleich/section_customers.html" + cache = False + allow_children = True + child_classes = ['UngleichCustomerItemPlugin'] + + def render(self, context, instance, placeholder): + context['customer_instance'] = instance + context['section_id'] = get_section_id(instance, 'customer') + return context + + +@plugin_pool.register_plugin +class UngleichCustomerItemPlugin(CMSPluginBase): + name = "ungleich Customer Item Plugin" + model = UngleichCustomerItem + render_template = "ungleich_page/ungleich/_customer_item.html" + cache = False + require_parent = True + parent_classes = ['UngleichCustomerSectionPlugin'] + + def render(self, context, instance, placeholder): + context = super(UngleichCustomerItemPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context + + +@plugin_pool.register_plugin +class UngleichHTMLPlugin(CMSPluginBase): + name = "ungleich HTML Plugin" + model = UngleichHTMLOnly + render_template = "ungleich_page/ungleich/html_block.html" + cache = False + + def render(self, context, instance, placeholder): + context = super(UngleichHTMLPlugin, self).render( + context, instance, placeholder + ) + context['instance'] = instance + return context diff --git a/ungleich_page/migrations/0007_auto_20171117_1011.py b/ungleich_page/migrations/0007_auto_20171117_1011.py new file mode 100644 index 00000000..71b4017a --- /dev/null +++ b/ungleich_page/migrations/0007_auto_20171117_1011.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-17 10:11 +from __future__ import unicode_literals + +from django.db import migrations +import djangocms_text_ckeditor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0006_aboutitem_link_url'), + ] + + operations = [ + migrations.AlterField( + model_name='ungelichpicture', + name='title', + field=djangocms_text_ckeditor.fields.HTMLField(), + ), + ] diff --git a/ungleich_page/migrations/0008_ungleichserviceitem.py b/ungleich_page/migrations/0008_ungleichserviceitem.py new file mode 100644 index 00000000..2037dcf6 --- /dev/null +++ b/ungleich_page/migrations/0008_ungleichserviceitem.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-17 18:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0004_auto_20160328_1434'), + ('ungleich_page', '0007_auto_20171117_1011'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichServiceItem', + fields=[ + ('serviceitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.ServiceItem')), + ('data_replaced_image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='service_item_data_replaced_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.serviceitem',), + ), + ] diff --git a/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py b/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py new file mode 100644 index 00000000..2faabe45 --- /dev/null +++ b/ungleich_page/migrations/0009_ungleichheader_ungleichheaderitem.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-19 11:28 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0004_auto_20160328_1434'), + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0008_ungleichserviceitem'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichHeader', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('carousel_data_interval', models.IntegerField(default=5000)), + ('background_image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_background_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + migrations.CreateModel( + name='UngleichHeaderItem', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('description', djangocms_text_ckeditor.fields.HTMLField()), + ('image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_item_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/migrations/0010_auto_20171119_1404.py b/ungleich_page/migrations/0010_auto_20171119_1404.py new file mode 100644 index 00000000..4057a90b --- /dev/null +++ b/ungleich_page/migrations/0010_auto_20171119_1404.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-19 14:04 +from __future__ import unicode_literals + +from django.db import migrations +import djangocms_text_ckeditor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0009_ungleichheader_ungleichheaderitem'), + ] + + operations = [ + migrations.AlterField( + model_name='service', + name='sub_title', + field=djangocms_text_ckeditor.fields.HTMLField(), + ), + ] diff --git a/ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py b/ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py new file mode 100644 index 00000000..c4984f5a --- /dev/null +++ b/ungleich_page/migrations/0011_ungleichproduct_ungleichproductitem.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-21 19:04 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0010_auto_20171119_1404'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichProduct', + fields=[ + ('service_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.Service')), + ('section_class', models.CharField(blank=True, default='', max_length=100)), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.service',), + ), + migrations.CreateModel( + name='UngleichProductItem', + fields=[ + ('serviceitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.ServiceItem')), + ('url', models.URLField(blank=True, default='', max_length=300)), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.serviceitem',), + ), + ] diff --git a/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py b/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py new file mode 100644 index 00000000..85b1c203 --- /dev/null +++ b/ungleich_page/migrations/0012_ungleichcustomer_ungleichcustomeritem.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-23 08:11 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0004_auto_20160328_1434'), + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0011_ungleichproduct_ungleichproductitem'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichCustomer', + fields=[ + ('service_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='ungleich_page.Service')), + ('section_class', models.CharField(blank=True, default='', max_length=100)), + ('carousel_data_interval', models.IntegerField(default=3000)), + ('bottom_text', djangocms_text_ckeditor.fields.HTMLField(default='

*ungleich means not equal to (≠) U+2260.

')), + ], + options={ + 'abstract': False, + }, + bases=('ungleich_page.service',), + ), + migrations.CreateModel( + name='UngleichCustomerItem', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('url', models.URLField(blank=True, default='', max_length=300)), + ('description', djangocms_text_ckeditor.fields.HTMLField()), + ('image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='customer_item_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/migrations/0013_ungleichhtmlonly.py b/ungleich_page/migrations/0013_ungleichhtmlonly.py new file mode 100644 index 00000000..c726a5a0 --- /dev/null +++ b/ungleich_page/migrations/0013_ungleichhtmlonly.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-23 11:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0012_ungleichcustomer_ungleichcustomeritem'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichHTMLOnly', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('HTML', djangocms_text_ckeditor.fields.HTMLField()), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/migrations/0014_ungleichhtmlonly_name.py b/ungleich_page/migrations/0014_ungleichhtmlonly_name.py new file mode 100644 index 00000000..4dda823b --- /dev/null +++ b/ungleich_page/migrations/0014_ungleichhtmlonly_name.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-24 07:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ungleich_page', '0013_ungleichhtmlonly'), + ] + + operations = [ + migrations.AddField( + model_name='ungleichhtmlonly', + name='name', + field=models.CharField(blank=True, default='', max_length=50), + ), + ] diff --git a/ungleich_page/migrations/0015_ungleichsimpleheader.py b/ungleich_page/migrations/0015_ungleichsimpleheader.py new file mode 100644 index 00000000..c43d0c79 --- /dev/null +++ b/ungleich_page/migrations/0015_ungleichsimpleheader.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2017-11-24 19:12 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import djangocms_text_ckeditor.fields +import filer.fields.image + + +class Migration(migrations.Migration): + + dependencies = [ + ('filer', '0004_auto_20160328_1434'), + ('cms', '0014_auto_20160404_1908'), + ('ungleich_page', '0014_ungleichhtmlonly_name'), + ] + + operations = [ + migrations.CreateModel( + name='UngleichSimpleHeader', + fields=[ + ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')), + ('text', djangocms_text_ckeditor.fields.HTMLField()), + ('background_image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_simple_header_background_image', to='filer.Image')), + ('image', filer.fields.image.FilerImageField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_simple_header_image', to='filer.Image')), + ], + options={ + 'abstract': False, + }, + bases=('cms.cmsplugin',), + ), + ] diff --git a/ungleich_page/models.py b/ungleich_page/models.py index 3759ee25..aec629ee 100644 --- a/ungleich_page/models.py +++ b/ungleich_page/models.py @@ -11,7 +11,7 @@ class UngelichPicture(CMSPlugin): related_name="image", on_delete=models.SET_NULL ) - title = models.CharField(max_length=400) + title = HTMLField() class SectionWithImage(UngelichPicture): @@ -54,7 +54,7 @@ class UngelichTextSection(CMSPlugin): class Service(CMSPlugin): menu_text = models.CharField(max_length=100, default="", blank=True) title = models.CharField(max_length=200) - sub_title = models.CharField(max_length=200) + sub_title = HTMLField() def __str__(self): return self.title @@ -87,3 +87,84 @@ class AboutItem(UngelichPicture): return "{alignment} - {title}".format( alignment=alignment, title=self.title ) + + +class UngleichServiceItem(ServiceItem): + data_replaced_image = FilerImageField( + null=True, + blank=True, + related_name="service_item_data_replaced_image", + on_delete=models.SET_NULL + ) + + +class UngleichSimpleHeader(CMSPlugin): + background_image = FilerImageField( + null=True, + blank=True, + related_name="ungleich_simple_header_background_image", + on_delete=models.SET_NULL + ) + image = FilerImageField( + null=True, + blank=True, + related_name="ungleich_simple_header_image", + on_delete=models.SET_NULL + ) + text = HTMLField() + + +class UngleichHeader(CMSPlugin): + background_image = FilerImageField( + null=True, + blank=True, + related_name="ungleich_header_background_image", + on_delete=models.SET_NULL + ) + carousel_data_interval = models.IntegerField(default=5000) + + +class UngleichHeaderItem(CMSPlugin): + image = FilerImageField( + null=True, + blank=True, + related_name="ungleich_header_item_image", + on_delete=models.SET_NULL + ) + description = HTMLField() + + +class UngleichProductItem(ServiceItem): + url = models.URLField(max_length=300, default="", blank=True) + + +class UngleichProduct(Service): + section_class = models.CharField(max_length=100, default="", blank=True) + + +class UngleichCustomer(Service): + section_class = models.CharField(max_length=100, default="", blank=True) + carousel_data_interval = models.IntegerField(default=3000) + bottom_text = HTMLField( + default='

*ungleich means ' + 'not equal to (≠) U+2260.

' + ) + + +class UngleichCustomerItem(CMSPlugin): + image = FilerImageField( + null=True, + blank=True, + related_name="customer_item_image", + on_delete=models.SET_NULL + ) + url = models.URLField(max_length=300, default="", blank=True) + description = HTMLField() + + +class UngleichHTMLOnly(CMSPlugin): + name = models.CharField(max_length=50, default="", blank=True) + HTML = HTMLField() + + def __str__(self): + return self.name diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index 40ddf2fd..b3296ca1 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -7,6 +7,17 @@ color: #494949; } +.header-vh { + height: 30px; +} +.intro-cap-sans-transform p { + font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; + font-size: 26px; + font-style: normal; + font-weight: 200; + color: #FFF; +} + .intro-cap { font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; font-size: 26px; @@ -111,3 +122,52 @@ paddding: 10px; } } + +.header_slider { + height: 100vh; +} + +.header_slider > .carousel { + display: flex; + flex-direction: column; + height: 100%; + align-items: stretch; +} + +.header_slider > .carousel .item { + padding-top: 150px; +} + + +.timeline>li .timeline-panel { + display: flex; + min-height: 80px; + align-items: center; + padding-bottom: 15px; +} + +.flex-justify-content-end{ + justify-content: flex-end; +} + +.flex-justify-content-start{ + justify-content: flex-start; +} + +.timeline>li.timeline-inverted>.timeline-panel { + padding-bottom: 0; +} + + +@media (min-width: 768px) and (max-width: 991px) { + .timeline>li .timeline-panel { + min-height: 100px; + } +} + +@media (min-width: 992px) { + .timeline>li .timeline-panel { + min-height: 170px; + } +} + diff --git a/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html b/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html index 0ccdff9a..6b619579 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html +++ b/ungleich_page/templates/ungleich_page/glasfaser/_about_item.html @@ -4,7 +4,7 @@ {% if instance.link_url %}{% endif %} -
+

{{ instance.title }}

diff --git a/ungleich_page/templates/ungleich_page/glasfaser/section_services.html b/ungleich_page/templates/ungleich_page/glasfaser/section_services.html index a4b50e5c..4f373653 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser/section_services.html +++ b/ungleich_page/templates/ungleich_page/glasfaser/section_services.html @@ -11,7 +11,6 @@ {% render_plugin plugin %}
{% endfor %} -
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html index a86f2f24..545a3bb7 100644 --- a/ungleich_page/templates/ungleich_page/includes/_header.html +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html new file mode 100644 index 00000000..794bcb06 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_customer_item.html @@ -0,0 +1,2 @@ + +

{{ instance.description }}

\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/_header_item.html b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html new file mode 100644 index 00000000..a770d1ed --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_header_item.html @@ -0,0 +1,14 @@ +
+
+ {% if instance.image %} + +
+ {% endif %} +
+ + {{ instance.description }} + +
+
+
diff --git a/ungleich_page/templates/ungleich_page/ungleich/_products_item.html b/ungleich_page/templates/ungleich_page/ungleich/_products_item.html new file mode 100644 index 00000000..0a09640d --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_products_item.html @@ -0,0 +1,6 @@ + +
+

{{ instance.title }}

+

 

+

{{ instance.description }}

+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/_services_item.html b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html new file mode 100644 index 00000000..87fda196 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/_services_item.html @@ -0,0 +1,8 @@ +
+ +
+

{{ instance.title }}

+

 

+

{{ instance.description }}

+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/header.html b/ungleich_page/templates/ungleich_page/ungleich/header.html new file mode 100644 index 00000000..77c7ffdf --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header.html @@ -0,0 +1,15 @@ +{% load cms_tags %} + +
+
+
+ +


+
+ + {{ instance.text }} + +
+
+
+
diff --git a/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html new file mode 100644 index 00000000..9cf759e6 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/header_with_slider.html @@ -0,0 +1,21 @@ +{% load cms_tags %} +
+ +
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/html_block.html b/ungleich_page/templates/ungleich_page/ungleich/html_block.html new file mode 100644 index 00000000..65c7b792 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/html_block.html @@ -0,0 +1,5 @@ +{% load cms_tags static %} +{{instance.HTML}} +{% for plugin in instance.child_plugin_instances %} + {% render_plugin plugin %} +{% endfor %} diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_customers.html b/ungleich_page/templates/ungleich_page/ungleich/section_customers.html new file mode 100644 index 00000000..afe67b2a --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_customers.html @@ -0,0 +1,35 @@ +{% load cms_tags custom_tags %} +
+
+
+

{{ customer_instance.title }}

+

{{ customer_instance.sub_title }}

+
+
+
+ +
+ +
    + {% for plugin in customer_instance.child_plugin_instances %} +
  1. + {% endfor %} +
+ + +
+ {% for plugin in customer_instance.child_plugin_instances %} +
+ {% render_plugin plugin %} +
+ {% endfor %} +
+
+ +
+
+
+
+ {{customer_instance.bottom_text}} +
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_products.html b/ungleich_page/templates/ungleich_page/ungleich/section_products.html new file mode 100644 index 00000000..a87d6493 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_products.html @@ -0,0 +1,20 @@ +{% load cms_tags custom_tags %} +
+
+
+
+
+

{{ product_instance.title }}

+ {{ product_instance.sub_title }} +
+
+
+ {% for plugin in product_instance.child_plugin_instances %} +
+ {% render_plugin plugin %} +
+ {% endfor %} +
+
+
+
\ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/ungleich/section_services.html b/ungleich_page/templates/ungleich_page/ungleich/section_services.html new file mode 100644 index 00000000..20be5ec8 --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich/section_services.html @@ -0,0 +1,16 @@ +{% load cms_tags %} +
+
+
+

{{ service_instance.title }}

+ {{ service_instance.sub_title }} +
+
+ {% for plugin in service_instance.child_plugin_instances %} +
+ {% render_plugin plugin %} +
+ {% endfor %} +
+
+
diff --git a/ungleich_page/templates/ungleich_page/ungleich_cms_page.html b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html new file mode 100644 index 00000000..707d0dab --- /dev/null +++ b/ungleich_page/templates/ungleich_page/ungleich_cms_page.html @@ -0,0 +1,75 @@ +{% load static i18n cms_tags sekizai_tags %} + + + + + + + + + + + + {% page_attribute "page_title" %} + + + + + + + + + + + + + + {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} + {% render_block "js" postprocessor "compressor.contrib.sekizai.compress" %} + + {% include "google_analytics.html" %} + + + + + + +{% cms_toolbar %} + {% placeholder 'Ungleich Page Contents' %} + + + {% include "ungleich_page/includes/_footer.html" %} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/test_forms.py b/utils/test_forms.py index 46285fc5..5bca7f32 100644 --- a/utils/test_forms.py +++ b/utils/test_forms.py @@ -75,6 +75,7 @@ class BillingAddressFormTest(TestCase): def setUp(self): self.completed_data = { + 'cardholder_name': 'test', 'street_address': 'street name', 'city': 'MyCity', 'postal_code': '32123123123123', diff --git a/utils/tests.py b/utils/tests.py index d5c2d726..ce54800a 100644 --- a/utils/tests.py +++ b/utils/tests.py @@ -28,8 +28,8 @@ class BaseTestCase(TestCase): # Users self.customer, self.another_customer = mommy.make( - 'membership.CustomUser', - _quantity=2) + 'membership.CustomUser', validated=1, _quantity=2 + ) self.customer.set_password(self.dummy_password) self.customer.save() self.another_customer.set_password(self.dummy_password) @@ -97,6 +97,9 @@ class BaseTestCase(TestCase): return view +@skipIf(settings.STRIPE_API_PRIVATE_KEY_TEST is None or + settings.STRIPE_API_PRIVATE_KEY_TEST is "", + """Skip because STRIPE_API_PRIVATE_KEY_TEST is not set""") class TestStripeCustomerDescription(TestCase): """ A class to test setting the description field of the stripe customer @@ -139,6 +142,10 @@ class TestStripeCustomerDescription(TestCase): self.assertEqual(customer_data.description, self.customer_name) +@skipIf(settings.STRIPE_API_PRIVATE_KEY_TEST == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", + """Skipping test_save_ssh_key_add because either host + or public key were not specified or were empty""") class StripePlanTestCase(TestStripeCustomerDescription): """ A class to test Stripe plans @@ -161,6 +168,10 @@ class StripePlanTestCase(TestStripeCustomerDescription): self.assertIsNone(stripe_plan.get('error')) self.assertIsInstance(stripe_plan.get('response_object'), StripePlan) + @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or + settings.TEST_MANAGE_SSH_KEY_HOST == "", + """Skipping test_save_ssh_key_add because either host + or public key were not specified or were empty""") @patch('utils.stripe_utils.logger') def test_create_duplicate_plans_error_handling(self, mock_logger): """ @@ -254,10 +265,10 @@ class SaveSSHKeyTestCase(TestCase): self.public_key = settings.TEST_MANAGE_SSH_KEY_PUBKEY self.hosts = settings.TEST_MANAGE_SSH_KEY_HOST - @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY is None or - settings.TEST_MANAGE_SSH_KEY_PUBKEY == "" or - settings.TEST_MANAGE_SSH_KEY_HOST is None or - settings.TEST_MANAGE_SSH_KEY_HOST is "", + @skipIf(settings.TEST_MANAGE_SSH_KEY_PUBKEY is "" or + settings.TEST_MANAGE_SSH_KEY_PUBKEY is None or + settings.TEST_MANAGE_SSH_KEY_HOST is "" or + settings.TEST_MANAGE_SSH_KEY_HOST is None, """Skipping test_save_ssh_key_add because either host or public key were not specified or were empty""") def test_save_ssh_key_add(self):