fixing strava tests

rowers/tests/.#test_simplefunctions.py

@@ -1 +0,0 @@
-E408191@CZ27LT9RCGN72.11684:1547623002

rowers/tests/mocks.py

@@ -31,6 +31,7 @@ from mock import Mock, patch
 from minimocktest import MockTestCase
 import pandas as pd
 import rowers.c2stuff as c2stuff
+import arrow
 
 import json
 import numpy as np
@@ -136,6 +137,12 @@ def mocked_getempowerdata_db(*args, **kwargs):
 
     return df
 
+def mocked_read_df_cols_sql_multistats(ids,columns,convertnewtons=True):
+    df = pd.read_csv('rowers/tests/testdata/cumstats.csv')
+    extracols = []
+
+    return df, extracols
+
 def mocked_read_df_cols_sql(ids, columns, convertnewtons=True):
     df = pd.read_csv('rowers/tests/testdata/fake_strokedata.csv')
     extracols = []
@@ -704,7 +711,7 @@ def mocked_requests(*args, **kwargs):
                 "token_type": "Bearer",
                 "access_token": "987654321234567898765432123456789",
                 "refresh_token": "1234567898765432112345678987654321",
-                "expires_at": 1531385304
+                "expires_at": arrow.now().timestamp+3600
             }
             return MockResponse(json_data,200)
 

rowers/tests/test_courses.py

@@ -51,6 +51,9 @@ class CoursesTest(TestCase):
         response = self.c.get('/rowers/courses/1/')
         self.assertEqual(response.status_code, 200)
 
+        response = self.c.get('/rowers/courses/1/map/')
+        self.assertEqual(response.status_code, 200)
+
         form_data = {
             'name':'apekoers',
             'country':'United States of Atlantis',

rowers/tests/test_imports.py

@@ -233,6 +233,7 @@ class StravaObjects(DjangoTestCase):
 
         self.r.stravatoken = '12'
         self.r.stravarefreshtoken = '123'
+        self.r.stravatokenexpirydate = datetime.datetime.now()-datetime.timedelta(days=1)
 
         self.r.save()
 	self.c.login(username='john',password='koeinsloot')
@@ -285,15 +286,19 @@ class StravaObjects(DjangoTestCase):
    #     self.assertEqual(response.url, '/rowers/workout/1/edit/')
    #     self.assertEqual(response.status_code, 302)
 
+    @patch('rowers.stravastuff.requests.get', side_effect=mocked_requests)
     @patch('rowers.stravastuff.requests.post', side_effect=mocked_requests)
-    def test_strava_list(self, mock_get):
-        response = self.c.get('/rowers/workout/stravaimport/',follow=True)
+    def test_strava_list(self, mock_get, mockpost):
+        result = rowers.stravastuff.rower_strava_token_refresh(self.u)
+        self.assertEqual(result,"987654321234567898765432123456789")
+        response = self.c.get('/rowers/workout/stravaimport/')
 
         self.assertEqual(response.status_code,200)
 
     @patch('rowers.utils.requests.get', side_effect=mocked_requests)
+    @patch('rowers.stravastuff.requests.post', side_effect=mocked_requests)
     @patch('rowers.dataprep.getsmallrowdata_db')
-    def test_strava_import(self, mock_get,
+    def test_strava_import(self, mock_get, mock_post,
                            mocked_getsmallrowdata_db):
 
         response = self.c.get('/rowers/workout/stravaimport/12',follow=True)

rowers/tests/test_models.py

@@ -300,6 +300,43 @@ class ForcecurveTest(TestCase):
         response = self.c.get(url)
         self.assertEqual(response.status_code,200)
 
+class CumStatsTest(TestCase):
+    def setUp(self):
+        self.u = UserFactory()
+        
+        self.r = Rower.objects.create(user=self.u,
+                                      birthdate=faker.profile()['birthdate'],
+                                      gdproptin=True,
+                                      gdproptindate=timezone.now(),
+                                      rowerplan='coach')
+
+        self.c = Client()
+        self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
+        self.factory = RequestFactory()
+        self.password = faker.word()
+        self.u.set_password(self.password)
+        self.u.save()
+
+    def tearDown(self):
+        for workout in self.user_workouts:
+            try:
+                os.remove(workout.csvfilename)
+            except (IOError, WindowsError):
+                pass
+
+    @patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats)
+    def test_cumflex(self, mocked_df):
+        login = self.c.login(username=self.u.username, password=self.password)
+        self.assertTrue(login)
+
+        startdate = (self.user_workouts[0].startdatetime-datetime.timedelta(days=3)).date()
+        enddate = (self.user_workouts[0].startdatetime+datetime.timedelta(days=3)).date()
+
+        url = '/rowers/cumstats/'
+        response = self.c.get(url)
+
+        self.assertEqual(response.status_code,200)
+        
 class CumFlexTest(TestCase):
     def setUp(self):
         self.u = UserFactory()

rowers/tests/test_simplefunctions.py

@@ -31,6 +31,7 @@ class SimpleViewTest(TestCase):
             except (IOError, WindowsError):
                 pass
 
+            
     def test_getrequestrower(self):
         user_no_rower = UserFactory(username='norower')
         user_no_rower.set_password(faker.word())

rowers/tests/testdata/testdata.tcx

@@ -2502,7 +2502,7 @@
           </Trackpoint>
         </Track>
       </Lap>
-      <Notes>&lt;Element 'Notes' at 0x146d99e8&gt;</Notes>
+      <Notes>&lt;Element 'Notes' at 0x15654160&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>