Issue 4377 - Add Configurable Form to Email Service

sitescripts/formmail/test/test_formmail2.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 21 matching lines @@
     return formmail2.make_handler('test', form_config)[1]
 
 
 # We make this a fixture instead of a constant so we can modify it in each
 # test as needed without affecting other tests.
 @pytest.fixture
 def form_data():
     return {
         'email': 'john_doe@gmail.com',
         'mandatory': 'john_doe@gmail.com',
-        'non_mandatory': 'Once upon a time\nthere lived a king.'
+        'non_mandatory_message': 'Once upon a time\nthere lived a king.',
+        'non_mandatory_email': 'test@test.com'
     }
 
 
 @pytest.fixture()
 def response_for(form_handler):
     host, port = 'test.local', 80
     urllib_intercept.install_opener()
     add_wsgi_intercept(host, port, lambda: form_handler)
     url = 'http://{}:{}'.format(host, port)
 
@@ skipping 11 matching lines @@
 def test_config_parse(form_config):
     assert form_config['url'].value == 'test/apply/submit'
     assert form_config['fields']['email'].value == 'mandatory, email'
 
 
 def test_success(response_for, form_data, mocker):
     sm_mock = mocker.patch('sitescripts.formmail.web.formmail2.sendMail')
     assert response_for(form_data) == (200, '')
     assert sm_mock.call_count == 1
     params = sm_mock.call_args[0][1]['fields']
-    assert set(params.keys()) == set(form_data.keys()) | {'time'}
+    assert set(params.keys()) == set(form_data.keys())
     for key, value in form_data.items():
         assert params[key] == value
 
 
 def test_non_mandatory_no_msg(response_for, form_data, mocker):
     mocker.patch('sitescripts.formmail.web.formmail2.sendMail')
-    del form_data['non_mandatory']
+    form_data['non_mandatory'] = ''
     assert response_for(form_data) == (200, '')
 
 
 def test_invalid_email_cstm_msg(response_for, form_data, mocker, form_config):
     mocker.patch('sitescripts.formmail.web.formmail2.sendMail')
     form_data['email'] = 'bademail'
     with pytest.raises(HTTPError) as error:
         response_for(form_data)
     assert error.value.read() == 'You failed the email validation'
 
 
-def test_mandatory_fail_cstm_msg(response_for, form_data, mocker):
+def test_valid_nan_mandatory_email(response_for, form_data, mocker):
     mocker.patch('sitescripts.formmail.web.formmail2.sendMail')
-    del form_data['email']
+    form_data['non_mandatory_email'] = 'asfaf'
     with pytest.raises(HTTPError) as error:
         response_for(form_data)
-    assert error.value.read() == 'You failed the email test'
+    assert error.value.read() == 'Invalid email'
+
+    del form_data['non_mandatory_email']
+    assert response_for(form_data) == (200, '')
 
 
 def test_mandatory_fail_dflt_msg(response_for, form_data, mocker):
     mocker.patch('sitescripts.formmail.web.formmail2.sendMail')
     del form_data['mandatory']
     with pytest.raises(HTTPError) as error:
         response_for(form_data)
     assert error.value.read() == 'No mandatory entered'