You can use the date and search forms to search through all diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py index 47f64ae6..d2b1f440 100644 --- a/rowers/tests/statements.py +++ b/rowers/tests/statements.py @@ -109,6 +109,20 @@ from rowers.opaque import encoder import inspect + + +class MyTestCase(TestCase): + def setUp(self): + self.osm_mock = patch('something') + self.osm_mock.return_value = "" + super(MyTestCase, self).setUp() + self.osm_mock.start() + + def tearDown(self): + super(MyTestCase, self).tearDown() + self.osm_mock.stop() + + def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''): frm = inspect.stack()[3] diff --git a/rowers/tests/test_aavirtualevents.py b/rowers/tests/test_aavirtualevents.py index c1cbc2f6..e58e5861 100644 --- a/rowers/tests/test_aavirtualevents.py +++ b/rowers/tests/test_aavirtualevents.py @@ -13,7 +13,7 @@ import rowers.courses as courses import rowers.plannedsessions as plannedsessions @override_settings(TESTING=True) -class VirtualEventViewTest(TestCase): +class VirtualEventViewTest(MyTestCase): def setUp(self): # Main User self.u = UserFactory() diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py index 78818eb5..b5735396 100644 --- a/rowers/tests/test_imports.py +++ b/rowers/tests/test_imports.py @@ -49,13 +49,31 @@ class RojaboObjects(DjangoTestCase): self.r.defaulttimezone = 'Europe/Prague' self.r.rowerplan = 'plan' self.r.save() - self.c.login(username='john',password='koeinsloot') + + self.u2 = User.objects.create_user('john2', + 'sander@ds2.ds', + 'stierinsloot') + + self.u2.first_name = 'Sander' + self.u2.last_name = 'John' + self.u2.save() + self.r2 = Rower.objects.create(user=self.u2,gdproptin=True, ftpset=True,surveydone=True, + gdproptindate=timezone.now() + ) + + self.r2.rojabo_token = '12' + self.r2.rojabo_refreshtoken = 'ab' + self.r2.rojabo_tokenexpirydate = arrow.get(datetime.datetime.now()+datetime.timedelta(days=1)).datetime + self.r2.defaulttimezone = 'Europe/Prague' + self.r2.rowerplan = 'pro' + self.r2.save() self.nu = datetime.datetime.now() @patch('rowers.rojabo_stuff.requests.get', side_effect=mocked_requests) @patch('rowers.rojabo_stuff.requests.post', side_effect=mocked_requests) def test_rojabo_import(self, mock_get, mock_post): + self.c.login(username='john',password='koeinsloot') url = '/rowers/session/rojaboimport/' response = self.c.get(url) self.assertEqual(response.status_code, 200) @@ -79,6 +97,26 @@ class RojaboObjects(DjangoTestCase): self.assertEqual(len(ps.steps['steps']),20) + @patch('rowers.rojabo_stuff.requests.get', side_effect=mocked_requests) + @patch('rowers.rojabo_stuff.requests.post', side_effect=mocked_requests) + def test_rojabo_import_denied(self, mock_get, mock_post): + self.c.login(username='john2',password='stierinsloot') + url = '/rowers/session/rojaboimport/' + response = self.c.get(url) + self.assertEqual(response.status_code, 302) + + form_data = { + 'csrfmiddlewaretoken': ['xalRrf8y7P2Hhobges9QC4aKCWg4l06gexDc8g2DeuVExgadfk4YhV8oSE1Yu43U'], + 'sessions': ['Import selected sessions'], + 'sessionid': ['862172'] + } + + + response = self.c.post(url,form_data) + self.assertEqual(response.status_code,302) + + + @pytest.mark.django_db @override_settings(TESTING=True) class GarminObjects(DjangoTestCase): diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 4f5d6948..3c0a65ca 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 327cce0b..5fa3fa82 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -5,6 +5,7 @@ from jinja2 import Environment, FileSystemLoader from rowers.rower_rules import can_view_session from django.forms.widgets import SelectDateWidget, HiddenInput +from polars.exceptions import ComputeError def floatformat(x, prec=2): # pragma: no cover return '{x}'.format(x=round(x, prec)) @@ -945,8 +946,10 @@ def boxplotdata(workouts, options): except ColumnNotFoundError: pass - - datadf = datadf.with_columns((pl.col("workoutid").apply(lambda x: datemapping[x])).alias("date")) + try: + datadf = datadf.with_columns((pl.col("workoutid").apply(lambda x: datemapping[x])).alias("date")) + except ComputeError: + return ("","No Valid Data") if userid == 0: # pragma: no cover extratitle = '' @@ -1591,7 +1594,6 @@ class SavedAnalysisView(UserPassesTestMixin, View): def post(self, request, *args, **kwargs): # pragma: no cover form = self.form_class(request.POST) - if form.is_valid(): cd = form.cleaned_data self.selected = cd['analyses'] diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 93ba604e..f5270e17 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -649,10 +649,10 @@ def rower_process_testcallback(request): # pragma: no cover # The page where you select which Strava workout to import @login_required() -@user_passes_test(ispromember, login_url="/rowers/paidplans/", - message="This functionality requires a Pro plan or higher", +@user_passes_test(isplanmember, login_url="/rowers/paidplans/", + message="This functionality requires a Self-coach plan or higher", redirect_field_name=None) -@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) +@permission_required('plannedsession.add_session', fn=get_user_by_userid, raise_exception=True) def workout_rojaboimport_view(request, message="", userid=0): # pragma: no cover r = getrequestrower(request, userid=userid) if r.user != request.user: @@ -753,10 +753,12 @@ def workout_rojaboimport_view(request, message="", userid=0): # pragma: no cover 'steps': steps, } ps.save() - messages.info(request,'Saved planned session {id}'.format(id=ps.id)) + except KeyError: # pragma: no cover pass + except ValidationError: + messages.error(request,"You cannot import sessions") except KeyError: pass