-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from codersquid/json_endpoint
Adds a schedule_json view
- Loading branch information
Showing
7 changed files
with
248 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
Django==1.4.15 | ||
Pillow==2.5.3 | ||
django-discover-runner==1.0 | ||
django-markitup==2.2.2 | ||
django-model-utils==1.5.0 | ||
django-nose==1.2 | ||
django-reversion==1.8.0 | ||
django-timezones==0.2 | ||
factory-boy==2.4.1 | ||
nose==1.3.4 | ||
pytz==2014.7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
import datetime | ||
import random | ||
|
||
import factory | ||
from factory import fuzzy | ||
|
||
from symposion.schedule.models import Schedule, Day, Slot, SlotKind | ||
from symposion.conference.models import Section, Conference | ||
|
||
|
||
class ConferenceFactory(factory.DjangoModelFactory): | ||
title = fuzzy.FuzzyText() | ||
start_date = fuzzy.FuzzyDate(datetime.date(2014, 1, 1)) | ||
end_date = fuzzy.FuzzyDate(datetime.date(2014, 1, 1) | ||
+ datetime.timedelta(days=random.randint(1, 10))) | ||
# timezone = TimeZoneField("UTC") | ||
|
||
class Meta: | ||
model = Conference | ||
|
||
|
||
class SectionFactory(factory.DjangoModelFactory): | ||
conference = factory.SubFactory(ConferenceFactory) | ||
name = fuzzy.FuzzyText() | ||
slug = fuzzy.FuzzyText() | ||
|
||
class Meta: | ||
model = Section | ||
|
||
|
||
class ScheduleFactory(factory.DjangoModelFactory): | ||
section = factory.SubFactory(SectionFactory) | ||
published = True | ||
hidden = False | ||
|
||
class Meta: | ||
model = Schedule | ||
|
||
|
||
class SlotKindFactory(factory.DjangoModelFactory): | ||
schedule = factory.SubFactory(ScheduleFactory) | ||
label = fuzzy.FuzzyText() | ||
|
||
class Meta: | ||
model = SlotKind | ||
|
||
|
||
class DayFactory(factory.DjangoModelFactory): | ||
schedule = factory.SubFactory(ScheduleFactory) | ||
date = fuzzy.FuzzyDate(datetime.date(2014, 1, 1)) | ||
|
||
class Meta: | ||
model = Day | ||
|
||
|
||
class SlotFactory(factory.DjangoModelFactory): | ||
day = factory.SubFactory(DayFactory) | ||
kind = factory.SubFactory(SlotKindFactory) | ||
start = datetime.time(random.randint(0, 23), random.randint(0, 59)) | ||
end = datetime.time(random.randint(0, 23), random.randint(0, 59)) | ||
|
||
class Meta: | ||
model = Slot |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
#!/usr/bin/env python | ||
# -*- coding: utf-8 -*- | ||
# | ||
# see runtests.py in https://github.com/pydanny/cookiecutter-djangopackage | ||
|
||
import sys | ||
|
||
try: | ||
from django.conf import settings | ||
|
||
settings.configure( | ||
DEBUG=True, | ||
USE_TZ=True, | ||
DATABASES={ | ||
"default": { | ||
"ENGINE": "django.db.backends.sqlite3", | ||
} | ||
}, | ||
ROOT_URLCONF="symposion.schedule.urls", | ||
INSTALLED_APPS=[ | ||
"django.contrib.auth", | ||
"django.contrib.contenttypes", | ||
"django.contrib.sites", | ||
|
||
"markitup", | ||
"reversion", | ||
|
||
"symposion", | ||
"symposion.conference", | ||
"symposion.speakers", | ||
"symposion.schedule", | ||
"symposion.proposals", | ||
|
||
], | ||
SITE_ID=1, | ||
NOSE_ARGS=['-s'], | ||
|
||
MARKITUP_FILTER=('django.contrib.markup.templatetags.markup.textile', {}), | ||
) | ||
|
||
try: | ||
import django | ||
setup = django.setup | ||
except AttributeError: | ||
pass | ||
else: | ||
setup() | ||
|
||
from django_nose import NoseTestSuiteRunner | ||
except ImportError: | ||
raise ImportError("To fix this error, run: pip install -r requirements-test.txt") | ||
|
||
|
||
def run_tests(*test_args): | ||
if not test_args: | ||
test_args = ['tests'] | ||
|
||
# Run tests | ||
test_runner = NoseTestSuiteRunner(verbosity=1) | ||
|
||
failures = test_runner.run_tests(test_args) | ||
|
||
if failures: | ||
sys.exit(failures) | ||
|
||
|
||
if __name__ == '__main__': | ||
run_tests("symposion.schedule.tests.test_views") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import json | ||
|
||
from django.test.client import Client | ||
from django.test import TestCase | ||
|
||
from . import factories | ||
|
||
|
||
class ScheduleViewTests(TestCase): | ||
|
||
def test_empty_json(self): | ||
c = Client() | ||
r = c.get('/conference.json') | ||
assert r.status_code == 200 | ||
|
||
conference = json.loads(r.content) | ||
assert 'schedule' in conference | ||
assert len(conference['schedule']) == 0 | ||
|
||
def test_populated_empty_presentations(self): | ||
|
||
factories.SlotFactory.create_batch(size=5) | ||
|
||
c = Client() | ||
r = c.get('/conference.json') | ||
assert r.status_code == 200 | ||
|
||
conference = json.loads(r.content) | ||
assert 'schedule' in conference | ||
assert len(conference['schedule']) == 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters