darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better bucket name pending possible change to uuid for service primary

Browse Source 
key.

Also small bugfix around file name and original file name
This commit is contained in:
Adam Shimali
2016-01-29 12:19:50 +00:00
parent 0dc6f7be1a
commit 5196436645
5 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,16 +126,20 @@ def test_create_job_should_call_api(app_,
job_data,
mock_create_job):
service_id = job_data['service']
template_id = job_data['template']
upload_id = job_data['id']
file_name = job_data['original_file_name']
service_id = service_one['id']
job_id = job_data['id']
file_name = job_data['file_name']
# TODO - template id should come from form but is not wired in yet.
# that will be done in another story
template_id = 1
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
url = url_for('main.check_sms', service_id=service_id, upload_id=upload_id, file_name=file_name)
url = url_for('main.check_sms', service_id=service_one['id'], upload_id=job_id, file_name=file_name)
response = client.post(url, data=job_data, follow_redirects=True)
assert response.status_code == 200
mock_create_job.assert_called_with(service_id, template_id, file_name)
assert job_data['bucket_name'] == "service-{}-{}-notify".format(service_id, job_id)

13
tests/conftest.py
View File

@@ -425,15 +425,9 @@ def mock_check_verify_code_code_expired(mocker):
def job_data(mocker):
import uuid
job_id = uuid.uuid4()
original_file_name = 'thisisatest.csv'
bucket_name = 'service-2-notify'
file_name = '{}.csv'.format(job_id)
file_name = 'thisisatest.csv'
data = {
'id': str(job_id),
'service': 1,
'template': 1,
'original_file_name': original_file_name,
'bucket_name': bucket_name,
'file_name': file_name,
}
return data
@@ -442,5 +436,10 @@ def job_data(mocker):
@pytest.fixture(scope='function')
def mock_create_job(mocker, job_data):
def _create(service_id, template_id, file_name):
job_data['service'] = service_id
job_data['template'] = template_id
job_data['bucket_name'] = 'service-{}-{}-notify'.format(service_id, job_data['id'])
job_data['original_file_name'] = file_name
job_data['file_name'] = '{}.csv'.format(job_data['id'])
return job_data
return mocker.patch('app.job_api_client.create_job', side_effect=_create)