updated tests

rowers/dataprep.py

@@ -855,7 +855,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
         except:
             pass
         return new_workout_from_df(r, newdf,
-                                   title=title)
+                                   title=title,boattype=boattype)
     try:
         checks = row.check_consistency()
         allchecks = 1
@@ -1442,6 +1442,7 @@ def split_workout(r, parent, splitsecond, splitmode):
 
 def new_workout_from_df(r, df,
                         title='New Workout',
+                        boattype='1x',
                         parent=None,
                         setprivate=False,
                         forceunit='lbs',

rowers/tasks.py

@@ -448,7 +448,7 @@ def long_test_task2(self,aantal,**kwargs):
 @app.task
 def handle_new_workout_from_file(r, f2,
                                  workouttype='rower',
-                                 title='Workout',
+                                 boattype='1x',
                                  makeprivate=False,
                                  notes='',debug=False):
     return new_workout_from_file(r, f2, workouttype,

rowers/tests.py

@@ -546,6 +546,7 @@ class DataTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    }
 
@@ -640,6 +641,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -709,6 +711,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -750,6 +753,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -781,6 +785,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'',
 	    'workouttype':'rower',
+            'boattype': '1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -813,6 +818,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -856,6 +862,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -886,6 +893,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -918,6 +926,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -948,6 +957,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -979,6 +989,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1010,6 +1021,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1039,6 +1051,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'water',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1066,6 +1079,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1093,6 +1107,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1120,6 +1135,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1148,6 +1164,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1175,6 +1192,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1202,6 +1220,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1229,6 +1248,7 @@ class ViewTest(TestCase):
 	form_data = {
 	    'title':'test',
 	    'workouttype':'rower',
+            'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
 	    'upload_to_c2':False,
@@ -1259,6 +1279,7 @@ class ViewTest(TestCase):
 #	    form_data = {
 #		'title':'test',
 #		'workouttype':'water',
+#            'boattype':'1x',
 #		'notes':'aap noot mies',
 #		'make_plot':False,
 #		'upload_to_c2':False,