Permalink
Browse files

Merge pull request #10 from tuxcanfly/master

Refactored the layout for tests
  • Loading branch information...
2 parents 45fb92c + 605b2cc commit 47f946fc3da35a065344bbb8f1bc3e05fca235c0 @shabda shabda committed Apr 3, 2013
View
@@ -5,4 +5,4 @@ python:
# command to install dependencies
install: "pip install -r requirements.txt --use-mirrors"
# command to run tests
-script: python manage.py test parsley
+script: ./runtests.py
No changes.
View
@@ -1,152 +0,0 @@
-# Django settings for django_parsley project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
- # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': 'data.db', # Or path to database file if using sqlite3.
- 'USER': '', # Not used with sqlite3.
- 'PASSWORD': '', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
- }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
- # Put strings here, like "/home/html/static" or "C:/www/django/static".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
- 'django.contrib.staticfiles.finders.FileSystemFinder',
- 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '_%v#sn1vri9@4!wp0$e9kvf^u^hg!f2tkj4pjkylpyrziw@m9('
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- # Uncomment the next line for simple clickjacking protection:
- # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'django_parsley.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'django_parsley.wsgi.application'
-
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'parsley'
- # Uncomment the next line to enable the admin:
- # 'django.contrib.admin',
- # Uncomment the next line to enable admin documentation:
- # 'django.contrib.admindocs',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'filters': {
- 'require_debug_false': {
- '()': 'django.utils.log.RequireDebugFalse'
- }
- },
- 'handlers': {
- 'mail_admins': {
- 'level': 'ERROR',
- 'filters': ['require_debug_false'],
- 'class': 'django.utils.log.AdminEmailHandler'
- }
- },
- 'loggers': {
- 'django.request': {
- 'handlers': ['mail_admins'],
- 'level': 'ERROR',
- 'propagate': True,
- },
- }
-}
View
@@ -1,17 +0,0 @@
-from django.conf.urls import patterns, include, url
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'django_parsley.views.home', name='home'),
- # url(r'^django_parsley/', include('django_parsley.foo.urls')),
-
- # Uncomment the admin/doc line below to enable admin documentation:
- # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
- # Uncomment the next line to enable the admin:
- # url(r'^admin/', include(admin.site.urls)),
-)
View
@@ -1,28 +0,0 @@
-"""
-WSGI config for django_parsley project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_parsley.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)
View
@@ -1,5 +0,0 @@
-#Django requires every app to have models.
-from django.db import models
-
-class Student(models.Model):
- name = models.CharField(max_length=100)
@@ -0,0 +1 @@
+from .tests import *
@@ -1,5 +1,5 @@
from django import forms
-from .decorators import parsleyfy
+from parsley.decorators import parsleyfy
from .models import Student
@@ -74,4 +74,4 @@ class FormWithCustomChoices(forms.Form):
def __init__(self, *args, **kwargs):
super(FormWithCustomChoices, self).__init__(*args, **kwargs)
self.fields['state'] = forms.ChoiceField(
- choices=get_state_choices())
+ choices=get_state_choices())
View
@@ -0,0 +1,5 @@
+#Django requires every app to have models.
+from django.db import models
+
+class Student(models.Model):
+ name = models.CharField(max_length=100)
@@ -1,10 +1,12 @@
from django.test import TestCase
from django import forms
-from .forms import TextForm, TextForm2, FieldTypeForm, FormWithWidgets, \
- StudentModelForm, FormWithCleanField, FormWithCustomInit, \
- FormWithCustomChoices
-from .decorators import parsleyfy
+from parsley.decorators import parsleyfy
+
+from .forms import (TextForm, TextForm2, FieldTypeForm, FormWithWidgets,
+ StudentModelForm, FormWithCleanField, FormWithCustomInit,
+ FormWithCustomChoices)
+
class CharFieldTest(TestCase):
def test_basic(self):
@@ -20,13 +22,15 @@ def test_basic(self):
self.assertEqual(form.fields["name"].widget.attrs, {"data-required": "true"})
self.assertEqual(form.fields["university"].widget.attrs, {})
+
class CharFieldDecoratedTest(TestCase):
def test_decorated(self):
"Tests that parsleyfy works as a class Decorator"
form = TextForm2()
self.assertEqual(form.fields["name"].widget.attrs, {"data-required": "true"})
self.assertEqual(form.fields["university"].widget.attrs, {})
+
class FieldTypeFormTest(TestCase):
def test_fields(self):
"Tests that parsleyfy adds data-required for things other than CharField"
@@ -37,6 +41,7 @@ def test_fields(self):
self.assertEqual(fields["email"].widget.attrs["data-required"], "true")
self.assertFalse("data-required" in fields["email2"].widget.attrs)
+
class DataTypeTest(TestCase):
def test_data_types(self):
"Test that different field types get correct data-type"
@@ -51,6 +56,7 @@ def test_data_types(self):
self.assertEqual(fields["income2"].widget.attrs["data-type"], "number")
self.assertEqual(fields["topnav"].widget.attrs["data-regexp"], "#[A-Fa-f0-9]{6}")
+
class LengthTest(TestCase):
def test_length(self):
form = FieldTypeForm()
@@ -71,13 +77,15 @@ def test_value(self):
self.assertEqual(num_attrs["data-min"], 10)
self.assertEqual(num_attrs["data-max"], 100)
+
class FormWithWidgetsTest(TestCase):
def test_widgets(self):
"Assert that @parsleyfy doesn't cloober existing attrs"
form = FormWithWidgets()
self.assertTrue(form.fields["description"].widget, forms.TextInput)
self.assertEqual("highlight", form.fields["blurb"].widget.attrs["class"])
+
class TestMetadata(TestCase):
def test_docstring(self):
form1 = TextForm()
@@ -104,7 +112,8 @@ def test_model_form(self):
def test_model_form_save(self):
form = StudentModelForm({"name": "Luke Skywalker"})
- form.save()
+ form.save(commit=False)
+
class TestCustomInit(TestCase):
def test_custom_init(self):
@@ -117,6 +126,7 @@ def test_custom_choices(self):
self.assertEqual(form.fields['state'].choices,
[("NY", "NY"), ("OH", "OH")])
+
class TestCleanFields(TestCase):
def test_clean(self):
form = FormWithCleanField(data={"description": "foo"})
@@ -129,15 +139,3 @@ def test_clean_parslyfied(self):
self.assertEqual(form.is_bound, True)
self.assertEqual(form.is_valid(), False)
self.assertTrue(hasattr(form, "clean_description"))
-
-
-
-
-
-
-
-
-
-
-
-
File renamed without changes.
View
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+import sys
+import os
+from os.path import dirname, abspath
+from optparse import OptionParser
+
+from django.conf import settings
+
+# For convenience configure settings if they are not pre-configured or if we
+# haven't been provided settings to use by environment variable.
+if not settings.configured and not os.environ.get('DJANGO_SETTINGS_MODULE'):
+ settings.configure(
+ DATABASES={
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ }
+ },
+ INSTALLED_APPS=[
+ 'parsley',
+ ],
+ )
+
+from django.test.simple import DjangoTestSuiteRunner
+
+
+def runtests(*test_args, **kwargs):
+ if not test_args:
+ test_args = ['parsley']
+ parent = dirname(abspath(__file__))
+ sys.path.insert(0, parent)
+ test_runner = DjangoTestSuiteRunner(
+ verbosity=kwargs.get('verbosity', 1),
+ interactive=kwargs.get('interactive', False),
+ failfast=kwargs.get('failfast'))
+ failures = test_runner.run_tests(test_args)
+ sys.exit(failures)
+
+if __name__ == '__main__':
+ parser = OptionParser()
+ parser.add_option('--failfast', action='store_true', default=False, dest='failfast')
+ (options, args) = parser.parse_args()
+ runtests(failfast=options.failfast, *args)

0 comments on commit 47f946f

Please sign in to comment.