furhter cleaning up tests

rowers/tests/test_analysis.py

@@ -4,7 +4,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 from .statements import *
-
+from http.cookies import SimpleCookie
 
 nu = datetime.datetime.now()
 
@@ -653,6 +653,10 @@ class HistoTest(TestCase):
             'startdate':startdate,
             'enddate':enddate,
             'modality':u'all',
+            'histoparam':'power',
+            'rankingonly': False,
+            'includereststrokes':False,
+            'workouttypes': ['water'],
             'waterboattype': waterboattype
             }
 
@@ -1349,6 +1353,8 @@ class WorkoutStatsTestNew(TestCase):
             'workmax':1500,
             'cpfit':'data',
             'piece': 4,
+            'cpoverlay':True,
+            'cpfit':'data',
             'includereststrokes':False,
             'modality':'all',
             'waterboattype':['1x','2x','4x'],
@@ -1362,10 +1368,88 @@ class WorkoutStatsTestNew(TestCase):
         script, div = boxplotdata(workouts,options)
         script, div = trendflexdata(workouts,options)
         script, div = histodata(workouts,options)
+        script, div = cpdata(workouts,options)
         script, div = flexalldata(workouts,options)
         script, div = statsdata(workouts,options)
         script, div = comparisondata(workouts,options)
 
+    @patch('rowers.dataprep.create_engine')
+    @patch('rowers.dataprep.getsmallrowdata_db', side_effect=mocked_getsmallrowdata_db)
+    @patch('rowers.dataprep.read_cols_df_sql', side_effect=mocked_read_cols_df_sql)
+    def test_analysis_data2(self,
+                           mocked_sqlalchemy,
+                           mocked_getsmallrowdata_db,
+                           mocked_read_cols_df_sql,
+    ):
+
+        startdate = (self.user_workouts[0].startdatetime-datetime.timedelta(days=3)).date()
+        enddate = (self.user_workouts[0].startdatetime+datetime.timedelta(days=3)).date()
+
+        # make sure the dates are not naive
+        try:
+            startdate = pytz.utc.localize(startdate)
+        except (ValueError, AttributeError):
+            pass
+        try:
+            enddate = pytz.utc.localize(enddate)
+        except (ValueError, AttributeError):
+            pass
+
+        options = {
+            'function':'flexall',
+            'xparam':'hr',
+            'plotfield':'spm',
+            'yparam':'pace',
+            'groupby':'spm',
+            'binsize':1,
+            'ploterrorbars':True,
+            'palette':'monochrome_blue',
+            'xaxis':'time',
+            'yaxis1':'power',
+            'yaxis2':'hr',
+            'startdate':startdate.strftime('%Y-%m-%d'),
+            'enddate':enddate.strftime('%Y-%m-%d'),
+            'plottype':'scatter',
+            'spmmin':15,
+            'spmmax':55,
+            'workmin':0,
+            'workmax':1500,
+            'cpfit':'data',
+            'piece': 4,
+            'cpoverlay':True,
+            'cpfit':'data',
+            'includereststrokes':False,
+            'modality':'all',
+            'waterboattype':['1x','2x','4x'],
+            'rankingonly':False,
+            'ids':[1,2,3],
+            'userid':self.u.id,
+            'function':'boxplot'
+            }
+
+        workouts = self.user_workouts
+
+        request = self.factory
+        request.user = self.u
+        request.META = {
+            'HTTP_X_REQUESTED_WITH':'XMLHttpRequest'
+        }
+        request.COOKIES = SimpleCookie({'name': 'bla'})
+        # adding session
+        middleware = SessionMiddleware()
+        middleware.process_request(request)
+
+
+        request.session.save()
+
+        session = request.session
+        options['ids'] =  [w.id for w in workouts]
+        session['options'] = options
+        session.save()
+
+
+        response = analysis_view_data(request)
+        self.assertEqual(response.status_code,200)
 
 
     @patch('rowers.dataprep.create_engine')