Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop

rowers/tests/statements.py

@@ -53,7 +53,7 @@ from mock import Mock, patch
 import pandas as pd
 import rowers.c2stuff as c2stuff
 
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 
 import json
 import numpy as np

rowers/tests/test_errorpages.py

@@ -6,13 +6,12 @@ from __future__ import unicode_literals
 #from __future__ import print_function
 from .statements import *
 
-        
+from django.test import SimpleTestCase, override_settings
+
 #@pytest.mark.django_db        
 class TestErrorPages(TestCase):
     def test_error_handlers(self):
 
-        self.assertTrue(urls.handler404.endswith('.error404_view'))
-        self.assertTrue(urls.handler500.endswith('.error500_view'))
         factory = RequestFactory()
         request = factory.get('/')
         response = error404_view(request)
@@ -26,3 +25,22 @@ class TestErrorPages(TestCase):
         response = error400_view(request)
         self.assertEqual(response.status_code, 400)
 
+
+# ROOT_URLCONF must specify the module that contains handler403 = ...
+#@override_settings(ROOT_URLCONF=__name__)
+class CustomErrorHandlerTests(TestCase):
+    def setUp(self):
+        self.c = Client()
+    
+    def test_handler_workout_notfound(self):
+        response = self.c.get('/rowers/workout/121/')
+        # Make assertions on the response here. For example:
+        self.assertEqual(response.status_code, 404)
+        self.assertIn('We could not find' ,str(response.content))
+
+#    def test_handler_500(self):
+#        response = self.c.get('/500/')
+#        # Make assertions on the response here. For example:
+#        self.assertEqual(response.status_code, 500)
+#        self.assertIn('The site developer' ,str(response.content))
+

rowers/tests/test_uploads.py

@@ -59,8 +59,6 @@ class ViewTest(TestCase):
         form = DocumentsForm(form_data,file_data)
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
 
-        f.close()
-
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
 
@@ -69,6 +67,7 @@ class ViewTest(TestCase):
         response = self.c.get('/rowers/workout/'+encoded1+'/', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
 
+
         response = self.c.get('/rowers/workout/'+encoded1+'/edit/', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
         
@@ -77,6 +76,7 @@ class ViewTest(TestCase):
         self.assertEqual(response.status_code, 200)
 
 
+        f.close()
 
 
         response = self.c.get('/rowers/workout/'+encoded1+'/workflow/',
@@ -157,8 +157,7 @@ class ViewTest(TestCase):
 
         response = self.c.post('/rowers/workout/upload/', form_data, follow=True)
 
-        f.close()
-
+ 
         self.assertRedirects(response, expected_url='/rowers/workout/'+encoded1+'/edit/',
                              status_code=302,target_status_code=200)
 
@@ -167,7 +166,8 @@ class ViewTest(TestCase):
         response = self.c.get('/rowers/workout/'+encoded1+'/', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
         
-        
+        f.close()
+       
         w = Workout.objects.get(id=1)
         f_to_be_deleted = w.csvfilename
         try: