From a524d65fe2accd988284075c64f63798fadc8120 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 14 Nov 2018 08:43:24 +0100
Subject: [PATCH] making tests run

---
 rowers/imports.py     | 2 +-
 rowers/stravastuff.py | 1 +
 rowers/tests.py       | 9 +++++++++
 rowers/views.py       | 9 +++++----
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/rowers/imports.py b/rowers/imports.py
index bcddd768..0c7e3640 100644
--- a/rowers/imports.py
+++ b/rowers/imports.py
@@ -102,7 +102,7 @@ def imports_open(user,oauth_data):
                 expirydatename,
                 oauth_data,
             )
-        elif tokenexpirydate is None and 'strava' in expirydatename:
+        elif tokenexpirydate is None and expirydatename is not None and 'strava' in expirydatename:
             token = imports_token_refresh(
                 user,
                 tokenname,
diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py
index 3ce5125e..280cadb3 100644
--- a/rowers/stravastuff.py
+++ b/rowers/stravastuff.py
@@ -102,6 +102,7 @@ def get_strava_workout_list(user,limit_n=0):
             
 	s = requests.get(url,headers=headers,params=params)
 
+
     return s
 
 
diff --git a/rowers/tests.py b/rowers/tests.py
index 4c61f86d..a133f6a5 100644
--- a/rowers/tests.py
+++ b/rowers/tests.py
@@ -321,6 +321,15 @@ def mocked_requests(*args, **kwargs):
             return MockResponse(json_data,200)
         elif stravasummarytester.match(args[0]):
             return MockResponse(stravasummaryjson,200)
+        elif 'token' in args[0]:
+            json_data = {
+                "token_type": "Bearer",
+                "access_token": "987654321234567898765432123456789",
+                "refresh_token": "1234567898765432112345678987654321",
+                "expires_at": 1531385304
+            }
+            return MockResponse(json_data,200)
+
     
     if c2tester.match(args[0]):
         if c2uploadtester.match(args[0]):
diff --git a/rowers/views.py b/rowers/views.py
index d22b882c..283703fc 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -10276,20 +10276,21 @@ def workout_add_chart_view(request,id,plotnr=1):
 # The page where you select which Strava workout to import
 @login_required()
 def workout_stravaimport_view(request,message="",userid=0):
-    res = stravastuff.get_strava_workout_list(request.user)
-
-    r = getrequestrower(request,userid=userid)
-
     try:
 	thetoken = strava_open(request.user)
     except NoTokenError:
 	return HttpResponseRedirect("/rowers/me/stravaauthorize/")
 
+    res = stravastuff.get_strava_workout_list(request.user)
+
+    r = getrequestrower(request,userid=userid)
+
     if r.user != request.user:
         messages.info(request,"You cannot import other people's workouts from Concept2")
 
     r = getrower(request.user)
 
+    
     if (res.status_code != 200):
 	if (res.status_code == 401):
 	    r = getrower(request.user)