Private
Public Access
1
0

Merge branch 'feature/testcoverage' into develop

This commit is contained in:
Sander Roosendaal
2019-01-18 13:27:36 +01:00
9 changed files with 40569 additions and 462380 deletions

View File

@@ -61,8 +61,8 @@ class WorkoutCompareTest(TestCase):
form = WorkoutMultipleCompareForm(form_data)
chartform = ChartParamChoiceForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(chartform.is_valid)
self.assertTrue(form.is_valid())
self.assertTrue(chartform.is_valid())
response = self.c.post('/rowers/multi-compare/',form_data)
@@ -130,8 +130,8 @@ class BoxPlotTest(TestCase):
form = WorkoutMultipleCompareForm(form_data)
chartform = BoxPlotChoiceForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(chartform.is_valid)
self.assertTrue(form.is_valid())
self.assertTrue(chartform.is_valid())
response = self.c.get('/rowers/user-boxplot/',follow=True)
self.assertEqual(response.status_code,200)
@@ -394,7 +394,7 @@ class CumFlexTest(TestCase):
}
form = TrendFlexModalForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
self.factory.user = self.u
form = FlexAxesForm(self.factory,form_data)
@@ -505,7 +505,7 @@ class MultiFlexTest(TestCase):
}
form = MultiFlexChoiceForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
url = '/rowers/user-multiflex-select/'

View File

@@ -26,8 +26,8 @@ class CoursesTest(TestCase):
'file':f,
}
courseform = CourseForm(form_data,file_data)
self.assertTrue(courseform.is_valid)
courseform = CourseForm(form_data)
self.assertTrue(courseform.is_valid())
response = self.c.get('/rowers/courses/upload/')
self.assertTrue(response.status_code,200)
@@ -61,7 +61,7 @@ class CoursesTest(TestCase):
}
form = GeoCourseEditForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post('/rowers/courses/1/edit/',form_data)
self.assertTrue(response.status_code,200)

View File

@@ -95,10 +95,10 @@ class CPChartTest(TestCase):
}
form = MetricsForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
form = WorkoutForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
url = '/rowers/workout/addmanual/'

View File

@@ -97,10 +97,10 @@ class PaymentTest(TestCase):
}
form = RowerBillingAddressForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
form = PlanSelectForm(form_data,paymentprocessor='braintree')
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)
@@ -160,10 +160,10 @@ class PaymentTest(TestCase):
}
form = RowerBillingAddressForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
form = PlanSelectForm(form_data,paymentprocessor='braintree')
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)
@@ -226,10 +226,10 @@ class PaymentTest(TestCase):
}
form = RowerBillingAddressForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
form = PlanSelectForm(form_data,paymentprocessor='braintree')
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)
@@ -368,7 +368,7 @@ class PaymentTest(TestCase):
}
form = BillingForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
login = self.c.login(username=u.username, password=self.password)
self.assertTrue(login)
@@ -412,7 +412,7 @@ class PaymentTest(TestCase):
}
form = BillingForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
login = self.c.login(username=u.username, password=self.password)
self.assertTrue(login)
@@ -455,7 +455,7 @@ class PaymentTest(TestCase):
}
form = BillingForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
login = self.c.login(username=u.username, password=self.password)
self.assertTrue(login)

View File

@@ -62,7 +62,7 @@ class SimpleViewTest(TestCase):
form = EmailForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)

View File

@@ -116,8 +116,8 @@ class UserPreferencesTest(TestCase):
form = AccountRowerForm(form_data)
userform = UserForm(form_data,instance=self.u)
self.assertTrue(form.is_valid)
self.assertTrue(userform.is_valid)
self.assertTrue(form.is_valid())
self.assertTrue(userform.is_valid())
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
@@ -148,12 +148,44 @@ class UserPreferencesTest(TestCase):
}
form = RowerExportForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
def test_zones_workflowsettings(self):
login = self.c.login(username=self.u.username,password=self.password)
self.assertTrue(login)
post_data = {
u'middlepanel-0-panel':u'panel_middlesocial.html',
u'middlepanel-1-panel':u'panel_statcharts.html',
u'middlepanel-2-panel':u'flexthumbnails.html',
u'middlepanel-3-panel':u'panel_summary.html',
u'middlepanel-4-panel':u'panel_map.html',
u'middlepanel-5-panel':u'panel_notes.html',
u'middlepanel-6-panel':u'panel_shortcomment.html',
u'middlepanel-7-panel':u'None',
u'middlepanel-8-panel':u'None',
u'middlepanel-INITIAL_FORMS':'8',
u'middlepanel-MAX_NUM_FORMS':u'1000',
u'middlepanel-MIN_NUM_FORMS':u'0',
u'middlepanel-TOTAL_FORMS':u'8',
}
MiddlePanelFormSet = formset_factory(WorkFlowMiddlePanelElement,extra=1)
middlepanel_formset = MiddlePanelFormSet(post_data,prefix='middlepanel')
self.assertTrue(middlepanel_formset.is_valid())
url = '/rowers/me/workflowconfig2/'
response = self.c.get(url)
self.assertEqual(response.status_code,200)
response = self.c.post(url,post_data)
self.assertEqual(response.status_code,200)
def test_zones_preferences(self):
login = self.c.login(username=self.u.username,password=self.password)
self.assertTrue(login)
@@ -162,14 +194,14 @@ class UserPreferencesTest(TestCase):
'max':181,
'ut2':140,
'ut1':150,
'tr':160,
'at':170,
'tr':170,
'at':160,
'an':175,
'rest':50
}
form = RowerForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
url = '/rowers/me/preferences/'
@@ -186,7 +218,7 @@ class UserPreferencesTest(TestCase):
}
form = RowerPowerForm(form_data)
self.assertTrue(form.is_valid)
self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200)

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

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