Merge branch 'master' into markdown

# Conflicts:
#	RIGS/templates/RIGS/event_detail.html
#	RIGS/test_unit.py
#	requirements.txt
This commit is contained in:
2020-02-09 21:07:12 +00:00
124 changed files with 4009 additions and 924 deletions

View File

@@ -419,7 +419,7 @@ class TestSampleDataGenerator(TestCase):
@override_settings(DEBUG=True)
def test_generate_sample_data(self):
# Run the management command and check there are no exceptions
call_command('generateSampleData')
call_command('generateSampleRIGSData')
# Check there are lots of events
self.assertTrue(models.Event.objects.all().count() > 100)
@@ -427,7 +427,7 @@ class TestSampleDataGenerator(TestCase):
def test_production_exception(self):
from django.core.management.base import CommandError
self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleData')
self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleRIGSData')
class TestMarkdownTemplateTags(TestCase):