darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 18:58:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tests pass locally and fail on travis. This is attempt to improve situation

Browse Source
This commit is contained in:
Adam Shimali
2016-01-13 22:54:11 +00:00
parent d628d3d4cb
commit 2f802e3183
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/views/sms.py
View File

@@ -116,9 +116,13 @@ def _format_filename(filename):
return secure_filename(formatted_name) return secure_filename(formatted_name)
def _open(file):
return open(file, 'r')
def _build_upload_result(csv_file): def _build_upload_result(csv_file):
try: try:
file = open(csv_file, 'r') file = _open(csv_file, 'r')
pattern = re.compile(r'^\+44\s?\d{4}\s?\d{6}$') pattern = re.compile(r'^\+44\s?\d{4}\s?\d{6}$')
reader = csv.DictReader( reader = csv.DictReader(
file.read().splitlines(), file.read().splitlines(),

6
tests/app/main/views/test_sms.py
View File

@@ -37,7 +37,7 @@ def test_upload_csvfile_with_invalid_phone_shows_check_page_with_errors(
user = create_test_user('active') user = create_test_user('active')
client.login(user) client.login(user)
upload_data = {'file': file_data} upload_data = {'file': file_data}
with mock.patch('app.main.views.sms.open', m_open): with mock.patch('app.main.views.sms._open', m_open):
response = client.post('/services/123/sms/send', response = client.post('/services/123/sms/send',
data=upload_data, data=upload_data,
follow_redirects=True) follow_redirects=True)
@@ -66,7 +66,7 @@ def test_upload_csvfile_with_valid_phone_shows_first3_and_last3_numbers(
user = create_test_user('active') user = create_test_user('active')
client.login(user) client.login(user)
upload_data = {'file': file_data} upload_data = {'file': file_data}
with mock.patch('app.main.views.sms.open', m_open): with mock.patch('app.main.views.sms._open', m_open):
response = client.post('/services/123/sms/send', response = client.post('/services/123/sms/send',
data=upload_data, data=upload_data,
follow_redirects=True) follow_redirects=True)
@@ -103,7 +103,7 @@ def test_upload_csvfile_with_valid_phone_shows_all_if_6_or_less_numbers(
user = create_test_user('active') user = create_test_user('active')
client.login(user) client.login(user)
upload_data = {'file': file_data} upload_data = {'file': file_data}
with mock.patch('app.main.views.sms.open', m_open): with mock.patch('app.main.views.sms._open', m_open):
response = client.post('/services/123/sms/send', response = client.post('/services/123/sms/send',
data=upload_data, data=upload_data,
follow_redirects=True) follow_redirects=True)