non succeeeded in ajax test

rowers/tests/donottest_ajax.py

@@ -0,0 +1,82 @@
+#from __future__ import print_function
+import pytest
+
+pytestmark = pytest.mark.django_db
+
+from bs4 import BeautifulSoup
+import re
+from nose_parameterized import parameterized
+from django.test import TestCase, Client,override_settings
+from django.core.management import call_command
+from django.utils.six import StringIO
+from django.test.client import RequestFactory
+from rowers.views import checkworkoutuser,c2_open
+from rowers.models import Workout, User, Rower, WorkoutForm,RowerForm,GraphImage
+from rowers.forms import DocumentsForm,CNsummaryForm,RegistrationFormUniqueEmail
+import rowers.plots as plots
+import rowers.interactiveplots as iplots
+import datetime
+from rowingdata import rowingdata as rdata
+from rowingdata import rower as rrower
+from django.utils import timezone
+from rowers.rows import handle_uploaded_file
+from django.core.files.uploadedfile import SimpleUploadedFile
+from time import strftime,strptime,mktime,time,daylight
+import os
+from rowers.tasks import handle_makeplot
+from rowers.utils import serialize_list,deserialize_list
+from rowers.utils import NoTokenError
+from shutil import copyfile
+from nose.tools import assert_true
+from mock import Mock, patch
+from minimocktest import MockTestCase
+import pandas as pd
+import rowers.c2stuff as c2stuff
+
+import json
+import numpy as np
+
+from rowers import urls
+from rowers.views import error500_view,error404_view,error400_view,error403_view
+
+from rowers.dataprep import delete_strokedata
+
+from redis import StrictRedis
+redis_connection = StrictRedis()
+
+class AjaxTests(TestCase):
+    def setUp(self):
+        redis_connection.publish('tasks','KILL')
+	u = User.objects.create_user('john',
+				     'sander@ds.ds',
+				     'koeinsloot')
+	r = Rower.objects.create(user=u,gdproptin=True,
+                                 gdproptindate=timezone.now()
+        )
+	self.nu = datetime.datetime.now()
+
+	self.filename = 'rowers/tests/testdata/testdata.csv'
+	self.wotw = Workout.objects.create(name='testworkout',
+					workouttype='water',
+					user=r,date=self.nu.strftime('%Y-%m-%d'),
+					starttime=self.nu.strftime('%H:%M:%S'),
+					duration="0:55:00",distance=8000,
+					csvfilename=self.filename)
+	
+	self.wote = Workout.objects.create(name='testworkout',
+					workouttype='Indoor Rower',
+					user=r,date=self.nu.strftime('%Y-%m-%d'),
+					starttime=self.nu.strftime('%H:%M:%S'),
+					duration="0:55:00",distance=8000,
+					csvfilename=self.filename)
+
+
+        self.c = Client()
+        
+    def test_toggle_ranking(self):
+        response = self.c.get(
+            '/rowers/workout/1/toggle-ranking/',
+            **{'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest'})
+
+        jsondata = json.loads(response.json())
+        self.assertIn('result',jsondata)

rowers/tests/test_admin.py,cover

@@ -1,47 +0,0 @@
-  #from __future__ import print_function
-> import pytest
-  
-> pytestmark = pytest.mark.django_db
-  
-> from bs4 import BeautifulSoup
-> import re
-> from nose_parameterized import parameterized
-> from django.test import TestCase, Client,override_settings
-> from django.core.management import call_command
-> from django.utils.six import StringIO
-> from django.test.client import RequestFactory
-> import datetime
-  
-> import json
-> import numpy as np
-  
-  
-> from redis import StrictRedis
-> redis_connection = StrictRedis()
-  
-> from rowers.models import User,Rower
-  
-> @pytest.mark.django_db        
-> class AdminTests(TestCase):
->     def setUp(self):
-> 	u = User.objects.create_user('john',
-> 				     'sander@ds.ds',
-> 				     'koeinsloot')
-> 	r = Rower.objects.create(user=u)
->         my_admin = User.objects.create_superuser('myuser',
->                                                  'myemail@test.com',
->                                                  'apensstaart')
-          
->         self.c = Client()
->         self.c.login(username='myuser',password='apensstaart')
-          
->     def test_admin(self):
->         response = self.c.get('/admin',follow=True)
->         self.assertEqual(response.status_code,200)
-          
-          
->         response = self.c.get('/admin/auth/user/',follow=True)
->         self.assertEqual(response.status_code,200)
-  
->         response = self.c.get('/admin/auth/user/77/change/',follow=True)
->         self.assertEqual(response.status_code,200)

rowers/tests/test_imports.py

@@ -152,7 +152,8 @@ class C2Objects(DjangoTestCase):
         self.assertEqual(response.status_code, 200)
 
         
-    def test_strokedata(self):
+    @patch('rowers.dataprep.create_engine')
+    def test_strokedata(self, mocked_sqlalchemy):
 	with open('rowers/tests/testdata/c2stroketestdata.txt','r') as infile:
 	    res = json.load(infile)
 
@@ -167,7 +168,8 @@ class C2Objects(DjangoTestCase):
 
 	res = add_workout_from_strokedata(self.u,1,data,strokedata,source='c2')
 
-    def test_strokedatanohr(self):
+    @patch('rowers.dataprep.create_engine')
+    def test_strokedatanohr(self, mocked_sqlalchemy):
 	with open('rowers/tests/testdata/c2strokedatanohr.txt','r') as infile:
 	    res = json.load(infile)
 
@@ -399,7 +401,8 @@ class STObjects(DjangoTestCase):
 
         self.assertEqual(response.status_code, 200)
 
