diff options
| author | Jason Myers <jason@jasonamyers.com> | 2013-11-02 23:36:09 -0500 |
|---|---|---|
| committer | Jason Myers <jason@jasonamyers.com> | 2013-11-02 23:50:49 -0500 |
| commit | 7a61c68c50d3837c50e35c252fd76220f08b5290 (patch) | |
| tree | 586f16a3f02c2b45ffb3dd2af834c0ef604e099c /tests/admin_widgets | |
| parent | 0fdb692c6c94d912f17a3e2ad12413fb072d38ec (diff) | |
PEP8 cleanup
Signed-off-by: Jason Myers <jason@jasonamyers.com>
Diffstat (limited to 'tests/admin_widgets')
| -rw-r--r-- | tests/admin_widgets/models.py | 14 | ||||
| -rw-r--r-- | tests/admin_widgets/tests.py | 16 |
2 files changed, 29 insertions, 1 deletions
diff --git a/tests/admin_widgets/models.py b/tests/admin_widgets/models.py index 6a6c6e096b..5d295f0c9b 100644 --- a/tests/admin_widgets/models.py +++ b/tests/admin_widgets/models.py @@ -8,6 +8,7 @@ from django.utils.encoding import python_2_unicode_compatible class MyFileField(models.FileField): pass + @python_2_unicode_compatible class Member(models.Model): name = models.CharField(max_length=100) @@ -18,6 +19,7 @@ class Member(models.Model): def __str__(self): return self.name + @python_2_unicode_compatible class Band(models.Model): name = models.CharField(max_length=100) @@ -27,6 +29,7 @@ class Band(models.Model): def __str__(self): return self.name + @python_2_unicode_compatible class Album(models.Model): band = models.ForeignKey(Band) @@ -37,10 +40,12 @@ class Album(models.Model): def __str__(self): return self.name + class HiddenInventoryManager(models.Manager): def get_queryset(self): return super(HiddenInventoryManager, self).get_queryset().filter(hidden=False) + @python_2_unicode_compatible class Inventory(models.Model): barcode = models.PositiveIntegerField(unique=True) @@ -55,6 +60,7 @@ class Inventory(models.Model): def __str__(self): return self.name + class Event(models.Model): main_band = models.ForeignKey(Band, limit_choices_to=models.Q(pk__gt=0), related_name='events_main_band_at') supporting_bands = models.ManyToManyField(Band, null=True, blank=True, related_name='events_supporting_band_at') @@ -64,6 +70,7 @@ class Event(models.Model): link = models.URLField(blank=True) min_age = models.IntegerField(blank=True, null=True) + @python_2_unicode_compatible class Car(models.Model): owner = models.ForeignKey(User) @@ -73,15 +80,18 @@ class Car(models.Model): def __str__(self): return "%s %s" % (self.make, self.model) + class CarTire(models.Model): """ A single car tire. This to test that a user can only select their own cars. """ car = models.ForeignKey(Car) + class Honeycomb(models.Model): location = models.CharField(max_length=20) + class Bee(models.Model): """ A model with a FK to a model that won't be registered with the admin @@ -90,6 +100,7 @@ class Bee(models.Model): """ honeycomb = models.ForeignKey(Honeycomb) + class Individual(models.Model): """ A model with a FK to itself. It won't be registered with the admin, so the @@ -99,9 +110,11 @@ class Individual(models.Model): name = models.CharField(max_length=20) parent = models.ForeignKey('self', null=True) + class Company(models.Model): name = models.CharField(max_length=20) + class Advisor(models.Model): """ A model with a m2m to a model that won't be registered with the admin @@ -122,6 +135,7 @@ class Student(models.Model): class Meta: ordering = ('name',) + @python_2_unicode_compatible class School(models.Model): name = models.CharField(max_length=255) diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 4b36f8bd32..0dec3a2cfa 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -25,6 +25,7 @@ admin_static_prefix = lambda: { 'ADMIN_STATIC_PREFIX': "%sadmin/" % settings.STATIC_URL, } + class AdminFormfieldForDBFieldTests(TestCase): """ Tests for correct behavior of ModelAdmin.formfield_for_dbfield @@ -269,6 +270,7 @@ class FilteredSelectMultipleWidgetTest(DjangoTestCase): '<select multiple="multiple" name="test" class="selectfilterstacked">\n</select><script type="text/javascript">addEvent(window, "load", function(e) {SelectFilter.init("id_test", "test", 1, "%(ADMIN_STATIC_PREFIX)s"); });</script>\n' % admin_static_prefix() ) + class AdminDateWidgetTest(DjangoTestCase): def test_attrs(self): """ @@ -287,6 +289,7 @@ class AdminDateWidgetTest(DjangoTestCase): '<input value="2007-12-01" type="text" class="myDateField" name="test" size="20" />', ) + class AdminTimeWidgetTest(DjangoTestCase): def test_attrs(self): """ @@ -305,6 +308,7 @@ class AdminTimeWidgetTest(DjangoTestCase): '<input value="09:30:00" type="text" class="myTimeField" name="test" size="20" />', ) + class AdminSplitDateTimeWidgetTest(DjangoTestCase): def test_render(self): w = widgets.AdminSplitDateTime() @@ -495,6 +499,7 @@ class ManyToManyRawIdWidgetTest(DjangoTestCase): '<input type="text" name="company_widget2" value="%(c1pk)s" />' % {'c1pk': c1.pk} ) + class RelatedFieldWidgetWrapperTests(DjangoTestCase): def test_no_can_add_related(self): rel = models.Individual._meta.get_field('parent').rel @@ -631,6 +636,7 @@ class DateTimePickerSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): class DateTimePickerSeleniumChromeTests(DateTimePickerSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver' + class DateTimePickerSeleniumIETests(DateTimePickerSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' @@ -686,9 +692,11 @@ class DateTimePickerShortcutsSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase self.assertGreater(member.birthdate, now - error_margin) self.assertLess(member.birthdate, now + error_margin) + class DateTimePickerShortcutsSeleniumChromeTests(DateTimePickerShortcutsSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver' + class DateTimePickerShortcutsSeleniumIETests(DateTimePickerShortcutsSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' @@ -714,7 +722,7 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas super(HorizontalVerticalFilterSeleniumFirefoxTests, self).setUp() def assertActiveButtons(self, mode, field_name, choose, remove, - choose_all=None, remove_all=None): + choose_all=None, remove_all=None): choose_link = '#id_%s_add_link' % field_name choose_all_link = '#id_%s_add_all_link' % field_name remove_link = '#id_%s_remove_link' % field_name @@ -928,9 +936,11 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas self.assertEqual(list(self.school.alumni.all()), [self.jason, self.peter]) + class HorizontalVerticalFilterSeleniumChromeTests(HorizontalVerticalFilterSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver' + class HorizontalVerticalFilterSeleniumIETests(HorizontalVerticalFilterSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' @@ -1025,9 +1035,11 @@ class AdminRawIdWidgetSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): self.selenium.find_element_by_id('id_supporting_bands').get_attribute('value'), '42,98') + class AdminRawIdWidgetSeleniumChromeTests(AdminRawIdWidgetSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver' + class AdminRawIdWidgetSeleniumIETests(AdminRawIdWidgetSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' @@ -1072,8 +1084,10 @@ class RelatedFieldWidgetSeleniumFirefoxTests(AdminSeleniumWebDriverTestCase): self.assertEqual(len(profiles), 1) self.assertEqual(profiles[0].user.username, username_value) + class RelatedFieldWidgetSeleniumChromeTests(RelatedFieldWidgetSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver' + class RelatedFieldWidgetSeleniumIETests(RelatedFieldWidgetSeleniumFirefoxTests): webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver' |
