darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Rebecca Law
2018-11-07 16:39:04 +00:00
parent 1e5b990069
commit f5de80f195
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -39,7 +39,6 @@ git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3
alembic==1.0.2 alembic==1.0.2
amqp==1.4.9 amqp==1.4.9
anyjson==0.3.3 anyjson==0.3.3
attrs==18.2.0
awscli==1.16.49 awscli==1.16.49
bcrypt==3.1.4 bcrypt==3.1.4
billiard==3.3.0.23 billiard==3.3.0.23
@@ -68,7 +67,6 @@ phonenumbers==8.9.4
pyasn1==0.4.4 pyasn1==0.4.4
pycparser==2.19 pycparser==2.19
PyPDF2==1.26.0 PyPDF2==1.26.0
pyrsistent==0.14.5
python-dateutil==2.7.5 python-dateutil==2.7.5
python-editor==1.0.3 python-editor==1.0.3
python-json-logger==0.1.8 python-json-logger==0.1.8

2
tests/app/template/test_rest.py
View File

@@ -302,7 +302,7 @@ def test_must_have_a_subject_on_an_email_or_letter_template(client, sample_user,
def test_update_should_update_a_template(client, sample_user, sample_template): def test_update_should_update_a_template(client, sample_user, sample_template):
data = { data = {
'content': 'my template has new content <script type="text/javascript">alert("foo")</script>', 'content': 'my template has new content <script type="text/javascript">alert("foo")</script>',
'created_by_id': str(sample_user.id) 'created_by': str(sample_user.id)
} }
data = json.dumps(data) data = json.dumps(data)
auth_header = create_authorization_header() auth_header = create_authorization_header()