• {{ the_div|safe }}
    +
    +

  • 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/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index c24ee12d5305c21b43becb022b34865ae6bfb706..9aad9188b1849b0620a9931fce061b7b71d791d1 100644 GIT binary patch literal 4000 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 GfB^uZKS1CB literal 4001 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 H#DD<+`OiH# diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index fb58590f..5fa3fa82 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1594,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..95019ab1 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -652,7 +652,7 @@ def rower_process_testcallback(request): # pragma: no cover @user_passes_test(ispromember, login_url="/rowers/paidplans/", message="This functionality requires a Pro plan or higher", redirect_field_name=None) -@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) +@permission_required('rower.is_planmember', 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 From 12e2f49d45849f6ddd39cac14bce03c3cc19ceae Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 13 Jun 2024 08:46:13 +0200 Subject: [PATCH 4/4] fix rojabo permissions --- rowers/tests/test_imports.py | 40 +++++++++++++++++++++++++- rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes rowers/views/importviews.py | 6 ++-- 3 files changed, 42 insertions(+), 4 deletions(-) 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 9aad9188b1849b0620a9931fce061b7b71d791d1..3c0a65ca9ac545281fb7f0d3324d570c2c271e85 100644 GIT binary patch delta 3644 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 O5B>+x1_i{#fB^uDu7+O# delta 3644 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 O{NR6FNa)eTfB^smQH7BJ diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 95019ab1..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_planmember', 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: