From e8e20dd6d3996d349a1f3d8dd180cc353fe714ea Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Wed, 27 Apr 2016 10:33:44 +1000 Subject: [PATCH] Coverage, Migrations. --- .gitignore | 2 +- .../registrasion/migrations/0001_initial.py | 11 +++++++-- .../migrations/0002_demopayment.py | 24 ------------------- pinaxcon/settings.py | 12 ++++++++++ 4 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 pinaxcon/registrasion/migrations/0002_demopayment.py diff --git a/.gitignore b/.gitignore index 7da754e7..6a78689e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ node_modules/ _build/ .DS_Store dev.db - +.coverage diff --git a/pinaxcon/registrasion/migrations/0001_initial.py b/pinaxcon/registrasion/migrations/0001_initial.py index 4e83eced..245a4dd8 100644 --- a/pinaxcon/registrasion/migrations/0001_initial.py +++ b/pinaxcon/registrasion/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-01 10:05 +# Generated by Django 1.9.2 on 2016-04-27 00:27 from __future__ import unicode_literals from django.db import migrations, models @@ -11,7 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('registrasion', '0011_auto_20160401_0943'), + ('registrasion', '0001_initial'), ] operations = [ @@ -31,4 +31,11 @@ class Migration(migrations.Migration): ], bases=('registrasion.attendeeprofilebase',), ), + migrations.CreateModel( + name='DemoPayment', + fields=[ + ('paymentbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registrasion.PaymentBase')), + ], + bases=('registrasion.paymentbase',), + ), ] diff --git a/pinaxcon/registrasion/migrations/0002_demopayment.py b/pinaxcon/registrasion/migrations/0002_demopayment.py deleted file mode 100644 index ccff847c..00000000 --- a/pinaxcon/registrasion/migrations/0002_demopayment.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-07 07:41 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('registrasion', '0013_auto_20160406_2228_squashed_0015_auto_20160406_1942'), - ('pinaxcon_registrasion', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='DemoPayment', - fields=[ - ('paymentbase_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registrasion.PaymentBase')), - ], - bases=('registrasion.paymentbase',), - ), - ] diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index c157ca36..60e96561 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -163,6 +163,9 @@ INSTALLED_APPS = [ "pinaxcon", "pinaxcon.proposals", "pinaxcon.registrasion", + + #testing + "django_nose", ] # A sample logging configuration. The only tangible logging @@ -221,3 +224,12 @@ PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet" PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet" ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm" + +# Use nose to run all tests +TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' + +# Tell nose to measure coverage on the 'foo' and 'bar' apps +NOSE_ARGS = [ + '--with-coverage', + '--cover-package=registrasion.controllers,registrasion.models', +]