Commit 73549172 by Michael Frey Committed by Michael Frey

No need to check for empty string on email domains. They can be blank or NULL in the model.

parent 6f23ee6b
...@@ -55,10 +55,6 @@ class ConditionalOffer(AbstractConditionalOffer): ...@@ -55,10 +55,6 @@ class ConditionalOffer(AbstractConditionalOffer):
super(ConditionalOffer, self).clean() # pylint: disable=bad-super-call super(ConditionalOffer, self).clean() # pylint: disable=bad-super-call
def clean_email_domains(self): def clean_email_domains(self):
if self.email_domains == '':
log_message_and_raise_validation_error(
'Failed to create ConditionalOffer. ConditionalOffer email domains may not be an empty string.'
)
if self.email_domains: if self.email_domains:
if not isinstance(self.email_domains, basestring): if not isinstance(self.email_domains, basestring):
......
...@@ -419,7 +419,7 @@ class ConditionalOfferTests(TestCase): ...@@ -419,7 +419,7 @@ class ConditionalOfferTests(TestCase):
self.assertTrue(self.offer.is_email_valid(valid_email_2)) self.assertTrue(self.offer.is_email_valid(valid_email_2))
@ddt.data( @ddt.data(
'domain.com', 'multi.it,domain.hr', 'sub.domain.net', '例如.com', 'val-id.例如', 'valid1.co例如', '', 'domain.com', 'multi.it,domain.hr', 'sub.domain.net', '例如.com', 'val-id.例如', 'valid1.co例如',
'valid-domain.com', 'çççç.рф', 'çç-ççç32.中国', 'ççç.ççç.இலங்கை' 'valid-domain.com', 'çççç.рф', 'çç-ççç32.中国', 'ççç.ççç.இலங்கை'
) )
def test_creating_offer_with_valid_email_domains(self, email_domains): def test_creating_offer_with_valid_email_domains(self, email_domains):
...@@ -428,7 +428,7 @@ class ConditionalOfferTests(TestCase): ...@@ -428,7 +428,7 @@ class ConditionalOfferTests(TestCase):
self.assertEqual(offer.email_domains, email_domains) self.assertEqual(offer.email_domains, email_domains)
@ddt.data( @ddt.data(
'', 'noDot', 'spaceAfter.comma, domain.hr', 'nothingAfterDot.', '.nothingBeforeDot', 'space not.allowed', 'noDot', 'spaceAfter.comma, domain.hr', 'nothingAfterDot.', '.nothingBeforeDot', 'space not.allowed',
3, '-invalid.com', 'invalid', 'invalid-.com', 'invalid.c', 'valid.com,', 'invalid.photography1', 3, '-invalid.com', 'invalid', 'invalid-.com', 'invalid.c', 'valid.com,', 'invalid.photography1',
'valid.com,invalid', 'valid.com,invalid-.com', 'valid.com,-invalid.com', 'in--valid.com', 'valid.com,invalid', 'valid.com,invalid-.com', 'valid.com,-invalid.com', 'in--valid.com',
'in..valid.com', 'valid.com,invalid.c', 'invalid,valid.com', 'çççç.çç-çç', 'ççç.xn--ççççç', 'çççç.çç--çç.ççç' 'in..valid.com', 'valid.com,invalid.c', 'invalid,valid.com', 'çççç.çç-çç', 'ççç.xn--ççççç', 'çççç.çç--çç.ççç'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment