Johannes Zumthurm · Johannes Zumthurm · b83ab44d · 45023710
--- a/amivapi/tests/events/test_emails.py
+++ b/amivapi/tests/events/test_emails.py
+       """Test that an accepted email is sent when an admin has added a
+       signup manually."""
+       event = self.new_object('events', spots=1, selection_strategy='fcfs',
+                               allow_email_signup=True)
+
+       user = self.new_object('users')
+
+       self.api.post('/eventsignups', data={
+           'user': str(user['_id']),
+           'event': str(event['_id']),
+           'accepted': True
+       }, token=self.get_root_token(), status_code=201).json
+
+       mail = self.app.test_mails[0]
+       for field in mail.values():
+           self.assertTrue('None' not in field)
--- a/amivapi/tests/events/test_emails.py
+++ b/amivapi/tests/events/test_emails.py
+
+       self.api.post('/eventsignups', data={
+           'email': 'a@example.com',
+           'event': str(event['_id']),
+           'accepted': True
+       }, token=self.get_root_token(), status_code=201).json
+
+       # accepted email and confirmation email should be sent.
+       self.assertIs(len(self.app.test_mails), 3)
+       for mail in self.app.test_mails[1:]:
+           for field in mail.values():
+               self.assertTrue('None' not in field)
+
+           self.assertTrue(
+               ('accepted' in mail['subject']) or
+               ('confirm_email' in mail['text']))