altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Changed the email origin field during test to hold user.username in order to exercise more of the code. Changed the EmailFactory to also use user.username as origin.

Browse source 
- Legacy-Id: 15172
This commit is contained in:
Henrik Levkowetz 2018-05-26 08:32:20 +00:00
parent 6ec050d807
commit 2522082979
6 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ietf/doc/tests_draft.py
View file

@ -1001,7 +1001,7 @@ class IndividualInfoFormsTests(TestCase):
doc.shepherd = Email.objects.get(person__user__username="plain")
doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_shepherd", by=Person.objects.get(user__username="secretary"), desc="Test")])
new_email = Email.objects.create(address="anotheremail@example.com", person=doc.shepherd.person, origin='test')
new_email = Email.objects.create(address="anotheremail@example.com", person=doc.shepherd.person, origin=doc.shepherd.person.user.username)
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
@ -1435,8 +1435,8 @@ class ChangeReplacesTests(TestCase):
expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
group=mars_wg,
)
p = Person.objects.create(name="basea_author")
e = Email.objects.create(address="basea_author@example.com", person=p, origin='test')
p = PersonFactory(name=u"basea_author")
e = Email.objects.create(address="basea_author@example.com", person=p, origin=p.user.username)
self.basea.documentauthor_set.create(person=p, email=e, order=1)
self.baseb = Document.objects.create(
@ -1448,8 +1448,8 @@ class ChangeReplacesTests(TestCase):
expires=datetime.datetime.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
group=mars_wg,
)
p = Person.objects.create(name="baseb_author")
e = Email.objects.create(address="baseb_author@example.com", person=p, origin='test')
p = PersonFactory(name=u"baseb_author")
e = Email.objects.create(address="baseb_author@example.com", person=p, origin=p.user.username)
self.baseb.documentauthor_set.create(person=p, email=e, order=1)
self.replacea = Document.objects.create(
@ -1461,8 +1461,8 @@ class ChangeReplacesTests(TestCase):
expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
group=mars_wg,
)
p = Person.objects.create(name="replacea_author")
e = Email.objects.create(address="replacea_author@example.com", person=p, origin='test')
p = PersonFactory(name=u"replacea_author")
e = Email.objects.create(address="replacea_author@example.com", person=p, origin=p.user.username)
self.replacea.documentauthor_set.create(person=p, email=e, order=1)
self.replaceboth = Document.objects.create(
@ -1474,8 +1474,8 @@ class ChangeReplacesTests(TestCase):
expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
group=mars_wg,
)
p = Person.objects.create(name="replaceboth_author")
e = Email.objects.create(address="replaceboth_author@example.com", person=p, origin='test')
p = PersonFactory(name=u"replaceboth_author")
e = Email.objects.create(address="replaceboth_author@example.com", person=p, origin=p.user.username)
self.replaceboth.documentauthor_set.create(person=p, email=e, order=1)
self.basea.set_state(State.objects.get(used=True, type="draft", slug="active"))

9
ietf/ietfauth/tests.py
View file

@ -209,6 +209,7 @@ class IetfAuthTests(TestCase):
"ascii_short": u"T. Name",
"affiliation": "Test Org",
"active_emails": email_address,
"consent": True,
}
# edit details - faulty ASCII
@ -308,7 +309,7 @@ class IetfAuthTests(TestCase):
user.set_password("forgotten")
user.save()
p = Person.objects.create(name="Some One", ascii="Some One", user=user)
Email.objects.create(address=user.username, person=p, origin='test')
Email.objects.create(address=user.username, person=p, origin=user.username)
# get
r = self.client.get(url)
@ -418,7 +419,7 @@ class IetfAuthTests(TestCase):
user.set_password("password")
user.save()
p = Person.objects.create(name="Some One", ascii="Some One", user=user)
Email.objects.create(address=user.username, person=p, origin='test')
Email.objects.create(address=user.username, person=p, origin=user.username)
# log in
r = self.client.post(redir_url, {"username":user.username, "password":"password"})
@ -465,8 +466,8 @@ class IetfAuthTests(TestCase):
user.set_password("password")
user.save()
p = Person.objects.create(name="Some One", ascii="Some One", user=user)
Email.objects.create(address=user.username, person=p, origin='test')
Email.objects.create(address="othername@example.org", person=p, origin='test')
Email.objects.create(address=user.username, person=p, origin=user.username)
Email.objects.create(address="othername@example.org", person=p, origin=user.username)
# log in
r = self.client.post(redir_url, {"username":user.username, "password":"password"})

6
ietf/nomcom/management/commands/make_dummy_nomcom.py
View file

