renamed emails
This commit is contained in:
@@ -98,7 +98,7 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False):
|
|||||||
imagename=imagename
|
imagename=imagename
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
if workoutid:
|
if workoutid and not testing:
|
||||||
if rower.getemailnotifications and not rower.emailbounced:
|
if rower.getemailnotifications and not rower.emailbounced:
|
||||||
email_sent = send_confirm(
|
email_sent = send_confirm(
|
||||||
rower.user, title, link,
|
rower.user, title, link,
|
||||||
|
|||||||
@@ -162,8 +162,6 @@ def mocked_requests(*args, **kwargs):
|
|||||||
if not args:
|
if not args:
|
||||||
return MockSession()
|
return MockSession()
|
||||||
|
|
||||||
print args[0],'aap'
|
|
||||||
|
|
||||||
polartester = re.compile('.*?polaraccesslink\.com')
|
polartester = re.compile('.*?polaraccesslink\.com')
|
||||||
c2tester = re.compile('.*?log\.concept2\.com')
|
c2tester = re.compile('.*?log\.concept2\.com')
|
||||||
stravatester = re.compile('.*?strava\.com')
|
stravatester = re.compile('.*?strava\.com')
|
||||||
@@ -439,7 +437,7 @@ class C2Objects(DjangoTestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@patch('rowers.c2stuff.requests.Session', side_effect=mocked_requests)
|
@patch('rowers.c2stuff.Session', side_effect=mocked_requests)
|
||||||
def test_c2_callback(self, mock_Session):
|
def test_c2_callback(self, mock_Session):
|
||||||
response = self.c.get('/call_back?code=dsdoij232s',follow=True)
|
response = self.c.get('/call_back?code=dsdoij232s',follow=True)
|
||||||
|
|
||||||
@@ -448,7 +446,7 @@ class C2Objects(DjangoTestCase):
|
|||||||
|
|
||||||
|
|
||||||
@patch('rowers.c2stuff.Session', side_effect=mocked_requests)
|
@patch('rowers.c2stuff.Session', side_effect=mocked_requests)
|
||||||
def test_c2_token_refresh(self, mock_post):
|
def test_c2_token_refresh(self, mock_Session):
|
||||||
response = self.c.get('/rowers/me/c2refresh/',follow=True)
|
response = self.c.get('/rowers/me/c2refresh/',follow=True)
|
||||||
|
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
@@ -573,7 +571,8 @@ class C2ObjectsTokenExpired(DjangoTestCase):
|
|||||||
|
|
||||||
@patch('rowers.c2stuff.requests.post', side_effect=mocked_requests)
|
@patch('rowers.c2stuff.requests.post', side_effect=mocked_requests)
|
||||||
@patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
|
@patch('rowers.c2stuff.requests.get', side_effect=mocked_requests)
|
||||||
def test_c2_list(self, mock_get, mock_post):
|
@patch('rowers.c2stuff.Session',side_effect=mocked_requests)
|
||||||
|
def test_c2_list(self, mock_get, mock_post, mock_Session):
|
||||||
response = self.c.get('/rowers/workout/c2list',follow=True)
|
response = self.c.get('/rowers/workout/c2list',follow=True)
|
||||||
|
|
||||||
self.assertEqual(response.status_code,404)
|
self.assertEqual(response.status_code,404)
|
||||||
|
|||||||
@@ -58,7 +58,8 @@ class UploadTests(TestCase):
|
|||||||
'sander@ds.ds',
|
'sander@ds.ds',
|
||||||
'koeinsloot')
|
'koeinsloot')
|
||||||
r = Rower.objects.create(user=u,gdproptin=True,
|
r = Rower.objects.create(user=u,gdproptin=True,
|
||||||
gdproptindate=timezone.now()
|
gdproptindate=timezone.now(),
|
||||||
|
getemailnotifications = False,
|
||||||
)
|
)
|
||||||
|
|
||||||
nu = datetime.datetime.now()
|
nu = datetime.datetime.now()
|
||||||
Reference in New Issue
Block a user