Merge pull request #40 from Elthan/master

Adds missing dist folder and fixes tests which were broken
devilry · Jul 24, 2018 · d0495ab · d0495ab
2 parents a3ef131 + 774a1fb
commit d0495ab
Show file tree

Hide file tree

Showing 27 changed files with 12,599 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -21,9 +21,8 @@
         'PyYAML>=3.12',
         'django-extensions',
         'dj-database-url>=0.5.0',
-        # 'django_cradmin==5.2.2',
         'cradmin_legacy>=1.3.0a0',
-        'bleach>=2.1.3',
+        # 'bleach>=2.1.3',
         'gunicorn',
     ],
     classifiers=[

diff --git a/trix/trix_core/tests/test_multiassignment_serialize.py b/trix/trix_core/tests/test_multiassignment_serialize.py
@@ -60,6 +60,7 @@ def test_serialize_assignments_single(self):
             ('id: {}\n'
              'title: A title\n'
              'tags: []\n'
+             'hidden: false\n'
              'text: |-\n'
              '  A text\n').format(assignment.id)
         )
@@ -76,6 +77,7 @@ def test_serialize_assignments_single_with_tags(self):
             ('id: {}\n'
              'title: A title\n'
              'tags: [testtag, testtag2]\n'
+             'hidden: false\n'
              'text: |-\n'
              '  A text\n').format(assignment.id)
         )
@@ -91,6 +93,7 @@ def test_serialize_assignments_single_with_solution(self):
             ('id: {}\n'
              'title: A title\n'
              'tags: []\n'
+             'hidden: false\n'
              'text: |-\n'
              '  A text\n'
              'solution: |-\n'
@@ -111,12 +114,14 @@ def test_serialize_assignments_multi(self):
             ('id: {}\n'
              'title: A1\n'
              'tags: []\n'
+             'hidden: false\n'
              'text: |-\n'
              '  text1\n'
              '---\n'
              'id: {}\n'
              'title: A2\n'
              'tags: []\n'
+             'hidden: false\n'
              'text: |-\n'
              '  text2\n'
              ).format(assignment1.id, assignment2.id)

diff --git a/trix/trix_core/tests/test_trix_core_tags.py b/trix/trix_core/tests/test_trix_core_tags.py
@@ -7,4 +7,4 @@ class TestTrixMarkdown(TestCase):
     def test_simple(self):
         self.assertEquals(
             trix_core_tags.trix_assignment_markdown('# Hello world\n'),
-            '&lt;h1&gt;Hello world&lt;/h1&gt;')
+            '<h1>Hello world</h1>')
diff --git a/trix/trix_core/tests/test_trix_markdown.py b/trix/trix_core/tests/test_trix_markdown.py
@@ -7,9 +7,9 @@ class TestTrixMarkdown(TestCase):
     def test_simple(self):
         self.assertEquals(
             trix_markdown.assignment_markdown('# Hello world\n'),
-            '&lt;h1&gt;Hello world&lt;/h1&gt;')
+            '<h1>Hello world</h1>')
 
     def test_nl2br(self):
         self.assertEquals(
             trix_markdown.assignment_markdown('Hello\nworld'),
-            '&lt;p&gt;Hello&lt;br&gt;\nworld&lt;/p&gt;')
+            '<p>Hello<br>\nworld</p>')