@ -39,18 +39,18 @@ class Command(BaseCommand):
populate_personnel=False,
populate_positions=False))
e = EmailFactory(person__name=u'Dummy Chair', address=u'dummychair@example.com', person__user__username=u'dummychair', person__default_emails=False, origin='test')
e = EmailFactory(person__name=u'Dummy Chair', address=u'dummychair@example.com', person__user__username=u'dummychair', person__default_emails=False, origin='dummychair')
e.person.user.set_password('password')
e.person.user.save()
nc.group.role_set.create(name_id=u'chair',person=e.person,email=e)
e = EmailFactory(person__name=u'Dummy Member', address=u'dummymember@example.com', person__user__username=u'dummymember', person__default_emails=False, origin='test')
e = EmailFactory(person__name=u'Dummy Member', address=u'dummymember@example.com', person__user__username=u'dummymember', person__default_emails=False, origin='dummymember')
e.person.user.set_password('password')
e.person.user.save()
nc.group.role_set.create(name_id=u'member',person=e.person,email=e)
e = EmailFactory(person__name=u'Dummy Candidate', address=u'dummycandidate@example.com', person__user__username=u'dummycandidate', person__default_emails=False, origin='test')
e = EmailFactory(person__name=u'Dummy Candidate', address=u'dummycandidate@example.com', person__user__username=u'dummycandidate', person__default_emails=False, origin='dummycandidate')
e.person.user.set_password('password')
e.person.user.save()
NomineePositionFactory(nominee__nomcom=nc, nominee__person=e.person,

4
ietf/person/factories.py
View file

@ -71,7 +71,7 @@ class PersonFactory(factory.DjangoModelFactory):
extracted = True
if create and extracted:
make_email = getattr(EmailFactory, 'create' if create else 'build')
make_email(person=obj, address=obj.user.email, origin='test')
make_email(person=obj, address=obj.user.email)
@factory.post_generation
def default_photo(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
@ -131,4 +131,4 @@ class EmailFactory(factory.DjangoModelFactory):
active = True
primary = False
origin = ''
origin = factory.LazyAttribute(lambda obj: obj.person.user.username if obj.person.user else '')

6
ietf/person/tests.py
View file

@ -42,9 +42,9 @@ class PersonTests(TestCase):
def test_default_email(self):
person = PersonFactory()
primary = EmailFactory(person=person, primary=True, active=True, origin='test')
EmailFactory(person=person, primary=False, active=True, origin='test')
EmailFactory(person=person, primary=False, active=False, origin='test')
primary = EmailFactory(person=person, primary=True, active=True)
EmailFactory(person=person, primary=False, active=True)
EmailFactory(person=person, primary=False, active=False)
self.assertTrue(primary.address in person.formatted_email())
def test_profile(self):

12
ietf/utils/test_data.py
View file

@ -38,7 +38,7 @@ def create_person(group, role_name, name=None, username=None, email_address=None
user.set_password(password)
user.save()
person = Person.objects.create(name=name, ascii=unidecode_name(smart_text(name)), user=user)
email = Email.objects.create(address=email_address, person=person, origin='test')
email = Email.objects.create(address=email_address, person=person, origin=user.username)
Role.objects.create(group=group, name_id=role_name, person=person, email=email)
return person
@ -112,7 +112,7 @@ def make_immutable_base_data():
for i in range(1, 10):
u = User.objects.create(username="ad%s" % i)
p = Person.objects.create(name="Ad No%s" % i, ascii="Ad No%s" % i, user=u)
email = Email.objects.create(address="ad%s@ietf.org" % i, person=p, origin='test')
email = Email.objects.create(address="ad%s@ietf.org" % i, person=p, origin=u.username)
if i < 6:
# active
Role.objects.create(name_id="ad", group=area, person=p, email=email)
@ -232,7 +232,7 @@ def make_test_data():
u.set_password("plain+password")
u.save()
plainman = Person.objects.create(name="Plain Man", ascii="Plain Man", user=u)
email = Email.objects.create(address="plain@example.com", person=plainman, origin='test')
email = Email.objects.create(address="plain@example.com", person=plainman, origin=u.username)
# group personnel
create_person(mars_wg, "chair", name="WG Cháir Man", username="marschairman")
@ -473,7 +473,7 @@ def make_review_data(doc):
u.set_password("reviewer+password")
u.save()
reviewer = Person.objects.create(name=u"Some Réviewer", ascii="Some Reviewer", user=u)
email = Email.objects.create(address="reviewer@example.com", person=reviewer, origin='test')
email = Email.objects.create(address="reviewer@example.com", person=reviewer, origin=u.username)
for team in (team1, team2, team3):
Role.objects.create(name_id="reviewer", person=reviewer, email=email, group=team)
@ -496,14 +496,14 @@ def make_review_data(doc):
u.set_password("reviewsecretary+password")
u.save()
reviewsecretary = Person.objects.create(name=u"Réview Secretary", ascii="Review Secretary", user=u)
reviewsecretary_email = Email.objects.create(address="reviewsecretary@example.com", person=reviewsecretary, origin='test')
reviewsecretary_email = Email.objects.create(address="reviewsecretary@example.com", person=reviewsecretary, origin=u.username)
Role.objects.create(name_id="secr", person=reviewsecretary, email=reviewsecretary_email, group=team1)
u = User.objects.create(username="reviewsecretary3")
u.set_password("reviewsecretary3+password")
u.save()
reviewsecretary3 = Person.objects.create(name=u"Réview Secretary3", ascii="Review Secretary3", user=u)
reviewsecretary3_email = Email.objects.create(address="reviewsecretary3@example.com", person=reviewsecretary, origin='test')
reviewsecretary3_email = Email.objects.create(address="reviewsecretary3@example.com", person=reviewsecretary, origin=u.username)
Role.objects.create(name_id="secr", person=reviewsecretary3, email=reviewsecretary3_email, group=team3)
return review_req