-    def test_strokedata(self):
+    @patch('rowers.dataprep.create_engine')
+    def test_strokedata(self, mocked_sqlalchemy):
 	with open('rowers/tests/testdata/sporttrackstestdata.txt','r') as infile:
 	    data = json.load(infile)
 
@@ -407,7 +410,8 @@ class STObjects(DjangoTestCase):
 
 	res = add_workout_from_data(self.u,1,data,data)
 
-    def test_strokedatanohr(self):
+    @patch('rowers.dataprep.create_engine')
+    def test_strokedatanohr(self, mocked_sqlalchemy):
 	with open('rowers/tests/testdata/sporttrackstestnohr.txt','r') as infile:
 	    data = json.load(infile)
 

rowers/tests/test_user.py,cover

@@ -1,94 +0,0 @@
-  #from __future__ import print_function
-> import pytest
-  
-> pytestmark = pytest.mark.django_db
-  
-> from bs4 import BeautifulSoup
-> import re
-> from nose_parameterized import parameterized
-> from django.test import TestCase, Client,override_settings
-> from django.core.management import call_command
-> from django.utils.six import StringIO
-> from django.test.client import RequestFactory
-> import datetime
-! from django.utils import timezone
-  
-> import json
-! import numpy as np
-  
-  
-> from redis import StrictRedis
-! redis_connection = StrictRedis()
-  
-! from rowers.models import User,Rower, Workout
-  
-> class UserMiddleWareTest(TestCase):
->     def setUp(self):
-> 	u = User.objects.create_user('john',
-> 				     'sander@ds.ds',
-> 				     'koeinsloot')
-! 	r = Rower.objects.create(user=u)
-          
->         self.c = Client()
-!         self.c.login(username='john',password='koeinsloot')
-> 	nu = datetime.datetime.now()
-  
->         response = dataprep.new_workout_from_file(r,'/media/testdata.csv.gz',
->                                                   title='sample')
-  
-!         newworkoutid = response[0]
-!         self.w = Workout.objects.get(id=newworkoutid)
-          
-          
-!     def test_middleware(self):
-!         response = self.c.get('/rowers/list-workouts',follow=True)
-!         self.assertEqual(response.status_code,200)
-          
-! class UserExpireTest(TestCase):
-!     def setUp(self):
-!         redis_connection.publish('tasks','KILL')
-! 	self.u = User.objects.create_user('john',
-! 				     'sander@ds.ds',
-! 				     'koeinsloot')
-  
-!         yesterday_dt = timezone.now()-datetime.timedelta(days=1)
-!         yesterday = yesterday_dt.date()
-          
-! 	r = Rower.objects.create(user=self.u,planexpires = yesterday,rowerplan='pro',
-!                                  paymenttype='single')
-          
-!         self.c = Client()
-!         self.c.login(username='john',password='koeinsloot')
-! 	nu = datetime.datetime.now()
-  
-!         response = dataprep.new_workout_from_file(r,'/media/testdata.csv.gz',
-!                                                   title='sample')
-  
-!         newworkoutid = response[0]
-!         self.w = Workout.objects.get(id=newworkoutid)
-          
-          
-!     def test_expire(self):
-!         response = self.c.get('/rowers/list-workouts',follow=True)
-!         self.assertEqual(response.status_code,200)
-!         self.assertEqual(self.u.rower.rowerplan,'basic')
-          
-! class UserTestsNoRower(TestCase):
-!     def setUp(self):
-! 	u = User.objects.create_user('john',
-! 				     'sander@ds.ds',
-! 				     'koeinsloot')
-          
-!         self.c = Client()
-!         self.c.login(username='john',password='koeinsloot')
-! 	nu = datetime.datetime.now()
-! 	self.w = Workout.objects.create(name='testworkout',
-!                                         workouttype='water',
-! 				   user=self.r,date=nu.strftime('%Y-%m-%d'),
-! 				   starttime=nu.strftime('%H:%M:%S'),
-! 				   duration="0:55:00",distance=8000)
-          
-!     def test_user(self):
-!         response = self.c.get('/rowers/list-workouts',follow=True)
-!         self.assertEqual(response.status_code,200)
-          

rowers/tests/tests.py

@@ -444,6 +444,11 @@ class ViewTest(TestCase):
         response = self.c.get('/rowers/workout/1/histo', form_data, follow=True)
 	self.assertEqual(response.status_code, 200)
 
+        response = self.c.get('/rowers/workout/1/workflow',
+                              follow=True)
+
+	self.assertEqual(response.status_code, 200)
+
 	form_data = {
             'name':'aap',
             'date':'2016-11-05',

rowers/views.py

@@ -38,6 +38,7 @@ from django.views.generic.edit import UpdateView,DeleteView
 
 from django.http import (
     HttpResponse, HttpResponseRedirect,
+    JsonResponse,
     HttpResponseForbidden, HttpResponseNotAllowed,
     HttpResponseNotFound,Http404
     )
@@ -227,6 +228,7 @@ class JSONResponse(HttpResponse):
         kwargs['content_type'] = 'application/json'
         super(JSONResponse, self).__init__(content, **kwargs)
 
+        
 def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
 
     userid = int(userid)
@@ -12038,7 +12040,10 @@ def workout_toggle_ranking(request,id=0):
     row.save()
 
     if is_ajax:
-        return JSONResponse({'result':row.rankingpiece})
+        response = JSONResponse({'result':row.rankingpiece},
+                                content_type='application/json')
+
+        return response
     else: 
         url = reverse(workouts_view)
         response = HttpResponseRedirect(url)