Merge branch 'release/v23.5.5'

.#config.yaml

@@ -1 +0,0 @@
-sander@rowsandall-2.14384:1749892836

rowers/emails.py

@@ -136,7 +136,10 @@ def send_template_email(from_email, to_email, subject,
 
 
     if not emailbounced:
-        res = msg.send()
+        try:
+            res = msg.send()
+        except:
+            return 1
     else:  # pragma: no cover
         return 0
 

rowers/integrations/nk.py

@@ -139,7 +139,7 @@ class NKIntegration(SyncIntegration):
             after = temp
         
         r = self.rower
-        authorizationstring = str('Bearer ' + r.nktoken)
+        authorizationstring = "Bearer {token}".format(token = r.nktoken)
         headers = {'Authorization': authorizationstring,
                    'user-agent': 'sanderroosendaal',
                    'Content-Type': 'application/json',

rowers/tests/mocks.py

@@ -137,6 +137,7 @@ def mocked_session(*args, **kwargs):
                 'Location':'MockLocation',
             }
             self.ok = True
+            self.text = 'Mocked response text'
 
         def json(self):
             return self.json_data
@@ -991,6 +992,7 @@ def mocked_requests(*args, **kwargs):
             self.headers = {
                 'Location':'MockLocation',
             }
+            self.text = 'Mocked response text'
 
         def json(self):
             return self.json_data
@@ -1574,6 +1576,7 @@ class MockResponse: # pragma: no cover
         self.headers = {
             'Location':'MockLocation',
         }
+        self.text = 'Mocked response text'
 
     def json(self):
         return self.json_data