passing tests, removing some obsolete views

rowers/tests/.#test_simplefunctions.py

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

rowers/tests/statements.py

@@ -134,18 +134,13 @@ class WorkoutFactory(factory.DjangoModelFactory):
         
     name = factory.LazyAttribute(lambda _: faker.word())
     notes = faker.text()
-    startdatetime = factory.LazyAttribute(
-        lambda _:get_random_file(name=faker.word())['startdatetime'])
-    starttime = factory.LazyAttribute(
-        lambda _:get_random_file(name=faker.word())['starttime'])
+    startdatetime = get_random_file(name=faker.word())['startdatetime']
+    starttime = get_random_file(name=faker.word())['starttime']
     workouttype='water'
     date=timezone.now().date()
-    duration=factory.LazyAttribute(
-        lambda _:get_random_file(name=faker.word())['duration'])
-    distance=factory.LazyAttribute(
-        lambda _:get_random_file(name=faker.word())['totaldist'])
-    csvfilename=factory.LazyAttribute(
-        lambda _:get_random_file(name=faker.word())['filename'])
+    duration=get_random_file(name=faker.word())['duration']
+    distance=get_random_file(name=faker.word())['totaldist']
+    csvfilename=get_random_file(name=faker.word())['filename']
 
 
 class SessionFactory(factory.DjangoModelFactory):

rowers/tests/test_basicrower.py

@@ -0,0 +1,57 @@
+from statements import *
+
+nu = datetime.datetime.now()
+
+from django.http import Http404
+
+from rowers.views import get_workout
+
+# tests simple functions from views.py
+class SimpleViewTest(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='basic')
+
+        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
+
+    def start_protrial(self):
+        login = self.c.login(username=self.u.username, password=self.password)
+        self.assertTrue(login)
+
+        url = '/rowers/starttrial/'
+
+        response = self.c.get(url,follow=True)
+
+        self.assertRedirects(response,
+                             expected_url='/rowers/list-workouts/',
+                             status_code=302,target_status_code=200)
+
+    def start_plantrial(self):
+        login = self.c.login(username=self.u.username, password=self.password)
+        self.assertTrue(login)
+
+        url = '/rowers/startplantrial/'
+
+        response = self.c.get(url,follow=True)
+
+        self.assertRedirects(response,
+                             expected_url='/rowers/list-workouts/',
+                             status_code=302,target_status_code=200)
+        

rowers/tests/test_imports.py

@@ -306,7 +306,7 @@ class StravaObjects(DjangoTestCase):
 
     @patch('rowers.stravastuff.requests.post', side_effect=mocked_requests)
     def test_strava_callback(self, mock_post):
-        response = self.c.get('/stravacall_back?code=absdef23',follow=True)
+        response = self.c.get('/stravacall_back?code=absdef23&scope=read',follow=True)
         self.assertEqual(response.status_code, 200)
 
     @patch('rowers.stravastuff.requests.post', side_effect=mocked_requests)

rowers/tests/test_plans.py

@@ -0,0 +1,3 @@
+#from __future__ import print_function
+from statements import *
+nu = datetime.datetime.now()

rowers/tests/test_simplefunctions.py

@@ -67,7 +67,7 @@ class SimpleViewTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         self.assertRedirects(response,
-                             expected_url='/rowerss/email/',
+                             expected_url='/rowers/email/',
                              status_code=302,target_status_code=200)
     
 

rowers/tests/test_virtualevents.py

@@ -0,0 +1,3 @@
+#from __future__ import print_function
+from statements import *
+nu = datetime.datetime.now()

rowers/tests/testdata/testdata.tcx

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